Fisheye on lams/lams_monitoring/src

lams (MAIN): file EmailProgressActivityDTO.java was initially added on branch lams2_head_wildfly.

fionam — Thu, 01 Jun 2017 09:31:31 +0200

fionam committed MAIN:fionam:20170601073131 on branch MAIN in lams

file EmailProgressActivityDTO.java was initially added on branch lams2_head_wildfly.

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/EmailProgressActivityDTO.java

(-0, +0)

| History

| Source

lams (MAIN): file EmailProgressActivitiesProcessor.java was initially added on branch lams2_head_wildfly.

fionam — Thu, 01 Jun 2017 09:31:31 +0200

fionam committed MAIN:fionam:20170601073131:2 on branch MAIN in lams

file EmailProgressActivitiesProcessor.java was initially added on branch lams2_head_wildfly.

· /lams_monitoring/src/java/org/.../lams/monitoring/service/EmailProgressActivitiesProcessor.java

(-0, +0)

| History

| Source

lams (MAIN): file EmailProgressMessageJob.java was initially added on branch lams2_head_wildfly.

fionam — Thu, 01 Jun 2017 09:31:31 +0200

fionam committed MAIN:fionam:20170601073131:1 on branch MAIN in lams

file EmailProgressMessageJob.java was initially added on branch lams2_head_wildfly.

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/EmailProgressMessageJob.java

(-0, +0)

| History

| Source

lams (MAIN): file EmailProgressAction.java was initially added on branch lams2_head_wildfly.

fionam — Thu, 01 Jun 2017 09:31:30 +0200

fionam committed MAIN:fionam:20170601073130 on branch MAIN in lams

file EmailProgressAction.java was initially added on branch lams2_head_wildfly.

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

(-0, +0)

| History

| Source

lams (MAIN): LDEV-4002: Forbid non-authors from accessing Authoring. Check for author role when starting Live Edit. Do not show Live ...

Marcin Cieslak — Fri, 30 Sep 2016 17:22:25 +0200

Marcin Cieslak committed MAIN:marcin:20160930152225 on branch MAIN in lams

LDEV-4002: Forbid non-authors from accessing Authoring. Check for author role when starting Live Edit. Do not show Live Edit button if role check fails.

· /lams_central/conf/xdoclet/web-security.xml	(-2, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-1, +18)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3978: Allow selecting and moving multiple learners in Monitoring.

Marcin Cieslak — Thu, 15 Sep 2016 11:01:25 +0200

Marcin Cieslak committed MAIN:marcin:20160915090125 on branch MAIN in lams

LDEV-3978: Allow selecting and moving multiple learners in Monitoring.

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-5, +7)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-0, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/css/monitorLesson.css	(-0, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-43, +84)	\| History	\| Source	\| Diff

lams (MAIN): DEV-3944: Add a method to add course learners to a lesson.

Marcin Cieslak — Tue, 09 Aug 2016 06:28:54 +0200

Marcin Cieslak committed MAIN:marcin:20160809042854 on branch MAIN in lams

DEV-3944: Add a method to add course learners to a lesson.

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

(-0, +19)

| History

| Source

| Diff

lams (MAIN): LDEV-3874: Added delete button to delete scheduled notifications.

fionam — Thu, 07 Jul 2016 09:26:47 +0200

fionam committed MAIN:fionam:20160707072647 on branch MAIN in lams

LDEV-3874: Added delete button to delete scheduled notifications.

· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-0, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/EmailScheduleMessageJobDTO.java	(-2, +11)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java	(-0, +63)	\| History	\| Source	\| Diff
· /lams_monitoring/web/emailnotifications/scheduledEmailList.jsp	(-9, +45)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3839: Add "allow restart" an advanced option in lesson setup. Add restart button above learner progress bar.

Marcin Cieslak — Mon, 27 Jun 2016 10:21:13 +0200

Marcin Cieslak committed MAIN:marcin:20160627082113 on branch MAIN in lams

LDEV-3839: Add "allow restart" an advanced option in lesson setup. Add restart button above learner progress bar.

· /lams_build/lib/lams/lams-monitoring.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

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

(-2, +1)

| History

| Source

| Diff

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

(-8, +8)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java

(-2, +2)

| History

| Source

| Diff

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

(-6, +8)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

· /lams_central/web/addLesson.jsp

(-1, +2)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml

(-2, +5)

| History

| Source

| Diff

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

(binary)

