Fisheye on lams-github/lams_tool_assessment/src

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 (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 (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 (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 (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 (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

lams-github (v4.7): LDEV-5401 Hide individual extension from widget after learner finished

Marcin Cieslak — Fri, 19 Jan 2024 12:45:09 +0100

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

LDEV-5401 Hide individual extension from widget after learner finished

· /lams_monitoring/web/timeLimit.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/timeLimit5.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-0, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java	(-0, +4)	\| 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	(-25, +31)	\| 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

lams-github (v4.7): LDEV-4386 Display results in order following question references...

Marcin Cieslak — Wed, 17 Jan 2024 16:08:40 +0100

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

LDEV-4386 Display results in order following question references

Caused by

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

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

(-2, +3)

| History

| Source

| Diff

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

Marcin Cieslak — Wed, 17 Jan 2024 11:52:18 +0100

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

LDEV-5360 Allow longer marker comments

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20240117.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	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-1, +1)	\| History	\| Source	\| Diff

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

Marcin Cieslak — Mon, 15 Jan 2024 18:50:17 +0100

Marcin Cieslak committed ddd6d9e 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/service/AssessmentServiceImpl.java

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

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

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

· /lams_monitoring/web/monitor.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-0, +26)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(-130, +131)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(-280, +281)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4386 Display results in order following question references...

Marcin Cieslak — Mon, 15 Jan 2024 16:34:03 +0100

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

LDEV-4386 Display results in order following question references

Caused by

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

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

(-2, +4)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5438 Add Assessment autosave logs

Marcin Cieslak — Sun, 14 Jan 2024 08:17:48 +0100

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

LDEV-5438 Add Assessment autosave logs

· /lams_build/conf/slim/standalone.xml	(-2, +21)	\| History	\| Source	\| Diff
· /lams_build/conf/standalone.xml	(-2, +21)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-0, +26)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5436 Project-wide user sorting by last then first name

Marcin Cieslak — Tue, 09 Jan 2024 09:41:35 +0100

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

LDEV-5436 Project-wide user sorting by last then first name

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-11, +12)

| History

| Source

| Diff

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

(-11, +11)

| History

| Source

| Diff

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

(-15, +13)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/organisation/parts/selectLearners.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/parts/selectStaff.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/user/basiclist.jsp

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-9, +8)

| History

| Source

| Diff

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

(-8, +7)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java

(-8, +10)

| History

| Source

| Diff

· /lams_central/web/emailuser.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/findUserLessons.jsp

(-1, +1)

| History

| Source

| Diff

… 136 more files in changeset.

lams-github (v4.8): LDEV-5420 Display info when no printable questions found

Marcin Cieslak — Tue, 02 Jan 2024 15:19:48 +0100

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

LDEV-5420 Display info when no printable questions found

· /lams_central/web/qb/printQuestions.jsp	(-124, +132)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/AuthoringController.java	(-3, +2)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5420 Move print page to Central for other modules to use...

Marcin Cieslak — Tue, 02 Jan 2024 11:21:55 +0100

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

LDEV-5420 Move print page to Central for other modules to use

Also add meaningful title which will be also used as file name when printing to PDF.

· /lams_central/conf/language/lams/ApplicationResources.properties	(-0, +2)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/qb/PrintQuestionsController.java	(-0, +30)	\| History	\| Source
· /lams_central/web/qb/printQuestions.jsp	(-0, +106)	\| History	\| Source
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/AuthoringController.java	(-0, +24)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/authoring/basic.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/authoring/printQuestions.jsp	(-104, +0)	\| History	\| Source	\| Diff

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

Marcin Cieslak — Fri, 29 Dec 2023 10:38:34 +0100

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

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

# Conflicts:

# lams_common/db/sql/insert_lams_config_data.sql

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

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

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

· /lams_build/common.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/db/sql/insert_lams_config_data.sql	(-6, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-21, +24)	\| History	\| Source	\| Diff
· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-3, +4)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_tool_leader/src/java/org/.../tool/leaderselection/service/LeaderselectionService.java	(-20, +23)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(-1, +15)	\| History	\| Source	\| Diff