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
Friday 28 Jul 2023
8:51 pm

Ernie Ghiglione

LDEV-5345 Adding and updating latest translations

Options
    • -1
    • +17
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -4
    • +20
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +15
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -3
    • +5
    ./conf/language/lams/ApplicationResources_it_IT.properties
    • -1
    • +17
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -4
    • +5
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +2
    ./conf/language/lams/ApplicationResources_zh_CN.properties
  9. … 118 more files in changeset.
Thursday 27 Jul 2023
7:15 pm

Ernie Ghiglione

LDEV-5345 Adding and updating latest translations

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_it_IT.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  5. … 29 more files in changeset.
2:12 am

Ernie Ghiglione

LDEV-5345 Adding and updating latest translations

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +5
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_it_IT.properties
    • -0
    • +4
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  7. … 194 more files in changeset.
Wednesday 26 Jul 2023
10:01 pm

Marcin Cieslak

SP-9 Rewrite lesson completion chart to new ChartJS

Options
    • -6
    • +0
    ./web/includes/javascript/chart5.js
    • -2
    • +0
    ./web/pages/monitoring/monitoring.jsp
  3. … 4 more files in changeset.
9:31 pm

Marcin Cieslak

SP-9 Upgrade ChartJS from version 2.9 to 4.3.1

Rewrite chart generating code to match new API

Options
    • -86
    • +85
    ./web/includes/javascript/chart.js
    • -91
    • +93
    ./web/includes/javascript/chart5.js
    • -1
    • +1
    ./web/pages/monitoring/monitoring.jsp
    • -275
    • +282
    ./web/pages/monitoring/summary.jsp
    • -85
    • +87
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +3
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  7. … 3 more files in changeset.
Monday 24 Jul 2023
6:11 pm

Marcin Cieslak

Merge branch 'v4.7' into LAI-5

# Conflicts:

# lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -7
    • +29
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 1 more file in changeset.
12:02 am

Ernie Ghiglione

LDEV-5345 Adding and updating latest translations

Big refactoring of labels in Lokalise. Redundant keys for tools are not all based out of lams_noticeboard to ensure that most reused labels have a single reference point.

Added Italian for a whole lot of tools -including monitor and assessment

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +2
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -0
    • +453
    ./conf/language/lams/ApplicationResources_it_IT.properties
    • -4
    • +5
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -4
    • +3
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +1
    ./conf/language/lams/ApplicationResources_zh_CN.properties
  11. … 220 more files in changeset.
Sunday 23 Jul 2023
12:18 am

Marcin Cieslak

LAI-5 Add more Greek i18n labels

Options
    • -1
    • +2
    ./conf/language/lams/ApplicationResources_el_GR.properties
Saturday 22 Jul 2023
3:36 pm

Ernie Ghiglione

LDEV-5345 Adding and updating latest translations

Options
    • -25
    • +21
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +25
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -25
    • +21
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +9
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +7
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -3
    • +0
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_zh_CN.properties
  9. … 170 more files in changeset.
Sunday 16 Jul 2023
6:02 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-5391' into LDEV-5391

# Conflicts:

# idea_project/.idea/.name

# idea_project/.idea/runConfigurations/WildFly.xml

# lams_admin/web/WEB-INF/tags/Rating.tag

# lams_central/web/WEB-INF/tags/Rating.tag

# lams_gradebook/web/WEB-INF/tags/Rating.tag

# lams_learning/web/WEB-INF/tags/Rating.tag

# lams_monitoring/web/WEB-INF/tags/Rating.tag

# lams_tool_assessment/web/WEB-INF/tags/Rating.tag

# lams_tool_chat/web/WEB-INF/tags/Rating.tag

# lams_tool_daco/web/WEB-INF/tags/Rating.tag

# lams_tool_doku/web/WEB-INF/tags/Rating.tag

# lams_tool_doku/web/pages/authoring/advance.jsp

# lams_tool_doku/web/pages/learning/galleryWalk.jsp

# lams_tool_forum/web/WEB-INF/tags/Rating.tag

# lams_tool_gmap/web/WEB-INF/tags/Rating.tag

# lams_tool_images/web/WEB-INF/tags/Rating.tag

# lams_tool_imscc/web/WEB-INF/tags/Rating.tag

# lams_tool_lamc/web/WEB-INF/tags/Rating.tag

# lams_tool_laqa/web/WEB-INF/tags/Rating.tag

# lams_tool_larsrc/web/WEB-INF/tags/Rating.tag

# lams_tool_leader/web/WEB-INF/tags/Rating.tag

# lams_tool_mindmap/web/WEB-INF/tags/Rating.tag

# lams_tool_nb/web/WEB-INF/tags/Rating.tag

# lams_tool_notebook/web/WEB-INF/tags/Rating.tag

# lams_tool_pixlr/web/WEB-INF/tags/Rating.tag

# lams_tool_preview/.classpath

# lams_tool_preview/web/WEB-INF/tags/Rating.tag

# lams_tool_preview/web/WEB-INF/tags/StyledRating.tag

# lams_tool_sbmt/web/WEB-INF/tags/Rating.tag

# lams_tool_scratchie/web/WEB-INF/tags/Rating.tag

# lams_tool_scribe/web/WEB-INF/tags/Rating.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag

# lams_tool_survey/web/WEB-INF/tags/Rating.tag

# lams_tool_task/web/WEB-INF/tags/Rating.tag

# lams_tool_vote/web/WEB-INF/tags/Rating.tag

# lams_tool_whiteboard/web/WEB-INF/tags/Rating.tag

# lams_tool_wiki/web/WEB-INF/tags/Rating.tag

# lams_tool_zoom/web/WEB-INF/tags/Rating.tag

# lams_www/web/WEB-INF/tags/Rating.tag

Options
    • -7
    • +11
    ./web/WEB-INF/tags/Rating.tag
  2. … 38 more files in changeset.
Tuesday 11 Jul 2023
2:18 pm

Marcin Cieslak

LDEV-5213 Use version-dependent imports for LAMS JS files

Options
    • -1
    • +1
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +1
    ./web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    ./web/WEB-INF/tags/Page.tag
    • -2
    • +2
    ./web/WEB-INF/tags/Page5.tag
    • -2
    • +2
    ./web/WEB-INF/tags/headItems.tag
    • -1
    • +1
    ./web/common/header.jsp
    • -4
    • +2
    ./web/common/tabbedheader.jsp
    • -4
    • +4
    ./web/pages/authoring/randomQuestion.jsp
    • -1
    • +1
    ./web/pages/learning/results/allquestions.jsp
    • -4
    • +4
    ./web/pages/monitoring/monitoring.jsp
    • -3
    • +3
    ./web/pages/monitoring/parts/questionsummary.jsp
  12. … 328 more files in changeset.
Monday 26 Jun 2023
4:45 pm

Marcin Cieslak

Merge branch 'v4.7' into LAI-5

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

Options
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
  2. … 1 more file in changeset.
Friday 23 Jun 2023
11:36 pm

Marcin Cieslak

Merge branch 'LDEV-5401' into v4.7

# Conflicts:

# lams_common/src/java/org/lamsfoundation/lams/web/controller/AbstractTimeLimitWebsocketServer.java

Options
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
  2. … 1 more file in changeset.
11:33 pm

Marcin Cieslak

LDEV-5401 Add learner-triggered absolute timer to other tools

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -12
    • +13
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -14
    • +0
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  5. … 39 more files in changeset.
Thursday 22 Jun 2023
10:18 pm

Marcin Cieslak

LDEV-5142 Fortify time limit websocket server code to prevent NPEs

Options
    • -23
    • +29
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
  2. … 1 more file in changeset.
7:25 pm

Marcin Cieslak

LDEV-5401 Add learner-triggered absolute time limit monitoring

Also make time limit panel refresh automatically in monitoring.

Options
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -14
    • +35
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -7
    • +22
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -1
    • +2
    ./web/pages/monitoring/summary.jsp
    • -1
    • +2
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -4
    • +15
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  9. … 3 more files in changeset.
2:10 am

Marcin Cieslak

LDEV-5401 Add learner-triggered absolute time limit authoring and learning

Options
    • -2
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +11
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20230621.sql
    • -13
    • +24
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -4
    • +7
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -297
    • +358
    ./web/pages/authoring/advance.jsp
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
    • -1
    • +1
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +1
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  12. … 6 more files in changeset.
Tuesday 20 Jun 2023
8:56 pm

Marcin Cieslak

LDEV-5400 Update completion chart on learner traversal

Options
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +10
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -53
    • +59
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
8:55 pm

Marcin Cieslak

LDEV-5400 Fix query which detects learners who completed Assessment

Options
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
8:11 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into v4.7

Options
    • -18
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
8:09 pm

Marcin Cieslak

LDEV-5400 Fix query which detects learners who completed Assessment

Options
    • -18
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
12:44 am

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into v4.7

Options
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -94
    • +123
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -16
    • +40
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -52
    • +131
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -17
    • +25
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -72
    • +55
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
    • -92
    • +154
    ./web/includes/javascript/chart.js
    • -98
    • +161
    ./web/includes/javascript/chart5.js
    • -30
    • +30
    ./web/pages/monitoring/summary.jsp
    • -16
    • +16
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -5
    • +2
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  14. … 2 more files in changeset.
Wednesday 14 Jun 2023
5:04 pm

Marcin Cieslak

LDEV-5130 Show ALlocate VSAs button in iRAT monitoring

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -9
    • +15
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
    • -49
    • +51
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
Monday 05 Jun 2023
6:09 pm

Marcin Cieslak

LAI-5 Add menu item in authoring to open AI wizard

Options
    • -4
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -20
    • +23
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  3. … 5 more files in changeset.
Friday 02 Jun 2023
3:04 am

Marcin Cieslak

Merge origin/v4.7 into LDEV-5399

Options
    • -1
    • +5
    ./lams_tool_assessment.eml
  2. … 1 more file in changeset.
Tuesday 30 May 2023
3:35 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into v4.7

# Conflicts:

# idea_project/.idea/runConfigurations/WildFly.xml

# lams_tool_assessment/lams_tool_assessment.eml

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

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

Options
    • -1
    • +5
    ./lams_tool_assessment.eml
    • -140
    • +164
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  3. … 9 more files in changeset.
12:27 am

Marcin Cieslak

LDEV-5400 Add tooltip with learners to activity completion chart

Also add group information in the tooltip

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -26
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
    • -95
    • +154
    ./web/includes/javascript/chart.js
    • -242
    • +242
    ./web/pages/monitoring/summary.jsp
    • -1
    • +1
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +1
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
Monday 29 May 2023
5:24 pm

Marcin Cieslak

LDEV-5369 Fix Peer Review pivot rubrics results ordering

Options
    • -4
    • +3
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 32 more files in changeset.
1:22 am

Marcin Cieslak

LDEV-5400 Add list of Assessment started/not started/completed students on chart hover

Options
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -3
    • +7
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -94
    • +123
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -25
    • +50
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -13
    • +81
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -34
    • +25
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -89
    • +53
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
    • -6
    • +9
    ./web/includes/javascript/chart.js
  10. … 1 more file in changeset.
Friday 26 May 2023
3:46 am

Marcin Cieslak

LDEV-5041 Prevent resetting relative time limit

Options
    • -1
    • +12
    ./lams_tool_assessment.eml
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  3. … 2 more files in changeset.