Fisheye on lams-github/lams_monitoring/web/includes

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): LDEV-5083 Don't show lesson status changer if it was Removed

Marcin Cieslak — Fri, 15 Mar 2024 14:44:01 +0100

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

LDEV-5083 Don't show lesson status changer if it was Removed

· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-2, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-58, +66)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5200 Prevent 4th learner icon from going under counter circle

Marcin Cieslak — Wed, 13 Mar 2024 14:29:29 +0100

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

LDEV-5200 Prevent 4th learner icon from going under counter circle

· /idea_project/.idea/.gitignore	(-1, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-1, +1)	\| 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 (): 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-4601 Fix lesson scheduling

Marcin Cieslak — Thu, 15 Feb 2024 12:25:41 +0100

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

LDEV-4601 Fix lesson scheduling

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

(-3, +6)

| History

| Source

| Diff

lams-github (): LDEV-5424 fix the problem with ability to refreshParentMonitoringWindow() after Edit in monitor is done

Andrey Balan — Wed, 07 Feb 2024 21:10:53 +0100

Andrey Balan committed bad4616 on branch in lams-github

LDEV-5424 fix the problem with ability to refreshParentMonitoringWindow() after Edit in monitor is done

· /lams_central/web/includes/javascript/common.js	(-8, +10)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitor-activity.js	(-0, +37)	\| History	\| Source

lams-github (): LDEV-5424 introduce PageMonitor.tag

Andrey Balan — Sat, 03 Feb 2024 04:16:11 +0100

Andrey Balan committed d2e5991 on branch in lams-github

LDEV-5424 introduce PageMonitor.tag

· /lams_central/.gitignore	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java	(-4, +4)	\| History	\| Source	\| Diff
· /lams_central/web/css/components-monitoring.scss	(-0, +65)	\| History	\| Source
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-13, +12)	\| History	\| Source	\| Diff
· /lams_tool_nb/web/WEB-INF/tags/AdvancedAccordian.tag	(-12, +12)	\| History	\| Source	\| Diff
· /lams_tool_nb/web/WEB-INF/tags/PageMonitor.tag	(-0, +158)	\| History	\| Source
· /lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(-0, +4)	\| History	\| Source	\| Diff
· /lams_tool_nb/web/monitoring/m_EditActivity.jsp	(-24, +20)	\| History	\| Source	\| Diff
· /lams_tool_nb/web/monitoring/m_Statistics.jsp	(-24, +40)	\| History	\| Source	\| Diff
· /lams_tool_nb/web/monitoring/m_Summary.jsp	(-24, +27)	\| History	\| Source	\| Diff
· /lams_tool_nb/web/monitoring/monitoring.jsp	(-53, +11)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5428 Remove lesson presence and chat

Andrey Balan — Tue, 16 Jan 2024 23:34:14 +0100

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

LDEV-5428 Remove lesson presence and chat

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerCommonForm.java

(-20, +0)

| History

| Source

| Diff

· /lams_admin/web/integration/extLessonForm.jsp

(-15, +1)

| History

| Source

| Diff

· /lams_admin/web/integration/servermaintain.jsp

