lams-github / lams_tool_assessment

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 16
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 01 Feb 2018
5:08 am

Andrey Balan

LDEV-4506 Prevent exception after user resubmits results using two tabs

Options
    • -3
    • +12
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
Friday 26 Jan 2018
9:09 pm

Andrey Balan

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

Options
    • -4
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
  2. … 78 more files in changeset.
7:24 am

Andrey Balan

LDEV-4407 Tools to use contentrepository classes from lams_common

Tools start using shared contentrepository classes that were

recently moved to lams_common from lams_contentrepository.

Remove any leftover dependencies on lams_contentrepository. Which

includes getting rid of getRepositoryLoginTicket() and some other

methods from tools services.

Options
    • -2
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
  2. … 77 more files in changeset.
Tuesday 19 Dec 2017
8:47 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

Options
    • -103
    • +85
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -17
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -20
    • +10
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  4. … 43 more files in changeset.
8:03 am

Andrey Balan

LDEV-4490 Fix exceptions caused by NULL ConfidenceLevel columns

Options
    • -0
    • +17
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171218.sql
  2. … 1 more file in changeset.
Friday 10 Nov 2017
12:57 am

Marcin Cieslak

LDEV-4453 Mark chosen activity outputs as weightable

Activity outputs without max score are not eligible for weighting as we

can not calculate percent in which the activity is completed. They must

not appear in weighting dialog and they must always have 0% weight.

Options
    • -16
    • +21
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
  2. … 10 more files in changeset.
Tuesday 07 Nov 2017
10:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4445 Question page in monitor has portraits

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -4
    • +13
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  5. … 1 more file in changeset.
Friday 03 Nov 2017
5:32 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
  2. … 7 more files in changeset.
5:29 am

Andrey Balan

LDEV-4451 Improve question comparison tactics

As long as MCQ doesn't have question titles, exclude title when

calculating question hash.

Another peculiarity of MCQ is that it stores questions and answers with

trailing '/r/n' instead of usual '/n' (as in Assessment and Scratchie),

so remove all '/r' and '/n' before comparing questions and answers.

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -22
    • +11
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  5. … 2 more files in changeset.
Thursday 02 Nov 2017
8:18 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • -0
    • +17
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
  2. … 3 more files in changeset.
7:57 am

Andrey Balan

LDEV-4451 Store ConfidenceLevels inside Assessment

ConfidenceLevels should be stored at the tools level as otherwise it's

hard to keep questions hashes updated in lams_central.

Add support for providing them to Scratchie.

Options
    • -3
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +10
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -2
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -0
    • +17
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -2
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -9
    • +9
    ./java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -91
    • +83
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -21
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -17
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -15
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  12. … 6 more files in changeset.
Monday 30 Oct 2017
3:50 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

Options
    • -8
    • +97
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +24
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -1
    • +25
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  4. … 2 more files in changeset.
Thursday 26 Oct 2017
7:17 am

Andrey Balan

LDEV-4451 Allow learners to choose confidence levels

Add advanced option in Assessment/MCQ - 'Store Confidences'.

If this option is ON, then in learning show sliders which will allow

choosing confidence levels. Display stored levels in learning and

monitoring.

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +20
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -0
    • +9
    ./java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -0
    • +14
    ./java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +15
    ./java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -0
    • +9
    ./java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -8
    • +97
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +19
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +24
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -0
    • +24
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  12. … 19 more files in changeset.
Tuesday 24 Oct 2017
5:19 am

Andrey Balan

LDEV-4448 Improve SQL query that is used to change tool outputs

Changing Assessment's tool output to 'First score' was taking too much

time. So the query that returns 'First score' outputs for the entire

activity was rewritten to improve its performance.

Options
    • -6
    • +11
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
Friday 13 Oct 2017
8:01 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

Options
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 8 more files in changeset.
Thursday 12 Oct 2017
10:57 pm

Andrey Balan

LDEV-4438 Remove unique constraint added in the previous patch

The new constraint handles all problematic cases including the one with

copying results from leaders. Thus we no longer need

UQ_tl_laasse10_assessment_result_4 (assessment_uid, user_uid,

finish_date) constraint.

Options
    • -0
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
7:39 am

Andrey Balan

LDEV-4438 fix autopatch script typo

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
3:27 am

Andrey Balan

LDEV-4438 Add unique constraint (assessment_uid, user_uid, latest)

Add unique constraint (assessment_uid, user_uid, latest) to

tl_laasse10_assessment_result which will apply only in case latest=1. It

was done by making 'latest' field contain only NULL or 1 (as opposite to

the previously used 0 or 1). This way constraint will apply only in

cases when 'latest' is 1.

Options
    • -0
    • +31
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
    • -3
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Monday 09 Oct 2017
5:08 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -1
    • +11
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  3. … 28 more files in changeset.
Wednesday 30 Aug 2017
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -4
    • +14
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +9
    ./java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/tool/assessment/dto/ReflectDTO.java
    • -1
    • +11
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  8. … 67 more files in changeset.
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -4
    • +14
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +9
    ./java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/tool/assessment/dto/ReflectDTO.java
    • -1
    • +11
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  8. … 68 more files in changeset.
Saturday 26 Aug 2017
4:04 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Multiple conflicts resolved with JSON replace and class move to

packages.

Options
    • -0
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 33 more files in changeset.
Tuesday 22 Aug 2017
7:09 pm

Marcin Cieslak

LDEV-4410 Add unique key to prevent duplicate results

Options
    • -0
    • +16
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170822.sql
Monday 21 Aug 2017
11:02 pm

Andrey Balan

LDEV-4409 Clear Short answer' result if it's incorrectly answered

Options
    • -0
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Thursday 10 Aug 2017
5:04 pm

Marcin Cieslak

Merge branch 'LDEV-4402' into lams31

Options
    • -97
    • +117
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
  2. … 1 more file in changeset.
12:28 am

Marcin Cieslak

LDEV-4402 Substitute Gson and Apache JSON with Jackson

Jackson is a top JSON library shipped with WF10.

Apache JSON resides in an ancient library which we do not need for

anything else.

We use GSon only for serializing Java objects to JSON, which Jackson can

do too.

Options
    • -258
    • +299
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -85
    • +103
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -62
    • +64
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  4. … 133 more files in changeset.
Wednesday 09 Aug 2017
7:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4406: Timing count preserved across page switch, Submit All

Also fixed a validation bug with Essay questions that had a

minimum word count but were not required.

Options
    • -11
    • +43
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
  2. … 1 more file in changeset.
Monday 07 Aug 2017
6:23 pm

Marcin Cieslak

LDEV-4402 Remove obsolete XPP3 and XMLPull libraries

The libraries have been used by earlier versions of XStream. They are

not needed for latest XStream and Java 6+.

Deserialized classes must implement a no-arg constructor.

Options
    • -54
    • +50
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
  2. … 12 more files in changeset.
Wednesday 19 Jul 2017
4:11 am

Andrey Balan

LDEV-4386 Prevent showing questions not selected in que. list in monitor

All questions in question bank -even when not selected, show in monitor.

We should show only the ones added to question list or all of them in

case there is at least one random question available

Options
    • -0
    • +44
    ./java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentResultDTO.java
    • -0
    • +11
    ./java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -29
    • +63
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +6
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -2
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
    • -7
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
Thursday 13 Jul 2017
2:37 pm

Marcin Cieslak

LDEV-4379 Fix Assessment answers ordering

Assessment questions are numbered from 1, answers from 0. QTI import

method used 1 for both.

Options
    • -2168
    • +2168
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java