Fisheye on lams-github/lams_learning/src/java

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): LDEV-5436 Add project-wide User sorting on Java level

Marcin Cieslak — Mon, 08 Jan 2024 11:47:39 +0100

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

LDEV-5436 Add project-wide User sorting on Java level

· /lams_common/src/java/org/lamsfoundation/lams/lesson/util/LearnerProgressNameComparator.java	(-7, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(-7, +7)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserDetails.java	(-0, +26)	\| History	\| Source
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/util/FirstNameAlphabeticComparator.java	(-104, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/util/LastNameAlphabeticComparator.java	(-155, +0)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-6, +6)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java	(-15, +11)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-2, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java	(-7, +2)	\| History	\| Source	\| Diff
· /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java	(-15, +10)	\| History	\| Source	\| Diff
· /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(-4, +4)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5425 Remove "End of activity" notebook from all tools

Andrey Balan — Wed, 27 Dec 2023 21:04:44 +0100

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

LDEV-5425 Remove "End of activity" notebook from *all* tools

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

(-188, +121)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

(-42, +30)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

(-6, +6)

| History

| Source

| Diff

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

(-107, +0)

| History

| Source

| Diff

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

(-67, +0)

| History

| Source

| Diff

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

(-71, +10)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tlds/lams/lams.tld

(-8, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

(-40, +1)

| History

| Source

| Diff

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

(-0, +15)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java

(-51, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java

(-106, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java

(-204, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookConstants.java

(-11, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java

(-250, +0)

| History

| Source

| Diff

… 505 more files in changeset.

lams-github (v4.8): LDEV-5397 display gate alerts on top of the page...

Andrey Balan — Wed, 29 Nov 2023 18:54:39 +0100

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

LDEV-5397 display gate alerts on top of the page

* combine them into single one where possible

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java	(-3, +5)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/GateForm.java	(-9, +0)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/gateDescription.jsp	(-7, +12)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/gateNext.jsp	(-14, +0)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/permissionGateContent.jsp	(-0, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/scheduleGateContent.jsp	(-0, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/synchGateContent.jsp	(-8, +7)	\| History	\| Source	\| Diff

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-5277 Create activity column items in order as they appear in LD

Marcin Cieslak — Thu, 02 Nov 2023 12:05:00 +0100

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

LDEV-5277 Create activity column items in order as they appear in LD

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ListingLearningDesignProcessor.java	(-0, +39)	\| History	\| Source
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/servlet/RepopulateProgressMarksServlet.java	(-53, +13)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5400 Create transaction manually for Flux

Marcin Cieslak — Tue, 31 Oct 2023 13:54:06 +0100

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

LDEV-5400 Create transaction manually for Flux

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

(-43, +44)

| History

| Source

| Diff

lams-github (v4.8): LDEV-5397 bootstrap5 Grouping, Branching, Optional activities

Andrey Balan — Thu, 19 Oct 2023 22:25:05 +0200

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

LDEV-5397 bootstrap5 Grouping, Branching, Optional activities

· /lams_central/web/WEB-INF/tags/Alert5.tag	(-5, +11)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/tags/PageLearner.tag	(-1, +3)	\| History	\| Source	\| Diff
· /lams_central/web/css/components.scss	(-1, +11)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/BranchingActivityController.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/tags/Alert5.tag	(-7, +17)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/tags/PageLearner.tag	(-1, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/branching/preview.jsp	(-115, +91)	\| History	\| Source	\| Diff
· /lams_learning/web/branching/wait.jsp	(-31, +16)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-61, +63)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-62, +30)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/wait.jsp	(-32, +25)	\| History	\| Source	\| Diff
· /lams_learning/web/lessonComplete.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-68, +56)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5338 Properly set chosen groups even for other grouping types

Marcin Cieslak — Sat, 26 Aug 2023 12:21:55 +0200

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

LDEV-5338 Properly set chosen groups even for other grouping types

· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java	(-6, +6)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(-30, +35)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/util/ExcelUserImportFileParser.java	(-314, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/util/IUserImportFileParser.java	(-52, +0)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(-17, +17)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java	(-45, +45)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-30, +31)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java	(-31, +34)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3765 Fortify command websocket code...

Marcin Cieslak — Wed, 28 Jun 2023 16:11:49 +0200

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

LDEV-3765 Fortify command websocket code

Make it less prone to random websocket errors.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java

(-39, +33)

| History

| Source

| Diff

lams-github (v4.7): LDEV-3765 Fortify command websocket code...

Marcin Cieslak — Wed, 28 Jun 2023 16:11:49 +0200

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

LDEV-3765 Fortify command websocket code

Make it less prone to random websocket errors.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java

(-39, +33)

| History

| Source

| Diff

lams-github (v4.8): LDEV-5397 Reintroduce command websocket to PageLearner.tag

Marcin Cieslak — Tue, 30 May 2023 18:34:06 +0200

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

LDEV-5397 Reintroduce command websocket to PageLearner.tag

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/learnerPage.js	(-1, +99)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 Revent to generic activity icons in progress bar

Marcin Cieslak — Thu, 25 May 2023 15:42:07 +0200

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

LDEV-5397 Revent to generic activity icons in progress bar

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java	(-3, +0)	\| History	\| Source	\| Diff
· /lams_learning/web/css/components-learner.css	(-8, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/learnerPage.js	(-45, +16)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 Use custom activity icons in progress bar

Marcin Cieslak — Tue, 23 May 2023 10:31:24 +0200

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

LDEV-5397 Use custom activity icons in progress bar

· /lams_central/web/includes/javascript/authoring/authoringGeneral.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java	(-108, +110)	\| History	\| Source	\| Diff
· /lams_learning/web/css/components-learner.css	(-4, +12)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/learnerPage.js	(-16, +45)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5395 Add main frame for learner UI

Marcin Cieslak — Wed, 10 May 2023 11:36:07 +0200

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

LDEV-5395 Add main frame for learner UI

· /lams_central/web/css/components.css

(-51, +65)

| History

| Source

| Diff

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

(-14, +13)

| History

| Source

| Diff

· /lams_learning/web/includes/javascript/learnerPage.js

(-0, +16)

| History

| Source

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

(-23, +11)

| History

| Source

| Diff

· /lams_monitoring/web/monitor.jsp

(-864, +855)

| History

| Source

| Diff

· /lams_tool_nb/src/java/org/lamsfoundation/.../tool/noticeboard/web/controller/LearningController.java

(-22, +30)

| History

| Source

| Diff

· /lams_tool_nb/web/WEB-INF/tags/Head.tag

(-3, +1)

| History

| Source

| Diff

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

(-0, +313)

| History

| Source

· /lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld

(-1, +5)

| History

| Source

| Diff

· /lams_tool_nb/web/images/1.png

(binary)

| History

| Source

· /lams_tool_nb/web/images/2.png

(binary)

| History

| Source

· /lams_tool_nb/web/images/3.png

(binary)

| History

| Source

· /lams_tool_nb/web/images/4.png

(binary)

| History

| Source

· /lams_tool_nb/web/images/5.png

(binary)

| History

| Source

· /lams_tool_nb/web/images/6.png

(binary)

| History

| Source

… 39 more files in changeset.

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

Marcin Cieslak — Mon, 06 Mar 2023 13:33:44 +0100

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

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

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java	(-0, +13)	\| History	\| Source	\| Diff
· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/LtiConsumerManagementController.java	(-0, +11)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/LoadToolActivityController.java	(-1, +16)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5372 Add whitelist of integrated servers lesson finish URLs

Marcin Cieslak — Mon, 06 Mar 2023 13:15:49 +0100

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

LDEV-5372 Add whitelist of integrated servers lesson finish URLs

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java	(-0, +13)	\| History	\| Source	\| Diff
· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/LtiConsumerManagementController.java	(-0, +11)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	(-0, +9)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(-0, +36)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/LoadToolActivityController.java	(-1, +16)	\| History	\| Source	\| Diff
· /lams_learning/web/loadToolActivity.jsp	(-2, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5372 Add whitelist of integrated servers lesson finish URLs

Marcin Cieslak — Mon, 06 Mar 2023 13:15:49 +0100

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

LDEV-5372 Add whitelist of integrated servers lesson finish URLs

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java	(-0, +13)	\| History	\| Source	\| Diff
· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/LtiConsumerManagementController.java	(-0, +11)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	(-0, +9)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(-0, +36)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/LoadToolActivityController.java	(-1, +16)	\| History	\| Source	\| Diff
· /lams_learning/web/loadToolActivity.jsp	(-2, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5341 Add transaction support for all Security Service methods

Marcin Cieslak — Mon, 28 Nov 2022 17:10:59 +0100

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

LDEV-5341 Add transaction support for all Security Service methods

· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(-2, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/security/SecurityDAO.java	(-10, +6)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java	(-8, +20)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5083 Fix encoding issue in Learners tab

Marcin Cieslak — Wed, 23 Nov 2022 16:39:13 +0100

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

LDEV-5083 Fix encoding issue in Learners tab

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

(-2, +10)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5341 Refactor Security Service

Marcin Cieslak — Thu, 27 Oct 2022 13:47:14 +0200

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

LDEV-5341 Refactor Security Service

· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/CleanupPreviewLessonsController.java

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-4, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-3, +1)

| History

| Source

| Diff

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

(-1, +1)

| 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/comments/web/CommentController.java

(-6, +7)

| History

| Source

| Diff

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

(-2, +1)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

(-9, +8)

| History

| Source

| Diff

… 21 more files in changeset.

lams-github (v4.7): LDEV-5083 Rewrite TBL Assessment AES disclose and discussion element

Marcin Cieslak — Tue, 12 Jul 2022 15:55:45 +0200

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

LDEV-5083 Rewrite TBL Assessment AES disclose and discussion element

· /lams_learning/src/java/org/.../learning/discussion/controller/DiscussionSentimentController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/monitor5.jsp	(-0, +297)	\| History	\| Source
· /lams_monitoring/web/css/components-monitoring.css	(-0, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson5.js	(-3, +8)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results/allquestions5.jsp	(-10, +10)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp	(-41, +39)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp	(-45, +43)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices5.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5083 Trigger Flux update on each activity entrance...

Marcin Cieslak — Wed, 15 Jun 2022 20:06:38 +0200

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

LDEV-5083 Trigger Flux update on each activity entrance

Till now the update was triggered on activity completion. It is a better

approach, but it only worked on finishing tool activities. Gates and,

for example, Leader Selection activity were skipped and would not

trigger learner progress update.

Now update gets triggered on learner joining a lesson and traversing

through each activity, which is good enough. Emitted items get throttled

anyway.

· /lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/CompleteActivityController.java	(-8, +0)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/LoadToolActivityController.java	(-0, +8)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5083 Update learner progress timeline using Flux

Marcin Cieslak — Mon, 25 Apr 2022 18:13:33 +0200

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

LDEV-5083 Update learner progress timeline using Flux

· /lams_common/src/java/org/lamsfoundation/lams/flux/FluxMap.java	(-11, +14)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/flux/FluxRegistry.java	(-4, +8)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/util/LearnerActivityCompleteFluxItem.java	(-4, +29)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/CompleteActivityController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java	(-13, +57)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/spring-servlet.xml	(-1, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/web.xml	(-0, +12)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-5, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson5.js	(-68, +79)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-3, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5083 Update LD canvas and chart on learner joining a lesson

Marcin Cieslak — Mon, 25 Apr 2022 13:39:12 +0200

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

LDEV-5083 Update LD canvas and chart on learner joining a lesson

· /lams_common/src/java/org/lamsfoundation/lams/lesson/util/LearnerActivityCompleteFluxItem.java	(-0, +28)	\| History	\| Source
· /lams_common/src/java/org/lamsfoundation/lams/lesson/util/LearnerLessonJoinFluxItem.java	(-0, +22)	\| History	\| Source
· /lams_common/src/java/org/lamsfoundation/lams/lesson/util/LearnerProgressFluxItem.java	(-28, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/CompleteActivityController.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java	(-0, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-2, +6)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5083 Add Sink binding mechanism

Marcin Cieslak — Mon, 25 Apr 2022 12:01:06 +0200

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

LDEV-5083 Add Sink binding mechanism

· /lams_common/src/java/org/lamsfoundation/lams/flux/FluxRegistry.java	(-5, +36)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/util/LearnerProgressFluxItem.java	(-0, +28)	\| History	\| Source
· /lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java	(-2, +6)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/CompleteActivityController.java	(-1, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-1, +6)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5083 Initial implementation on monitoring update based on Flux

Marcin Cieslak — Fri, 22 Apr 2022 17:50:05 +0200

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

LDEV-5083 Initial implementation on monitoring update based on Flux

· /lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java	(-5, +4)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/flux/FluxRegistry.java	(-9, +12)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java	(-1, +4)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/CompleteActivityController.java	(-1, +8)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java	(-2, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-1, +23)	\| History	\| Source	\| Diff
· /lams_monitoring/web/WEB-INF/spring-servlet.xml	(-1, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/web/WEB-INF/web.xml	(-0, +15)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson5.js	(-1, +9)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-1, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5083 Add activity mark and time taken to learner timeline

Marcin Cieslak — Fri, 22 Apr 2022 15:36:12 +0200

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

LDEV-5083 Add activity mark and time taken to learner timeline

· /lams_central/web/css/components.css

(-1, +2)

| History

| Source

| Diff

· /lams_central/web/css/vertical-timeline.css

(-4, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ActivityURL.java

(-3, +19)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/util/LessonUtil.java

(-0, +41)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

(-0, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java

(-0, +6)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java

(-5, +62)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityArchiveGridRowDTO.java

(-6, +7)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java

(-6, +7)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java

(-10, +13)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java

(-9, +10)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java

(-58, +0)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

(-34, +6)

| History

| Source

| Diff

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

(-8, +27)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java

(-3, +10)

| History

| Source

| Diff

… 4 more files in changeset.

lams-github (v4.7): LDEV-5083 Add grouping icon to learner vertical timeline

Marcin Cieslak — Wed, 13 Apr 2022 15:18:39 +0200

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

LDEV-5083 Add grouping icon to learner vertical timeline

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson5.js	(-0, +2)	\| History	\| Source	\| Diff

Fisheye on lams-github/lams_learning/src/java

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

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

lams-github (v4.8): LDEV-5436 Add project-wide User sorting on Java level

lams-github (v4.8): LDEV-5425 Remove "End of activity" notebook from *all* tools

lams-github (v4.8): LDEV-5397 display gate alerts on top of the page...

lams-github (v4.8): Merge v4.7 into LDEV-5397

lams-github (v4.7): LDEV-5277 Create activity column items in order as they appear in LD

lams-github (v4.7): LDEV-5400 Create transaction manually for Flux

lams-github (v4.8): LDEV-5397 bootstrap5 Grouping, Branching, Optional activities

lams-github (v4.7): LDEV-5338 Properly set chosen groups even for other grouping types

lams-github (v4.7): LDEV-3765 Fortify command websocket code...

lams-github (v4.7): LDEV-3765 Fortify command websocket code...

lams-github (v4.8): LDEV-5397 Reintroduce command websocket to PageLearner.tag

lams-github (v4.8): LDEV-5397 Revent to generic activity icons in progress bar

lams-github (v4.8): LDEV-5397 Use custom activity icons in progress bar

lams-github (v4.8): LDEV-5395 Add main frame for learner UI

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

lams-github (v4.7): LDEV-5372 Add whitelist of integrated servers lesson finish URLs

lams-github (v4.7): LDEV-5372 Add whitelist of integrated servers lesson finish URLs

lams-github (v4.7): LDEV-5341 Add transaction support for all Security Service methods

lams-github (v4.7): LDEV-5083 Fix encoding issue in Learners tab

lams-github (v4.7): LDEV-5341 Refactor Security Service

lams-github (v4.7): LDEV-5083 Rewrite TBL Assessment AES disclose and discussion element

lams-github (v4.7): LDEV-5083 Trigger Flux update on each activity entrance...

lams-github (v4.7): LDEV-5083 Update learner progress timeline using Flux

lams-github (v4.7): LDEV-5083 Update LD canvas and chart on learner joining a lesson

lams-github (v4.7): LDEV-5083 Add Sink binding mechanism

lams-github (v4.7): LDEV-5083 Initial implementation on monitoring update based on Flux

lams-github (v4.7): LDEV-5083 Add activity mark and time taken to learner timeline

lams-github (v4.7): LDEV-5083 Add grouping icon to learner vertical timeline

lams-github (v4.8): LDEV-5425 Remove "End of activity" notebook from all tools