(-4, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java

(-4, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java

(-2, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java

(-24, +11)

| History

| Source

| Diff

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

(-20, +1)

| History

| Source

| Diff

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

(-19, +0)

| History

| Source

| Diff

· /lams_central/web/addLesson.jsp

(-14, +0)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/addLesson.js

(-4, +0)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/progressBar.js

(-1, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20240115.sql

(-0, +20)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java

(-22, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java

(-35, +8)

| History

| Source

| Diff

… 26 more files in changeset.

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): Merge v4.7 into LDEV-5397

Marcin Cieslak — Thu, 16 Nov 2023 00:28:52 +0100

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

Merge v4.7 into LDEV-5397

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

(-97, +45)

| History

| Source

| Diff

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

(-97, +45)

| History

| Source

| Diff

· /lams_central/web/css/components.scss

(-322, +327)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/openUrls.js

(-0, +8)

| History

| Source

| Diff

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

(-97, +45)

| History

| Source

| Diff

· /lams_learning/lams_learning.eml

(-40, +40)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java

(-131, +135)

| History

| Source

| Diff

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

(-97, +45)

| History

| Source

| Diff

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

(-97, +45)

| History

| Source

| Diff

· /lams_monitoring/web/css/components-monitoring.css

(-1, +1)

| History

| Source

| Diff

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

(-2693, +2706)

| History

| Source

| Diff

· /lams_monitoring/web/monitor.jsp

(-5, +3)

| History

| Source

| Diff

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

(-97, +45)

| History

| Source

| Diff

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

(-655, +612)

| History

| Source

| Diff

· /lams_tool_chat/lams_tool_chat.eml

(-25, +36)

| History

| Source

| Diff

… 65 more files in changeset.

lams-github (v4.7): LDEV-5260 Do not eagerly close canvas refresh Flux...

Marcin Cieslak — Sat, 28 Oct 2023 21:04:34 +0200

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

LDEV-5260 Do not eagerly close canvas refresh Flux

Do timer Flux clean up instead

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

(-6, +26)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5260 Fix multiple timers Flux

Marcin Cieslak — Fri, 27 Oct 2023 13:17:24 +0200

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

LDEV-5260 Fix multiple timers Flux

· /lams_common/src/java/org/lamsfoundation/lams/flux/FluxMap.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-6, +44)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-0, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5200 Send AEs possibly long data as POST and not GET

Marcin Cieslak — Tue, 24 Oct 2023 12:30:26 +0200

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

LDEV-5200 Send AEs possibly long data as POST and not GET

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

(-40, +42)

| History

| Source

| Diff

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

Marcin Cieslak — Tue, 26 Sep 2023 11:31:04 +0200

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

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

# Conflicts:

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

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

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

# lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp

· /lams_central/conf/language/lams/ApplicationResources.properties	(-10, +25)	\| History	\| Source	\| Diff
· /lams_central/web/css/components.css	(-1, +22)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-31, +30)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-60, +45)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-169, +93)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(-27, +18)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-277, +275)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(-18, +19)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(-19, +20)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5337 Add "return to monitoring button" to Team Setup screen

Marcin Cieslak — Sat, 09 Sep 2023 08:31:01 +0200

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

LDEV-5337 Add "return to monitoring button" to Team Setup screen

· /lams_central/web/groups.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/orgGrouping.js	(-39, +40)	\| History	\| Source	\| Diff
· /lams_central/web/orgGrouping.jsp	(-131, +141)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java	(-4, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-2, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/teams.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5200 Properly refresh monitoring after changing lesson state

Marcin Cieslak — Sat, 26 Aug 2023 11:18:02 +0200

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

LDEV-5200 Properly refresh monitoring after changing lesson state

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

(-849, +834)

| History

| Source

| Diff

lams-github (v4.7): LAI-5 Hide AI wizard menu item in authoring when AI is not deployed

Marcin Cieslak — Fri, 18 Aug 2023 07:01:26 +0200

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

LAI-5 Hide AI wizard menu item in authoring when AI is not deployed

· /lams_central/web/authoring/authoring.jsp	(-531, +533)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LAI-5 Hide AI wizard menu item in authoring when AI is not deployed

Marcin Cieslak — Fri, 18 Aug 2023 07:01:26 +0200

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

LAI-5 Hide AI wizard menu item in authoring when AI is not deployed

· /lams_central/web/authoring/authoring.jsp	(-531, +533)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): SP-9 Rewrite lesson completion chart to new ChartJS

Marcin Cieslak — Wed, 26 Jul 2023 16:01:31 +0200

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

SP-9 Rewrite lesson completion chart to new ChartJS

· /lams_central/web/includes/javascript/chart.bundle.min.js	(-7, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-5, +8)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-827, +822)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-2, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/includes/javascript/chart5.js	(-6, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(-2, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): SP-9 Upgrade ChartJS from version 2.9 to 4.3.1...

Marcin Cieslak — Wed, 26 Jul 2023 15:31:29 +0200

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

SP-9 Upgrade ChartJS from version 2.9 to 4.3.1

Rewrite chart generating code to match new API

· /lams_central/web/includes/javascript/chartjs/chart.umd.js	(-0, +14)	\| History	\| Source
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-1, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/includes/javascript/chart.js	(-86, +85)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/includes/javascript/chart5.js	(-91, +93)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-275, +282)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(-85, +87)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(-1, +3)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 Use rewritten alert (toast) and confirmation pop ups

