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
Sunday 24 Jun 2018
8:41 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.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/web/action/McMonitoringAction.java

lams_tool_mindmap/.classpath

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

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  2. … 23 more files in changeset.
Saturday 23 Jun 2018
1:28 am

Marcin Cieslak

LDEV-4607 Confirm delete marks on output change in monitoring

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +8
    ./web/pages/monitoring/statisticpart.jsp
  3. … 2 more files in changeset.
12:42 am

Marcin Cieslak

LDEV-4607 Remove marks on output change to "none" in monitoring

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -1
    • +1
    ./web/pages/monitoring/parts/toolOutput.jsp
    • -5
    • +0
    ./web/pages/monitoring/statisticpart.jsp
  5. … 8 more files in changeset.
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
    • -2
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -4
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -42
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -23
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -10
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -11
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
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
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -0
    • +42
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -2
    • +23
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
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
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -4
    • +4
    ./web/pages/monitoring/parts/questionsummary.jsp
    • -4
    • +4
    ./web/pages/monitoring/summary.jsp
Tuesday 22 May 2018
3:04 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

Options
    • -4
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -17
    • +17
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 46 more files in changeset.
Monday 21 May 2018
11:10 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 25 more files in changeset.
7:03 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

Options
    • -4
    • +5
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -26
    • +74
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +10
    ./conf/language/lams/ApplicationResources_no_NO.properties
  4. … 36 more files in changeset.
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
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -24
    • +79
    ./src/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
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -18
    • +42
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -25
    • +48
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -0
    • +52
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -1
    • +1
    ./src/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
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -3
    • +26
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
  5. … 1 more file in changeset.
10:41 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4586 Letter prefixes shown on results page

Options
    • -3
    • +6
    ./web/pages/learning/results/multiplechoice.jsp
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
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180515.sql
5:42 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek and English

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
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
    • +9
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180515.sql
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/OptionDTO.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java
    • -0
    • +8
    ./web/includes/css/assessment.scss
    • -1
    • +35
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -3
    • +6
    ./web/pages/learning/parts/multiplechoice.jsp
Thursday 10 May 2018
2:56 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating missing labels and Greek

Options
    • -11
    • +13
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +10
    ./conf/language/lams/ApplicationResources_en_AU.properties
  4. … 13 more files in changeset.
Wednesday 09 May 2018
1:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -1
    • +6
    ./web/WEB-INF/tags/Comments.tag
    • -1
    • +22
    ./web/WEB-INF/tags/CommentsAuthor.tag
  3. … 91 more files in changeset.
Tuesday 08 May 2018
7:28 am

Marcin Cieslak

LDEV-4575 Show disclose buttons only when corresponding option is ON

Options
    • -14
    • +16
    ./web/pages/tblmonitoring/assessment.jsp
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
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180425.sql
    • -26
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180525.sql
  3. … 38 more files in changeset.
Tuesday 01 May 2018
3:35 am

Andrey Balan

LDEV-4569 TBL UI: adjustments

* wrap lesson's name

* revice the LAMS logo at the top left corner

* Make TBL monitor to follow themes

* AEs' tab title is "AEs Questions & Marks" now

Options
    • -1
    • +1
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
  2. … 5 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
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180525.sql
  2. … 28 more files in changeset.
Sunday 22 Apr 2018
6:15 pm

Marcin Cieslak

LDEV-4540 Fix variable name clash when iterating over options

Options
    • -4
    • +4
    ./web/pages/learning/results/multiplechoice.jsp
Tuesday 17 Apr 2018
6:13 pm

Marcin Cieslak

LDEV-4540 Prevent non-leader Assessments from using answer disclosing

Options
    • -0
    • +5
    ./web/pages/authoring/advance.jsp
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
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -9
    • +13
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
Thursday 12 Apr 2018
6:34 pm

Marcin Cieslak

LDEV-4540 Change layout of other groups' answers for MC questions

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +9
    ./web/pages/learning/results.jsp
    • -0
    • +1
    ./web/pages/learning/results/essay.jsp
    • -39
    • +27
    ./web/pages/learning/results/multiplechoice.jsp
5:44 pm

Marcin Cieslak

LDEV-4540 Show correct answers and user's answers separately

Options
    • -4
    • +4
    ./web/pages/learning/results/multiplechoice.jsp
Wednesday 11 Apr 2018
9:52 pm

Marcin Cieslak

LDEV-4540 Move groups' answers under each question

Options
    • -1
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +9
    ./web/pages/learning/results.jsp
    • -1
    • +30
    ./web/pages/learning/results/essay.jsp
    • -5
    • +55
    ./web/pages/learning/results/multiplechoice.jsp
    • -138
    • +0
    ./web/pages/learning/results/tblsummary.jsp
9:06 pm

Marcin Cieslak

LDEV-4540 Do not show correct answers until they are disclosed

Till now other groups' answers were marked as correct no matter if

correct answers were disclosed by a monitor.

Options
    • -1
    • +1
    ./web/pages/learning/results/tblsummary.jsp
Tuesday 10 Apr 2018
11:42 am

Marcin Cieslak

LDEV-4540 Add logs

Options
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java