| History

| Source

| Diff

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

(-12, +30)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceProxy.java

(-3, +3)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java

(-1, +3)

| History

| Source

| Diff

… 9 more files in changeset.

lams (MAIN): LDEV-3835: The hibernate virtual class for the Branching Activity cannot be cast to Branching. The exception was causin...

fionam — Wed, 22 Jun 2016 05:57:14 +0200

fionam committed MAIN:fionam:20160622035714 on branch MAIN in lams

LDEV-3835: The hibernate virtual class for the Branching Activity cannot be cast to Branching. The exception was causing the activity monitoring screen to display but not be able to double click on anything.

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

(-2, +3)

| History

| Source

| Diff

lams (MAIN): LDEV-3839: Add initial implementation of lesson retry.

Marcin Cieslak — Tue, 21 Jun 2016 11:24:05 +0200

Marcin Cieslak committed MAIN:marcin:20160621092405 on branch MAIN in lams

LDEV-3839: Add initial implementation of lesson retry.

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgress.hbm.xml

(-10, +3)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/.../lams/lesson/CompletedActivityProgressArchive.hbm.xml

(-0, +29)

| History

| Source

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgressArchive.hbm.xml

(-0, +62)

| History

| Source

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

(binary)

| History

| Source

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

(-0, +104)

| History

| Source

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

(-0, +220)

| History

| Source

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

(-78, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java

(-1, +6)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java

(-2, +20)

| History

| Source

| Diff

· /lams_learning/.classpath

(-0, +1)

| History

| Source

| Diff

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

(-0, +2)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java

(-33, +36)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

(-6, +6)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceProxy.java

(-7, +10)

| History

| Source

| Diff

… 5 more files in changeset.

lams (MAIN): LDEV-3838: Fix OptionsWithSequences monitoring.

Marcin Cieslak — Mon, 20 Jun 2016 11:15:42 +0200

Marcin Cieslak committed MAIN:marcin:20160620091542 on branch MAIN in lams

LDEV-3838: Fix OptionsWithSequences monitoring.

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-3, +7)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-3, +3)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3836 Fixed an exception thrown when requesting lesson progress for sequence activity

Andrey Balan — Fri, 17 Jun 2016 16:01:56 +0200

Andrey Balan committed MAIN:andreyb:20160617140156 on branch MAIN in lams

LDEV-3836 Fixed an exception thrown when requesting lesson progress for sequence activity

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

(-4, +3)

| History

| Source

| Diff

lams (MAIN): LDEV-3737: Change method singatures "set*" as are not and should not be transactional.

Marcin Cieslak — Wed, 11 May 2016 12:43:14 +0200

Marcin Cieslak committed MAIN:marcin:20160511104314 on branch MAIN in lams

LDEV-3737: Change method singatures "set*" as are not and should not be transactional.

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-3, +3)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3776: Remove $Id CVS keyword.

Marcin Cieslak — Wed, 11 May 2016 09:28:39 +0200

Marcin Cieslak committed MAIN:marcin:20160511072839 on branch MAIN in lams

LDEV-3776: Remove $Id CVS keyword.

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

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_cy_GB.properties

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_da_DK.properties

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_de_DE.properties

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_es_MX.properties

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_fr_FR.properties

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_it_IT.properties

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_ja_JP.properties

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_ko_KR.properties

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_mi_NZ.properties

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_nl_BE.properties

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties

(-1, +1)

| History

| Source

| Diff

… 1060 more files in changeset.

lams (MAIN): LDEV-3773: Remove Workspace and WorkspaceWorkspaceFolder entities. Link WorkspaceFolders directly to User and Organisati...

Marcin Cieslak — Mon, 09 May 2016 15:45:16 +0200

Marcin Cieslak committed MAIN:marcin:20160509134516 on branch MAIN in lams

LDEV-3773: Remove Workspace and WorkspaceWorkspaceFolder entities. Link WorkspaceFolders directly to User and Organisation.

General clean up.

· /lams_build/lib/lams/lams-central.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

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

(-7, +3)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

(-5, +5)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java

