Fisheye on lams-github/lams_tool_assessment/src/java

lams-github (): Merge branch 'v4.8' into LDEV-5424...

Andrey Balan — Tue, 09 Apr 2024 01:16:49 +0200

Andrey Balan committed c52f84e on branch in lams-github

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

· /lams_learning/web/discussion/monitor5.jsp

(-17, +17)

| History

| Source

| Diff

· /lams_monitoring/web/grouping/viewGroups.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/includes/javascript/monitorLesson.js

(-8, +8)

| History

| Source

| Diff

· /lams_monitoring/web/monitor.jsp

(-58, +66)

| History

| Source

| Diff

· /lams_monitoring/web/tblmonitor/teams.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

(-0, +4)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java

(-4, +47)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java

(-5, +5)

| History

| Source

| Diff

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

(-2, +1)

| History

| Source

| Diff

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

(-1, +5)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/summary.jsp

(-8, +111)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/summary5.jsp

(-12, +135)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java

(-12, +11)

| History

| Source

| Diff

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

(-3, +2)

| History

| Source

| Diff

… 16 more files in changeset.

lams-github (v4.8): LKC-44 Show all questions if there is at least one random question used

Marcin Cieslak — Mon, 08 Apr 2024 14:04:15 +0200

Marcin Cieslak committed df2ba0c on branch v4.8 in lams-github

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

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java

(-3, +15)

| History

| Source

| Diff

lams-github (): LDEV-5440 Use true/false instead of 1/0 in JPQL queries

Marcin Cieslak — Fri, 05 Apr 2024 09:55:45 +0200

Marcin Cieslak committed 8f8e67f on branch in lams-github

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

· /lams_tool_assessment/src/java/org/.../assessment/dao/hibernate/AssessmentResultDAOHibernate.java

(-14, +14)

| History

| Source

| Diff

lams-github (v4.8): LDEV-3224 Add missing import

Marcin Cieslak — Sat, 30 Mar 2024 19:50:59 +0100

Marcin Cieslak committed 407ddc7 on branch v4.8 in lams-github

LDEV-3224 Add missing import

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java

(-0, +1)

| History

| Source

| Diff

lams-github (v4.8): LDEV-5124 Add answer time even interaction event was not recorded

Marcin Cieslak — Thu, 28 Mar 2024 18:26:30 +0100

Marcin Cieslak committed e4dafa8 on branch v4.8 in lams-github

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

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java

(-37, +45)

| History

| Source

| Diff

lams-github (v4.8): Merge remote-tracking branch 'origin/v4.7' into v4.8...

Marcin Cieslak — Thu, 28 Mar 2024 18:20:47 +0100

Marcin Cieslak committed b2a6839 on branch v4.8 in lams-github

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

· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-33, +99)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/AuthoringController.java	(-2, +8)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java	(-1, +44)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java	(-29, +60)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/authoring/authoring.jsp	(-2, +4)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3224 Skip blank answer storage into session

Marcin Cieslak — Thu, 28 Mar 2024 18:15:14 +0100

Marcin Cieslak committed 4f99443 on branch v4.7, v4.8 in lams-github

LDEV-3224 Skip blank answer storage into session

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java

(-3, +48)

| History

| Source

| Diff

lams-github (): LDEV-5440 Use Long instead of BigInteger in SQL query results

Marcin Cieslak — Wed, 27 Mar 2024 10:52:59 +0100

Marcin Cieslak committed 75088f2 on branch in lams-github

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

· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(-10, +10)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java	(-5, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/AuthoringController.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_preview/src/java/org/lamsfoundation/.../peerreview/web/controller/MonitoringController.java	(-1, +0)	\| History	\| Source	\| Diff

lams-github (): LDEV-5440 Update code to match dependencies...

Marcin Cieslak — Wed, 20 Mar 2024 09:56:00 +0100

Marcin Cieslak committed 35d617e on branch in lams-github

LDEV-5440 Update code to match dependencies

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

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/jstl/c.tld

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/jstl/fmt.tld

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/jstl/permittedTaglibs.tld

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/jstl/scriptfree.tld

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/jstl/x.tld

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/web.xml

(-2, +2)

| History

| Source

| Diff

· /lams_bb_integration/.classpath

(-1, +0)

| History

| Source

| Diff

· /lams_bb_integration/WEB-INF/tlds/c.tld

(-3, +3)

| History

| Source

| Diff

· /lams_bb_integration/lams_bb_integration.eml

(-4, +3)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java

(-18, +19)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java

(-24, +23)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java

(-24, +24)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tlds/jstl/c.tld

(-3, +3)

| History

| Source

| Diff

… 209 more files in changeset.

lams-github (v4.7): LDEV-5453 Add section information to Assessment export

Marcin Cieslak — Sun, 17 Mar 2024 12:55:49 +0100

Marcin Cieslak committed 550273f on branch v4.7, v4.8 in lams-github

LDEV-5453 Add section information to Assessment export

· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-1, +64)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5452 Allow changing question version in live Assessment and Scratchie...

