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
Tuesday 12 Jun 2018
10:21 pm

Andrey Balan

Revert "Merge branch 'LDEV_NTU-12'"

This reverts commit 183bac242c2d086c728767b79b2bf3be9604370a, reversing

changes made to 58e35ac606c140010b53bae4314478e0cf63f05d.

Options
    • -3
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -4
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -42
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -23
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -10
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -11
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  8. … 1 more file in changeset.
Monday 11 Jun 2018
11:56 am

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

LDEV_NTU-12 Need to be able to change tool output to blank

Options
    • -2
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -0
    • +42
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -2
    • +23
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +11
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  8. … 1 more file in changeset.
Thursday 07 Jun 2018
10:00 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV_NTU-11 Swapping Mark and Response columns in Assessment Monitor

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  2. … 2 more files in changeset.
Monday 21 May 2018
7:01 pm

Marcin Cieslak

LDEV-4587 Select branch based on option order chosen by learner

A condition has a question sequence ID and an option sequence ID encoded

in its name. This way we know what output to produce. Then all outputs

are sorted and a branch which was not processed yet gets chosen.

Options
    • -12
    • +12
    ./java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -24
    • +79
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
  3. … 5 more files in changeset.
Friday 18 May 2018
6:43 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.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_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

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

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

Options
    • -1
    • +38
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -18
    • +42
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -25
    • +48
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -0
    • +52
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
  7. … 17 more files in changeset.
5:41 pm

Marcin Cieslak

LDEV-4587 Add new assessment output type

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -3
    • +26
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
  4. … 2 more files in changeset.
Thursday 17 May 2018
7:58 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4582 Set default value for the new Prefix column

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180515.sql
Wednesday 16 May 2018
7:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4582 Able to add letter prefix to Assessment MCQ Answers

Options
    • -0
    • +14
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180515.sql
    • -0
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/dto/OptionDTO.java
    • -0
    • +11
    ./java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java
  8. … 5 more files in changeset.
Thursday 03 May 2018
7:26 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Rename dbupdate files as name is a month out.

Options
    • -0
    • +26
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180425.sql
    • -26
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180525.sql
  3. … 38 more files in changeset.
Monday 30 Apr 2018
12:40 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Expand DB Fields to support pictures pasted in CKEditor

Options
    • -0
    • +26
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180525.sql
  2. … 28 more files in changeset.
Friday 13 Apr 2018
6:52 am

Andrey Balan

LDEV-4540 Allow non-leaders see results page together with leader

Previously non-leader could see the results page only when the

leader goes to the next activity. If the leader is still on the

results page, a non-leader still sees the read-only questions page.

This way working with answer disclosing was pretty much

impossible so we allowed non-leaders see results page

simultaneously with leader.

Options
    • -0
    • +9
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -0
    • +15
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +6
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +8
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -9
    • +13
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
  6. … 1 more file in changeset.
Tuesday 10 Apr 2018
11:42 am

Marcin Cieslak

LDEV-4540 Add logs

Options
    • -0
    • +10
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
11:41 am

Marcin Cieslak

LDEV-4540 Allow disclosing correct/groups answers in plain monitoring

Options
    • -22
    • +66
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -40
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
  3. … 4 more files in changeset.
Monday 09 Apr 2018
9:48 pm

Marcin Cieslak

LDEV-4540 Refresh learners' results page when monitor discloses answers

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +16
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +7
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -6
    • +16
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
  5. … 2 more files in changeset.
6:14 pm

Marcin Cieslak

LDEV-4540 Redirect to action rather than JSP after submit all

Redirecting to JSP prevents request attributes from being set properly

and they are needed for the new results page.

Options
    • -8
    • +8
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
Friday 06 Apr 2018
10:55 pm

Marcin Cieslak

LDEV-4540 Disclose answers in TBL monitor and reflect it in learner

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -1
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180330.sql
    • -10
    • +59
    ./java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -5
    • +45
    ./java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -16
    • +39
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -18
    • +28
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -30
    • +60
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
  8. … 6 more files in changeset.
6:45 pm

Marcin Cieslak

LDEV-4540 Show other teams' answers on results page

Options
    • -75
    • +114
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
  2. … 1 more file in changeset.
Thursday 05 Apr 2018
9:41 pm

Marcin Cieslak

LDEV-4540 Let author choose whether to disclose answers in monitor

Options
    • -0
    • +15
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180330.sql
    • -13
    • +24
    ./java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java
  4. … 3 more files in changeset.
Saturday 24 Mar 2018
2:12 am

Marcin Cieslak

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

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

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

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.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/MonitoringAction.java

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.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/web/action/MonitoringAction.java

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

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.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/service/SubmitFilesService.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.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/LearningAction.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
    • -42
    • +72
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -8
    • +8
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -0
    • +361
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
  6. … 79 more files in changeset.
Monday 05 Mar 2018
8:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  2. … 34 more files in changeset.
6:40 pm

Marcin Cieslak

LDEV-4523 Tools remove mark rather than clear it on user content delete

Options
    • -164
    • +191
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 4 more files in changeset.
Sunday 04 Mar 2018
9:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Merge work replacing audit logs with LogEvent entries

Resolved conflicts for lams.jar and the Admin language file.

Options
    • -6
    • +6
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 13 more files in changeset.
Saturday 03 Mar 2018
6:13 am

Andrey Balan

LDEV-4520 Reimplement student choices page in case of Assessment iRA

It should follow the format of Student choices page in case of MCQ iRA.

Options
    • -0
    • +8
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -0
    • +17
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -153
    • +61
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
  8. … 7 more files in changeset.
Tuesday 27 Feb 2018
10:56 am

Andrey Balan

LKC-89 Add TBL Monitoring code specific for the tools

Add TblMonitoringAction classes and /tblmonitoring/*.jsps to the

tools projects. They will be consumed solely by lams_monitoring

to generate tool specific content required for TBL Monitoring.

Tools themselves won't use those classes and jsps.

Options
    • -1
    • +5
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -3
    • +33
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +46
    ./java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentDTO.java
    • -0
    • +48
    ./java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionDTO.java
    • -0
    • +24
    ./java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionResultDTO.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -10
    • +25
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +20
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -5
    • +5
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -0
    • +454
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
  13. … 40 more files in changeset.
Thursday 22 Feb 2018
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 All Audit Log entries are now Log Event entries

Options
    • -6
    • +6
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 65 more files in changeset.
Tuesday 06 Feb 2018
12:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Tool context files no longer reference audit service.

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
  2. … 62 more files in changeset.
Saturday 03 Feb 2018
5:16 am

Andrey Balan

LDEV-4407 Other projects stop depending on lams_gradebook

* GradebookService interfaces are redefined now:

- IGradebookService is going to be used by core modules.

- IGradebookFullService is used inside of lams_gradebook only and

nowhere else, as it contains lams_gradebook's internal logic and

classes.

* Introduce CommonContants.java which contains for now common

constants that used to be located in GradebookConstants.java

* Tools stop using gradebookService directly, but rather through

ILamsToolService's method updateGradebookUserActivityMark()

* Move GradebookUserActivityArchive and GradebookUserLessonArchive

to lams_gradebook

Options
    • -3
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -10
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -9
    • +9
    ./java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  4. … 54 more files in changeset.
Friday 02 Feb 2018
5:41 am

Andrey Balan

LDEV-4407 Tools to stop using learnerService

There is no need to have a separate ILearnerService designed

for tools only. As long as they require only one method from it

completeToolSession() which we can simply move to

ILamsToolService. After which we just remove learnerService

from the tools.

Options
    • -3
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -8
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  3. … 57 more files in changeset.
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.