(-11, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

(-65, +24)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml

(-238, +94)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml

(-602, +386)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml

(-145, +0)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml

(-127, +78)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/.../lams/usermanagement/WorkspaceWorkspaceFolder.hbm.xml

(-66, +0)

| History

| Source

| Diff

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

(binary)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java

(-4, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java

(-6, +28)

| History

| Source

| Diff

… 7 more files in changeset.

lams (MAIN): LDEV-3776: Clean up and format all LAMS Java code.

Marcin Cieslak — Thu, 05 May 2016 10:08:46 +0200

Marcin Cieslak committed MAIN:marcin:20160505080846 on branch MAIN in lams

LDEV-3776: Clean up and format all LAMS Java code.

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/AbstractTest.java

(-5, +5)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/Call.java

(-9, +9)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/Main.java

(-8, +8)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/MockUser.java

(-11, +13)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestHarnessException.java

(-8, +8)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestManager.java

(-20, +21)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestReporter.java

(-72, +75)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestSuite.java

(-8, +8)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestUtil.java

(-5, +5)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/AdminTest.java

(-10, +10)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/MockAdmin.java

(-8, +8)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/AuthorTest.java

(-8, +8)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/MockAuthor.java

(-16, +16)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/LearnerTest.java

(-18, +20)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java

(-51, +54)

| History

| Source

| Diff

… 2106 more files in changeset.

lams (MAIN): LDEV-3745 fixed exception thrown on opening monitoring's Sequence tab when lesson contains branching activity

Andrey Balan — Mon, 11 Apr 2016 12:34:40 +0200

Andrey Balan committed MAIN:andreyb:20160411103440 on branch MAIN in lams

LDEV-3745 fixed exception thrown on opening monitoring's Sequence tab when lesson contains branching activity

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

(-5, +10)

| History

| Source

| Diff

lams (MAIN): LDEV-3637 adding comments

Andrey Balan — Mon, 18 Jan 2016 18:35:48 +0100

Andrey Balan committed MAIN:andreyb:20160118173548 on branch MAIN in lams

LDEV-3637 adding comments

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

(-2, +3)

| History

| Source

| Diff

lams (MAIN): LDEV-3599 Fetch number of learners for all activities at one go, otherwise quickly progressing learners can yield incorr...

Marcin Cieslak — Tue, 12 Jan 2016 10:49:51 +0100

Marcin Cieslak committed MAIN:marcin:20160112094951 on branch MAIN in lams

LDEV-3599 Fetch number of learners for all activities at one go, otherwise quickly progressing learners can yield incorrect results.

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java	(-3, +4)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java	(-10, +25)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(-3, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-40, +40)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-15, +13)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3638: Remove lesson and all its resources on demand....

Marcin Cieslak — Wed, 30 Dec 2015 20:08:03 +0100

Marcin Cieslak committed MAIN:marcin:20151230190803 on branch MAIN in lams

LDEV-3638: Remove lesson and all its resources on demand.

Files in content repository stay.

Clean up unnecessary code, format.

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java

(-286, +319)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java

(-326, +369)

| History

| Source

| Diff

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

(-13, +13)

| History

| Source

| Diff

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

(-51, +65)

| History

| Source

| Diff

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

(-172, +181)

| History

| Source

| Diff

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

(-25, +27)

| History

| Source

| Diff

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

(-11, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java

(-30, +17)

| History

| Source

| Diff

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

(-40, +36)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java

(-1, +5)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java

(-248, +217)

| History

| Source

| Diff

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

(-4, +9)

| History

| Source

| Diff

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

(-30, +96)

| History

| Source

| Diff

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

(-5, +12)

| History

| Source

| Diff

… 34 more files in changeset.

lams (MAIN): LDEV-3637 Add integration API: clone a lesson based on a lessonID

Andrey Balan — Fri, 18 Dec 2015 11:35:05 +0100

Andrey Balan committed MAIN:andreyb:20151218103505 on branch MAIN in lams

LDEV-3637 Add integration API: clone a lesson based on a lessonID

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

(-1, +3)

| History

| Source

| Diff

lams (MAIN): LDEV-3637 Add integration API: clone a lesson based on a lessonID

Andrey Balan — Fri, 18 Dec 2015 11:03:12 +0100

Andrey Balan committed MAIN:andreyb:20151218100312 on branch MAIN in lams

LDEV-3637 Add integration API: clone a lesson based on a lessonID

· /lams_build/lib/lams/lams-monitoring.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	(-0, +34)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(-1, +16)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-49, +62)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3315: Add checking if the user is lesson monitor in new monitoring methods.

Marcin Cieslak — Fri, 04 Dec 2015 11:47:09 +0100

Marcin Cieslak committed MAIN:marcin:20151204104709 on branch MAIN in lams

LDEV-3315: Add checking if the user is lesson monitor in new monitoring methods.

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

(-4, +44)

| History

| Source

| Diff

lams (MAIN): LDEV-3622: Add search field in View Learners dialog....

Marcin Cieslak — Tue, 01 Dec 2015 12:10:26 +0100

Marcin Cieslak committed MAIN:marcin:20151201111026 on branch MAIN in lams

LDEV-3622: Add search field in View Learners dialog.

Fix double click/tap function.

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-14, +26)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-5, +19)	\| History	\| Source	\| Diff
· /lams_monitoring/web/css/monitorLesson.css	(-4, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-47, +108)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3620: Add paging and search in Edit Class dialog.

Marcin Cieslak — Sat, 28 Nov 2015 16:57:28 +0100

Marcin Cieslak committed MAIN:marcin:20151128155728 on branch MAIN in lams

LDEV-3620: Add paging and search in Edit Class dialog.

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java	(-107, +103)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java	(-1, +9)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	(-17, +86)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java	(-1, +16)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(-1, +35)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IRoleDAO.java	(-32, +8)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java	(-69, +70)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(-4, +4)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(-14, +16)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(-2, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-50, +78)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-40, +113)	\| History	\| Source	\| Diff
· /lams_monitoring/web/css/monitorLesson.css	(-19, +33)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-208, +220)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3614: Improve processing of Gate activities....

Marcin Cieslak — Mon, 23 Nov 2015 12:34:18 +0100

Marcin Cieslak committed MAIN:marcin:20151123113418 on branch MAIN in lams

LDEV-3614: Improve processing of Gate activities.

Alter lams_activity_learners table so it reflects its real purpose: storing learners who are allowed to pass a gate.

Find out who is waiting in front of a gate using learner progress (activity attempt).

For sync gate take into account all possible lesson learners (lesson class) rather than only ones who started a lesson.

Use an entity in JSP generation rather than a DTO which is just a wrapper for the entity.

Code clean up.

· /lams_build/lib/lams/lams-learning.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

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

(-2, +1)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml

(-13, +3)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml

(-12, +0)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml

(-41, +0)

| History

| Source

| Diff

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

(binary)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java

(-2, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java

(-24, +28)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java

(-95, +13)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java

(-200, +199)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java

(-7, +9)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java

(-13, +10)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java

(-11, +12)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java

(-5, +7)

| History

| Source

| Diff

… 28 more files in changeset.

lams (MAIN): LDEV-3599: Add paging to learner group dialogs....

Marcin Cieslak — Wed, 11 Nov 2015 15:11:45 +0100

Marcin Cieslak committed MAIN:marcin:20151111141145 on branch MAIN in lams

LDEV-3599: Add paging to learner group dialogs.

Change icons from custom to ones provided with jQuery UI.

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java	(-7, +7)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java	(-2, +6)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java	(-11, +24)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	(-6, +8)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java	(-2, +6)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(-5, +8)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-2, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-9, +9)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-40, +62)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-27, +71)	\| History	\| Source	\| Diff
· /lams_monitoring/web/css/monitorLesson.css	(-4, +42)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-81, +183)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3600: In Sequence and Learners tab allow searching for Learners who has not started the lesson yet.

Marcin Cieslak — Mon, 09 Nov 2015 19:30:07 +0100

Marcin Cieslak committed MAIN:marcin:20151109183007 on branch MAIN in lams

LDEV-3600: In Sequence and Learners tab allow searching for Learners who has not started the lesson yet.

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/progressBar.js	(-123, +133)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java	(-6, +5)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java	(-27, +28)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java	(-29, +42)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	(-6, +49)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java	(-2, +4)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(-4, +8)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(-38, +38)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	(-17, +21)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-1, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(-3, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-4, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-11, +12)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-6, +7)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-10, +17)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3600: Search for a learner in Monitoring Sequence tab and highlight it afterwards.

Marcin Cieslak — Thu, 05 Nov 2015 12:45:25 +0100

Marcin Cieslak committed MAIN:marcin:20151105114525 on branch MAIN in lams

LDEV-3600: Search for a learner in Monitoring Sequence tab and highlight it afterwards.

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-13, +50)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-5, +14)	\| History	\| Source	\| Diff
· /lams_monitoring/web/css/monitorLesson.css	(-0, +22)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-11, +89)	\| History	\| Source	\| Diff