Marcin Cieslak — Wed, 31 May 2023 21:08:28 +0200

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

LDEV-5397 Use rewritten alert (toast) and confirmation pop ups

· /lams_central/web/includes/javascript/dialog5.js	(-113, +121)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/learnerPage.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-8, +1)	\| History	\| Source	\| Diff
· /lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(-0, +24)	\| History	\| Source	\| Diff
· /lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag	(-0, +24)	\| History	\| Source	\| Diff
· /lams_tool_sbmt/web/learner/sbmtlearner.jsp	(-16, +16)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5386 Library management

Marcin Cieslak — Wed, 26 Apr 2023 08:02:07 +0200

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

LDEV-5386 Library management

· /idea_project/.idea/libraries/3rdParty.xml

(-50, +50)

| History

| Source

| Diff

· /idea_project/.idea/runConfigurations/WildFly.xml

(-1, +1)

| History

| Source

| Diff

· /lams_admin/.classpath

(-11, +11)

| History

| Source

| Diff

· /lams_admin/lams_admin.eml

(-4, +4)

| History

| Source

| Diff

· /lams_central/.classpath

(-18, +18)

| History

| Source

| Diff

· /lams_central/lams_central.eml

(-16, +16)

| History

| Source

| Diff

· /lams_common/.classpath

(-31, +31)

| History

| Source

| Diff

· /lams_common/lams_common.eml

(-11, +11)

| History

| Source

| Diff

· /lams_contentrepository/.classpath

(-7, +7)

| History

| Source

| Diff

· /lams_gradebook/.classpath

(-7, +7)

| History

| Source

| Diff

· /lams_gradebook/lams_gradebook.eml

(-6, +6)

| History

| Source

| Diff

· /lams_learning/.classpath

(-11, +11)

| History

| Source

| Diff

· /lams_learning/lams_learning.eml

(-8, +8)

| History

| Source

| Diff

· /lams_monitoring/.classpath

(-8, +8)

| History

| Source

| Diff

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

(-2, +3)

| History

| Source

| Diff

… 56 more files in changeset.

lams-github (v4.7): LDEV-4199 Reintroduce group based branching monitoring page...

Marcin Cieslak — Mon, 24 Apr 2023 12:30:56 +0200

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

LDEV-4199 Reintroduce group based branching monitoring page

It is difficult to determine which groups have been mapped to branches in monitoring and whether they are not broken. We needed a page to be able to review groupings.

· /lams_central/web/includes/javascript/authoring/authoringProperty.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-2, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingController.java	(-0, +40)	\| History	\| Source
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-91, +65)	\| History	\| Source	\| Diff
· /lams_monitoring/web/assets/styles/main.css	(-61, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/viewGroupedBranching.jsp	(-0, +81)	\| History	\| Source
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-2, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5200 Fix Edit Class dialog role extraction from HTML structure

Marcin Cieslak — Wed, 04 Jan 2023 11:34:27 +0100

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

LDEV-5200 Fix Edit Class dialog role extraction from HTML structure

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

(-2, +3)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5200 Fix learner search and search clear

Marcin Cieslak — Thu, 29 Dec 2022 20:53:19 +0100

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

LDEV-5200 Fix learner search and search clear

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

(-5, +0)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5200 Fix learner search and search clear

Marcin Cieslak — Thu, 29 Dec 2022 18:01:27 +0100

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

LDEV-5200 Fix learner search and search clear

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

(-5, +9)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5200 Add completed activities and lesson info on learners tab

Marcin Cieslak — Thu, 29 Dec 2022 17:39:46 +0100

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

LDEV-5200 Add completed activities and lesson info on learners tab

· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-0, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-6, +13)	\| History	\| Source	\| Diff
· /lams_monitoring/web/css/components-monitoring.css	(-0, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-8, +10)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor-learners-tab.jsp	(-4, +10)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5200 Add paging to learners tab in monitoring

Marcin Cieslak — Wed, 14 Dec 2022 14:49:12 +0100

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

LDEV-5200 Add paging to learners tab in monitoring

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-16, +26)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-9, +36)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor-learners-tab.jsp	(-2, +27)	\| History	\| Source	\| Diff