Marcin Cieslak — Sat, 16 Mar 2024 18:17:43 +0100

Marcin Cieslak committed db5bb77 on branch v4.7, v4.8 in lams-github

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

Also fix existing learners' answers rewiring.

· /idea_project/.idea/.gitignore	(-1, +3)	\| History	\| Source	\| Diff
· /idea_project/idea_project.iml	(-1, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20240315.sql	(-0, +17)	\| History	\| Source
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-32, +35)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/AuthoringController.java	(-1, +7)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/authoring/authoring.jsp	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp	(-14, +49)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java	(-26, +57)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/authoring/authoring.jsp	(-8, +10)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5436 Add comma in usernames in various places

Marcin Cieslak — Thu, 29 Feb 2024 15:35:21 +0100

Marcin Cieslak committed 9ba7879 on branch v4.8 in lams-github

LDEV-5436 Add comma in usernames in various places

· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-5, +3)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../assessment/dao/hibernate/AssessmentResultDAOHibernate.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../assessment/dao/hibernate/AssessmentUserDAOHibernate.java	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.8): Merge branch 'LDEV-5436' into v4.8...

Marcin Cieslak — Thu, 29 Feb 2024 12:32:58 +0100

Marcin Cieslak committed 330b0d5 on branch v4.8 in lams-github

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

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java

(-8, +7)

| History

| Source

| Diff

· /lams_learning/web/grouping/choose.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/grouping/show.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

(-9, +2)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/gate/gateStatus.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/includes/javascript/monitorLesson.js

(-2, +2)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java

(-12, +9)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java

(-4, +3)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java

(-5, +5)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

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

