lams-github

lams_tool_assessment

Clone Tools

Stats

Commits this week: 0
Total Committers: 20
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
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./src/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
    • -1
    • +0
    ./.classpath
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
  3. … 77 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
    • -1
    • +0
    ./.classpath
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
  3. … 76 more files in changeset.
Friday 05 Jan 2018
10:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -1
    • +27
    ./web/WEB-INF/tags/Comments.tag
  2. … 65 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
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -17
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -20
    • +10
    ./src/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
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171218.sql
  2. … 1 more file in changeset.
Wednesday 22 Nov 2017
8:55 pm

Andrey Balan

LDEV-4473 Add bootstrap.js when it's not available on page

Options
    • -1
    • +7
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
1:11 am

Andrey Balan

LDEV-4470 Fix conflict between query-ui's slider and bootstrap-slider

Options
    • -1
    • +2
    ./web/pages/learning/learning.jsp
    • -1
    • +1
    ./web/pages/learning/parts/confidencelevel.jsp
    • -0
    • +3
    ./web/pages/learning/results.jsp
    • -1
    • +1
    ./web/pages/learning/results/confidencelevel.jsp
  5. … 4 more files in changeset.
Thursday 16 Nov 2017
4:54 am

Andrey Balan

LDEV-4436 Ability to change portrait in learner

Options
    • -12
    • +49
    ./web/WEB-INF/tags/Page.tag
  2. … 33 more files 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
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
  2. … 10 more files in changeset.
Wednesday 08 Nov 2017
11:45 pm

Andrey Balan

LDEV-4451 Add scss files and fix their names

Options
    • -0
    • +5
    ./web/includes/css/monitoring.scss
    • -4
    • +5
    ./web/pages/monitoring/monitoring.jsp
    • -3
    • +4
    ./web/pages/monitoring/parts/questionsummary.jsp
    • -3
    • +4
    ./web/pages/monitoring/parts/usersummary.jsp
  5. … 6 more files in changeset.
2:02 am

Andrey Balan

LDEV-4456 Warn users when there is no questions in question list

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -17
    • +26
    ./web/pages/authoring/authoring.jsp
    • -36
    • +36
    ./web/pages/authoring/basic.jsp
Tuesday 07 Nov 2017
12:29 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4445 Question page in monitor has portraits

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
10:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4445 Question page in monitor has portraits

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -4
    • +13
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -4
    • +21
    ./web/pages/monitoring/parts/questionsummary.jsp
Friday 03 Nov 2017
5:32 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • -2
    • +2
    ./src/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
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -22
    • +11
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  5. … 2 more files in changeset.
5:24 am

Andrey Balan

LDEV-4451 Make slider neater (narrower and with lesser text size)

Options
    • -9
    • +0
    ./web/pages/learning/learning.jsp
    • -9
    • +0
    ./web/pages/learning/results.jsp
  3. … 1 more file in changeset.
Thursday 02 Nov 2017
10:41 pm

Marcin Cieslak

LDEV-4411 Add collections 2nd level cache

Options
    • -0
    • +6
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
    • -0
    • +4
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.hbm.xml
    • -0
    • +4
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.hbm.xml
  6. … 93 more files in changeset.
9:11 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4451: modifying labels

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
8:18 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • -0
    • +17
    ./src/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
    • -0
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -9
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -91
    • +83
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -21
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -17
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -15
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -33
    • +0
    ./web/includes/javascript/monitoring.js
    • -1
    • +1
    ./web/pages/monitoring/monitoring.jsp
    • -6
    • +2
    ./web/pages/monitoring/parts/questionsummary.jsp
    • -8
    • +4
    ./web/pages/monitoring/parts/usersummary.jsp
    • -5
    • +1
    ./web/pages/monitoring/summary.jsp
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
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +24
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -1
    • +25
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  4. … 2 more files in changeset.
Sunday 29 Oct 2017
1:19 am

Marcin Cieslak

LDEV-4411 Mark entities as cacheable

usage="read-only" seems to do nothing at the moment, but it may be a

guidance for future optimisations.

Options
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentOverallFeedback.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentUnit.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.hbm.xml
  12. … 227 more files in changeset.
Thursday 26 Oct 2017
7:29 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • -0
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
  2. … 1 more file in changeset.
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
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
    • -0
    • +9
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml
    • -0
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +20
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -8
    • +97
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +19
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +24
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -0
    • +24
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -0
    • +33
    ./web/includes/javascript/monitoring.js
  16. … 15 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
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
Monday 16 Oct 2017
6:58 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4443: Ooops

swap file shouldn't have been committed. Too many terminals open :-)

Options
    • binary
    ./web/pages/monitoring/.editactivity.jsp.swp
5:41 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4443: warning when editing activity that has been already used.

Currently when editing an assessment or voting activity in monitor, if an answer is changed, the data associated with that question is removed.

So if students have already completed the activity, their answers/marks will be removed and will shown as not answered.

We currently give no warning to monitors when they do this, so we should.

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • binary
    ./web/pages/monitoring/.editactivity.jsp.swp
    • -0
    • +4
    ./web/pages/monitoring/editactivity.jsp
  5. … 9 more files in changeset.
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
    ./src/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
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql