lams-github / lams_tool_assessment / src / java / org / lamsfoundation / lams

tool

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 09 Apr 2024
7:16 am

Andrey Balan

Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/summary.jsp

# lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

# lams_tool_leader/web/pages/monitoring/summary.jsp

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

Options
    • -4
    • +47
    ./assessment/web/controller/LearningController.java
    • -5
    • +5
    ./assessment/web/controller/MonitoringController.java
  3. … 29 more files in changeset.
Monday 08 Apr 2024
8:04 pm

Marcin Cieslak

LKC-44 Show all questions if there is at least one random question used

Options
    • -3
    • +15
    ./assessment/service/AssessmentServiceImpl.java
Friday 05 Apr 2024
3:55 pm

Marcin Cieslak

LDEV-5440 Use true/false instead of 1/0 in JPQL queries

Options
    • -14
    • +14
    ./assessment/dao/hibernate/AssessmentResultDAOHibernate.java
Sunday 31 Mar 2024
2:50 am

Marcin Cieslak

LDEV-3224 Add missing import

Options
    • -0
    • +1
    ./assessment/web/controller/LearningController.java
Friday 29 Mar 2024
1:26 am

Marcin Cieslak

LDEV-5124 Add answer time even interaction event was not recorded

Options
    • -37
    • +45
    ./assessment/service/AssessmentServiceImpl.java
1:20 am

Marcin Cieslak

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

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_scratchie/web/pages/authoring/authoring.jsp

Options
    • -33
    • +99
    ./assessment/service/AssessmentServiceImpl.java
    • -2
    • +8
    ./assessment/web/controller/AuthoringController.java
    • -1
    • +44
    ./assessment/web/controller/LearningController.java
  4. … 3 more files in changeset.
1:15 am

Marcin Cieslak

LDEV-3224 Skip blank answer storage into session

Options
    • -3
    • +48
    ./assessment/web/controller/LearningController.java
Wednesday 27 Mar 2024
5:52 pm

Marcin Cieslak

LDEV-5440 Use Long instead of BigInteger in SQL query results

Options
    • -2
    • +2
    ./assessment/web/controller/AuthoringController.java
  2. … 8 more files in changeset.
Wednesday 20 Mar 2024
4:56 pm

Marcin Cieslak

LDEV-5440 Update code to match dependencies

In particular javax -> jakarta package change and new JPA not accepting some attributes.

Options
    • -2
    • +2
    ./assessment/model/Assessment.java
    • -1
    • +1
    ./assessment/model/AssessmentSession.java
  3. … 222 more files in changeset.
Sunday 17 Mar 2024
7:55 pm

Marcin Cieslak

LDEV-5453 Add section information to Assessment export

Options
    • -1
    • +64
    ./assessment/service/AssessmentServiceImpl.java
  2. … 1 more file in changeset.
1:17 am

Marcin Cieslak

LDEV-5452 Allow changing question version in live Assessment and Scratchie

Also fix existing learners' answers rewiring.

Options
    • -32
    • +35
    ./assessment/service/AssessmentServiceImpl.java
    • -1
    • +7
    ./assessment/web/controller/AuthoringController.java
  3. … 7 more files in changeset.
Thursday 29 Feb 2024
10:35 pm

Marcin Cieslak

LDEV-5436 Add comma in usernames in various places

Options
    • -2
    • +2
    ./assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +1
    ./assessment/dao/hibernate/AssessmentUserDAOHibernate.java
  3. … 1 more file in changeset.
7:32 pm

Marcin Cieslak

Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

# lams_tool_images/web/pages/learning/learning.jsp

Options
    • -12
    • +9
    ./assessment/service/AssessmentServiceImpl.java
    • -4
    • +3
    ./assessment/web/controller/LearningController.java
    • -5
    • +5
    ./assessment/web/controller/MonitoringController.java
  4. … 32 more files in changeset.
7:17 pm

Marcin Cieslak

LDEV-5436 Use comma as name separator

Also fix names in few other places.

Options
    • -4
    • +4
    ./assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -9
    • +0
    ./assessment/model/AssessmentUser.java
    • -1
    • +1
    ./assessment/web/controller/MonitoringController.java
  4. … 6 more files in changeset.
4:12 am

Andrey Balan

Merge branch 'v4.8' into LDEV-5424

# Conflicts:

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

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

# lams_central/web/includes/javascript/rating5.js

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

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

# lams_learning/web/css/components-learner.scss

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

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

# lams_tool_assessment/web/pages/learning/results/essay.jsp

# lams_tool_assessment/web/pages/monitoring/monitoring.jsp

# lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/statisticpart.jsp

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

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

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

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

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

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

# lams_tool_images/web/pages/learning/parts/commentsarea.jsp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Options
    • -4
    • +5
    ./assessment/web/controller/LearningController.java
  2. … 13 more files in changeset.
1:35 am

Andrey Balan

LDEV-5445 Assessment learning. Fix mode=teaher for situations when leader hasn't committed his response yet

Options
    • -1
    • +1
    ./assessment/web/controller/LearningController.java
Tuesday 27 Feb 2024
7:35 pm

Marcin Cieslak

LDEV-5449 Add "allow answer rating" option in authoring

Options
    • -0
    • +14
    ./assessment/dbupdates/patch20240227.sql
    • -0
    • +17
    ./assessment/model/Assessment.java
    • -0
    • +1
    ./assessment/service/AssessmentServiceImpl.java
    • -0
    • +1
    ./assessment/web/form/AssessmentForm.java
  5. … 3 more files in changeset.
Tuesday 20 Feb 2024
8:53 pm

Marcin Cieslak

LDEV-5440 Further code upgrade to conform new WF libraries

Options
    • -1
    • +1
    ./assessment/model/AssessmentQuestionResult.java
    • -4
    • +4
    ./assessment/util/AssessmentEscapeUtils.java
  3. … 60 more files in changeset.
Wednesday 14 Feb 2024
1:23 pm

Marcin Cieslak

LDEV-4440 Allow only POST requests when saving Assessment answers

On iPads on connectivity lost and then reload a GET request can be made. It does not have the necessary payload so it may wipe out existing answers.

Options
    • -3
    • +4
    ./assessment/web/controller/LearningController.java
Tuesday 13 Feb 2024
8:25 am

Marcin Cieslak

LDEV-5359 Skip sections after one with "all remaining questions"

Options
    • -1
    • +1
    ./assessment/web/controller/AuthoringController.java
Wednesday 07 Feb 2024
9:55 am

Andrey Balan

LDEV-5424 switch to bootstrap5 versions of js and jsps

Options
    • -1
    • +1
    ./assessment/web/controller/TblMonitoringController.java
  2. … 11 more files in changeset.
Wednesday 31 Jan 2024
2:40 am

Andrey Balan

LDEV-5424 no need for bootstrap 3 versions any longer

Options
    • -3
    • +1
    ./assessment/web/controller/LearningController.java
  2. … 13 more files in changeset.
2:25 am

Andrey Balan

Merge branch 'LDEV-5442' into LDEV-5424

# Conflicts:

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

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

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

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

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

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Options
    • -13
    • +4
    ./assessment/web/controller/MonitoringController.java
  2. … 2 more files in changeset.
1:56 am

Andrey Balan

LDEV-5442 make monitoring use new starability widget

Options
    • -13
    • +4
    ./assessment/web/controller/MonitoringController.java
  2. … 23 more files in changeset.
Sunday 28 Jan 2024
4:45 pm

Marcin Cieslak

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

# Conflicts:

# lams_tool_assessment/web/pages/learning/learning.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_lamc/web/learning/AnswersContent.jsp

# lams_tool_laqa/web/learning/AnswersContent.jsp

# lams_tool_scratchie/web/pages/learning/learning.jsp

Options
    • -12
    • +28
    ./assessment/service/AssessmentServiceImpl.java
    • -5
    • +18
    ./assessment/web/controller/MonitoringController.java
  3. … 137 more files in changeset.
1:11 am

Marcin Cieslak

LDEV-5360 Indicate auto-graded answers

Options
    • -4
    • +13
    ./assessment/web/controller/MonitoringController.java
  2. … 5 more files in changeset.
12:54 am

Marcin Cieslak

LDEV-5360 Allow even longer marker comments

Caused by

https://lamssupport.atlassian.net/browse/ICL-18

Options
    • -0
    • +15
    ./assessment/dbupdates/patch20240127.sql
  2. … 3 more files in changeset.
12:49 am

Marcin Cieslak

LDEV-5360 Allow multiline marker comments

Caused by

https://lamssupport.atlassian.net/browse/ICL-27

Options
    • -9
    • +18
    ./assessment/model/AssessmentQuestionResult.java
    • -8
    • +14
    ./assessment/util/AssessmentEscapeUtils.java
    • -1
    • +5
    ./assessment/web/controller/MonitoringController.java
  4. … 4 more files in changeset.
Thursday 25 Jan 2024
10:39 pm

Marcin Cieslak

LDEV-3224 Discard blank essay answer overwriting a non-blank one

Options
    • -12
    • +28
    ./assessment/service/AssessmentServiceImpl.java
Sunday 21 Jan 2024
5:30 pm

Marcin Cieslak

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

# Conflicts:

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

Options
    • -2
    • +9
    ./assessment/service/AssessmentServiceImpl.java
    • -0
    • +4
    ./assessment/web/controller/MonitoringController.java
  3. … 9 more files in changeset.