(-2, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/results.jsp

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 20 more files in changeset.

lams-github (v4.8): LDEV-5436 Use comma as name separator...

Marcin Cieslak — Thu, 29 Feb 2024 12:17:33 +0100

Marcin Cieslak committed 56ecfc5 on branch v4.8 in lams-github

LDEV-5436 Use comma as name separator

Also fix names in few other places.

· /lams_central/web/includes/javascript/groups.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserDetails.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateController.java	(-6, +15)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java	(-1, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../assessment/dao/hibernate/AssessmentUserDAOHibernate.java	(-4, +4)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.java	(-9, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_leader/src/java/org/lamsfoundation/.../tool/leaderselection/dto/LeaderselectionUserDTO.java	(-16, +9)	\| History	\| Source	\| Diff
· /lams_tool_leader/web/pages/monitoring/summary.jsp	(-2, +2)	\| History	\| Source	\| Diff

lams-github (): Merge branch 'v4.8' into LDEV-5424...

Andrey Balan — Wed, 28 Feb 2024 21:12:47 +0100

Andrey Balan committed 6ca7c6f on branch in lams-github

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

· /lams_central/web/css/components.scss	(-0, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-3, +6)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java	(-4, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results/essay.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp	(-5, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	(-1, +18)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(-44, +51)	\| History	\| Source	\| Diff
· /lams_tool_forum/web/jsps/learning/viewforum.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_tool_larsrc/web/pages/learning/learning.jsp	(-6, +7)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/learning.jsp	(-1, +2)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5445 Assessment learning. Fix mode=teaher for situations when leader hasn't committed his response yet

Andrey Balan — Wed, 28 Feb 2024 18:35:02 +0100

Andrey Balan committed eb36b77 on branch v4.8 in lams-github

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

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java

(-1, +1)

| History

| Source

| Diff

lams-github (v4.8): LDEV-5449 Add "allow answer rating" option in authoring

Marcin Cieslak — Tue, 27 Feb 2024 12:35:35 +0100

Marcin Cieslak committed 96b7a25 on branch v4.8 in lams-github

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

· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20240227.sql	(-0, +14)	\| History	\| Source
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(-0, +17)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/authoring/advance.jsp	(-8, +22)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	(-1, +18)	\| History	\| Source	\| Diff

lams-github (): LDEV-5440 Further code upgrade to conform new WF libraries

Marcin Cieslak — Tue, 20 Feb 2024 13:53:22 +0100

Marcin Cieslak committed cb01d2d on branch in lams-github

LDEV-5440 Further code upgrade to conform new WF libraries

· /lams_build/build.xml

(-27, +1)

| History

| Source

| Diff

· /lams_build/lib/jakarta-commons/codec.module.xml

(-27, +0)

| History

| Source

| Diff

· /lams_build/lib/jakarta-commons/commons-codec-1.15.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/jakarta-commons/commons-logging-1.2.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/jakarta-commons/io.module.xml

(-29, +0)

| History

| Source

| Diff

· /lams_build/lib/jakarta-commons/logging.module.xml

(-29, +0)

| History

| Source

| Diff

· /lams_central/.classpath

(-3, +3)

| History

| Source

| Diff

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

(-119, +181)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentForm.java

(-1, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/security/DatabaseAuthenticator.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/security/SimpleGroup.java

(-6, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java

(-28, +28)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/JlatexmathServlet.java

(-28, +30)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/RuntimeStatsServlet.java

(-2, +2)

| History

| Source

| Diff

· /lams_common/lams_common.eml

(-1, +1)

| History

| Source

| Diff

… 47 more files in changeset.

lams-github (v4.8): LDEV-4440 Allow only POST requests when saving Assessment answers...

Marcin Cieslak — Wed, 14 Feb 2024 06:23:48 +0100

Marcin Cieslak committed 45ade8c on branch v4.8 in lams-github

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.

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java

(-3, +4)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5359 Skip sections after one with "all remaining questions"

Marcin Cieslak — Tue, 13 Feb 2024 01:25:06 +0100

Marcin Cieslak committed c6bcdb3 on branch v4.7, v4.8 in lams-github

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

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/AuthoringController.java

(-1, +1)

| History

| Source

| Diff

lams-github (): LDEV-5424 switch to bootstrap5 versions of js and jsps

Andrey Balan — Wed, 07 Feb 2024 02:55:29 +0100

Andrey Balan committed d644891 on branch in lams-github

LDEV-5424 switch to bootstrap5 versions of js and jsps

· /lams_monitoring/web/timeLimit.jsp	(-301, +265)	\| History	\| Source	\| Diff
· /lams_monitoring/web/timeLimit5.jsp	(-765, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../assessment/web/controller/TblMonitoringController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/includes/javascript/chart.js	(-53, +50)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/includes/javascript/chart5.js	(-304, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers.jsp	(-43, +42)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp	(-120, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/mcqStudentChoices.jsp	(-61, +86)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/mcqStudentChoices5.jsp	(-134, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (): LDEV-5424 no need for bootstrap 3 versions any longer

Andrey Balan — Tue, 30 Jan 2024 19:40:48 +0100

Andrey Balan committed cc5613c on branch in lams-github

LDEV-5424 no need for bootstrap 3 versions any longer

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java	(-3, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/resultsbootstrap3/allquestions.jsp	(-340, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/resultsbootstrap3/confidencelevel.jsp	(-35, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/resultsbootstrap3/essay.jsp	(-114, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/resultsbootstrap3/historyresponses.jsp	(-109, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/resultsbootstrap3/markandpenaltyarea.jsp	(-21, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/resultsbootstrap3/markhedging.jsp	(-90, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/resultsbootstrap3/matchingpairs.jsp	(-50, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/resultsbootstrap3/multiplechoice.jsp	(-131, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/resultsbootstrap3/numerical.jsp	(-34, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/resultsbootstrap3/ordering.jsp	(-41, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/resultsbootstrap3/truefalse.jsp	(-89, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/resultsbootstrap3/vsa.jsp	(-36, +0)	\| History	\| Source	\| Diff
· /lams_tool_larsrc/web/pages/monitoring/comments.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (): Merge branch 'LDEV-5442' into LDEV-5424...

Andrey Balan — Tue, 30 Jan 2024 19:25:15 +0100

Andrey Balan committed 62268e7 on branch in lams-github

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

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java	(-13, +4)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(-60, +85)	\| History	\| Source	\| Diff

lams-github (): LDEV-5442 make monitoring use new starability widget

Andrey Balan — Tue, 30 Jan 2024 18:56:48 +0100

Andrey Balan committed b1018fb on branch in lams-github

LDEV-5442 make monitoring use new starability widget

· /lams_central/web/css/rating.scss

(-8, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/rating/RatingUtil.java

(-0, +28)

| History

| Source

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java

(-13, +4)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp

(-1, +1)

| History

| Source

| Diff

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

(-7, +3)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/summary.jsp

(-9, +6)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/summary5.jsp

(-9, +6)

| History

| Source

| Diff

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

(-7, +3)

| History

| Source

| Diff

· /lams_tool_images/web/pages/monitoring/monitoring.jsp

(-7, +3)

| History

| Source

| Diff

· /lams_tool_images/web/pages/monitoring/statistic.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_images/web/pages/monitoring/summary.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_laqa/web/includes/css/qalearning.scss

(-1, +0)

| History

| Source

| Diff

· /lams_tool_laqa/web/learning/LearnerRep.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

(-30, +14)

| History

| Source

| Diff

· /lams_tool_laqa/web/monitoring/PrintAnswers.jsp

(-31, +48)

| History

| Source

| Diff

… 9 more files in changeset.

lams-github (v4.8): Merge remote-tracking branch 'origin/v4.7' into v4.8...

Marcin Cieslak — Sun, 28 Jan 2024 09:45:49 +0100

Marcin Cieslak committed 0b1d534 on branch v4.8 in lams-github

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

· /lams_admin/web/WEB-INF/tags/Page.tag

(-23, +7)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/Page5.tag

(-22, +6)

| History

| Source

| Diff

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

(-14, +17)

| History

| Source

| Diff

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

(-9, +21)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/Page.tag

(-3, +6)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/Page5.tag

(-3, +6)

| History

| Source

| Diff

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

(-14, +17)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/Page.tag

(-23, +7)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/Page5.tag

(-22, +6)

| History

| Source

| Diff

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

(-14, +17)

| History

| Source

| Diff

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

(-9, +21)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/Page.tag

(-23, +7)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/Page5.tag

(-22, +6)

| History

| Source

| Diff

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

(-14, +17)

| History

| Source

| Diff

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

(-9, +21)

| History

| Source

| Diff

… 124 more files in changeset.

lams-github (v4.7): LDEV-5360 Indicate auto-graded answers

Marcin Cieslak — Sat, 27 Jan 2024 18:11:09 +0100

Marcin Cieslak committed 57a3aa1 on branch v4.7, v4.8 in lams-github

LDEV-5360 Indicate auto-graded answers

· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java	(-4, +13)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(-55, +54)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(-6, +6)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5360 Allow even longer marker comments...

Marcin Cieslak — Sat, 27 Jan 2024 17:54:15 +0100

Marcin Cieslak committed 00e68ec on branch v4.7, v4.8 in lams-github

LDEV-5360 Allow even longer marker comments

Caused by

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

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20240127.sql	(-0, +15)	\| History	\| Source
· /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5360 Allow multiline marker comments...

Marcin Cieslak — Sat, 27 Jan 2024 17:49:09 +0100

Marcin Cieslak committed 8a4525c on branch v4.7, v4.8 in lams-github

LDEV-5360 Allow multiline marker comments

Caused by

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

· /lams_central/web/includes/javascript/free.jquery.jqgrid.min.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/model/AssessmentQuestionResult.java	(-9, +18)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/util/AssessmentEscapeUtils.java	(-8, +14)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java	(-1, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(-287, +297)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(-232, +242)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-3, +12)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3224 Discard blank essay answer overwriting a non-blank one

Marcin Cieslak — Thu, 25 Jan 2024 15:39:41 +0100

Marcin Cieslak committed 8f973f6 on branch v4.7, v4.8 in lams-github

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

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java

(-12, +28)

| History

| Source

| Diff

lams-github (v4.8): Merge remote-tracking branch 'origin/v4.7' into v4.8...

Marcin Cieslak — Sun, 21 Jan 2024 10:30:17 +0100

Marcin Cieslak committed 0edec29 on branch v4.8 in lams-github

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

# Conflicts:

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

· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-2, +9)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(-5, +6)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/.../tool/dokumaran/web/controller/MonitoringController.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java	(-0, +5)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/MonitoringController.java	(-24, +23)	\| History	\| Source	\| Diff
· /lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java	(-0, +6)	\| History	\| Source	\| Diff
· /lams_tool_whiteboard/src/java/org/lamsfoundation/.../whiteboard/web/controller/MonitoringController.java	(-0, +4)	\| History	\| Source	\| Diff