Fisheye on lams/lams_learning/src

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

Andrey Balan — Tue, 11 Apr 2017 20:02:01 +0200

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

file LogLessonMarkPushedToIntegrationsServlet.java was initially added on branch lams2_head_wildfly.

· /lams_learning/src/java/org/.../lams/learning/web/LogLessonMarkPushedToIntegrationsServlet.java

(-0, +0)

| History

| Source

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

fionam — Wed, 11 Jan 2017 10:00:06 +0100

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

file RepopulateProgressMarksServlet.java was initially added on branch lams2_head_wildfly.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/RepopulateProgressMarksServlet.java

(-0, +0)

| History

| Source

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

Marcin Cieslak — Thu, 11 Aug 2016 15:19:28 +0200

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

file ICommandDAO.java was initially added on branch lams2_head_wildfly.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/command/dao/ICommandDAO.java

(-0, +0)

| History

| Source

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

Marcin Cieslak — Thu, 11 Aug 2016 15:19:28 +0200

Marcin Cieslak committed MAIN:marcin:20160811131928:2 on branch MAIN in lams

file Command.java was initially added on branch lams2_head_wildfly.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/command/model/Command.java

(-0, +0)

| History

| Source

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

Marcin Cieslak — Thu, 11 Aug 2016 15:19:28 +0200

Marcin Cieslak committed MAIN:marcin:20160811131928:1 on branch MAIN in lams

file CommandDAO.java was initially added on branch lams2_head_wildfly.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/command/dao/hibernate/CommandDAO.java

(-0, +0)

| History

| Source

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

Marcin Cieslak — Wed, 10 Aug 2016 20:36:37 +0200

Marcin Cieslak committed MAIN:marcin:20160810183637:1 on branch MAIN in lams

file Command.java was initially added on branch lams2_head_wildfly.

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

(-0, +0)

| History

| Source

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

Marcin Cieslak — Wed, 10 Aug 2016 20:33:09 +0200

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

file CommandWebsocketServer.java was initially added on branch lams2_head_wildfly.

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

(-0, +0)

| History

| Source

lams (MAIN): LDEV-3948: Close optional activity when it is revisited and completed.

Marcin Cieslak — Wed, 10 Aug 2016 16:00:12 +0200

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

LDEV-3948: Close optional activity when it is revisited and completed.

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

(-3, +2)

| 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-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-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-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-3750 Ability to push marks to gradebook directly from Assessment

Andrey Balan — Wed, 20 Apr 2016 11:40:50 +0200

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

LDEV-3750 Ability to push marks to gradebook directly from Assessment

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

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_common/.classpath

(-0, +1)

| History

| Source

| Diff

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

(-1, +5)

| History

| Source

| Diff

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

(-1, +7)

| History

| Source

| Diff

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

(-1, +18)

| History

| Source

| Diff

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

(-1, +18)

| History

| Source

| Diff

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

(-30, +100)

| History

| Source

| Diff

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

(-2, +45)

| History

| Source

| Diff

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

(-1, +9)

| History

| Source

| Diff

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

(-38, +2)

| History

| Source

| Diff

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

(-3, +8)

| History

| Source

| Diff

· /lams_tool_assessment/conf/xdoclet/struts-actions.xml

(-0, +4)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

(-3, +14)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/.../lams/tool/assessment/assessmentApplicationContext.xml

(-5, +1)

| History

| Source

| Diff

… 7 more files in changeset.

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

Marcin Cieslak — Fri, 29 Jan 2016 09:41:39 +0100

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

file PresenceWebsocketServer.java was initially added on branch lams2_head_wildfly.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

(-0, +0)

| History

| Source

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

Marcin Cieslak — Fri, 29 Jan 2016 09:41:39 +0100

Marcin Cieslak committed MAIN:marcin:20160129084139:6 on branch MAIN in lams

file PresenceChatService.java was initially added on branch lams2_head_wildfly.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/service/PresenceChatService.java

(-0, +0)

| History

| Source

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

Marcin Cieslak — Fri, 29 Jan 2016 09:41:39 +0100

Marcin Cieslak committed MAIN:marcin:20160129084139:5 on branch MAIN in lams

file IPresenceChatService.java was initially added on branch lams2_head_wildfly.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/service/IPresenceChatService.java

(-0, +0)

| History

| Source

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

Marcin Cieslak — Fri, 29 Jan 2016 09:41:39 +0100

Marcin Cieslak committed MAIN:marcin:20160129084139:4 on branch MAIN in lams

file PresenceChatUser.java was initially added on branch lams2_head_wildfly.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/model/PresenceChatUser.java

(-0, +0)

| History

| Source

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

Marcin Cieslak — Fri, 29 Jan 2016 09:41:39 +0100

Marcin Cieslak committed MAIN:marcin:20160129084139:3 on branch MAIN in lams

file PresenceChatMessage.java was initially added on branch lams2_head_wildfly.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/model/PresenceChatMessage.java

(-0, +0)

| History

| Source

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

Marcin Cieslak — Fri, 29 Jan 2016 09:41:39 +0100

Marcin Cieslak committed MAIN:marcin:20160129084139:2 on branch MAIN in lams

file PresenceChatDAO.java was initially added on branch lams2_head_wildfly.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/dao/hibernate/PresenceChatDAO.java

(-0, +0)

| History

| Source

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

Marcin Cieslak — Fri, 29 Jan 2016 09:41:39 +0100

Marcin Cieslak committed MAIN:marcin:20160129084139:1 on branch MAIN in lams

file IPresenceChatDAO.java was initially added on branch lams2_head_wildfly.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/dao/IPresenceChatDAO.java

(-0, +0)

| History

| Source

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-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-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-3599: Load only first few learners for each activity and lesson completed. Count learners for each activity, includ...

Marcin Cieslak — Wed, 28 Oct 2015 09:23:53 +0100

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

LDEV-3599: Load only first few learners for each activity and lesson completed. Count learners for each activity, including hidden children of Branching in Flash format. Fetch full learner list on demand.

Remove unnecessary methods.

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java	(-36, +34)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java	(-78, +139)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java	(-15, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(-32, +25)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java	(-7, +1)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(-9, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(-7, +42)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-111, +135)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-225, +280)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-104, +116)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3577 Pass marks to gradebook on finishing activity that was already completed

Andrey Balan — Fri, 16 Oct 2015 16:17:52 +0200

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

LDEV-3577 Pass marks to gradebook on finishing activity that was already completed

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java	(-1, +9)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(-32, +33)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	(-2, +6)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3533: Detect iOS-based client and use simple Learner interface then.

Marcin Cieslak — Fri, 14 Aug 2015 09:34:56 +0200

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

LDEV-3533: Detect iOS-based client and use simple Learner interface then.

· /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/index.jsp	(-0, +39)	\| History	\| Source
· /lams_learning/web/main.jsp	(-61, +5)	\| History	\| Source	\| Diff
· /lams_learning/web/css/main.css	(-5, +0)	\| History	\| Source	\| Diff
· /lams_learning/web/mobile/main.jsp	(-0, +52)	\| History	\| Source
· /lams_learning/web/mobile/progress.jsp	(-0, +64)	\| History	\| Source
· /lams_learning/web/mobile/common/progressOutput.jsp	(-0, +91)	\| History	\| Source

lams (MAIN): LDEV-3532 Proper handling of passing marks to LMS on the second attempt

Andrey Balan — Thu, 13 Aug 2015 23:02:55 +0200

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

LDEV-3532 Proper handling of passing marks to LMS on the second attempt

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java	(-45, +59)	\| History	\| Source	\| Diff
· /lams_learning/web/close.jsp	(-8, +11)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3514: Use pretInterceptor instead of postInterceptor....

Marcin Cieslak — Mon, 10 Aug 2015 17:07:35 +0200

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

LDEV-3514: Use pretInterceptor instead of postInterceptor.

Create new transactions for service method retries.

Attach activity to Hibernate session in completeActivity() method.

· /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml

(-1, +1)

| History

| Source

| Diff

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

(-1, +3)

| History

| Source

| Diff

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

(-11, +24)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml

(-1, +1)

| History

| Source

| Diff

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

(-0, +30)

| History

| Source

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

(-0, +35)

| History

| Source

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

(-13, +44)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml

(-5, +1)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml

(-1, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

(-2, +2)

| History

| Source

| Diff

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

(-2, +3)

| History

| Source

| Diff

… 29 more files in changeset.

lams (MAIN): LDEV-3514: Use postInterceptor instead of preInterceptor....

Marcin Cieslak — Wed, 05 Aug 2015 18:49:12 +0200

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

LDEV-3514: Use postInterceptor instead of preInterceptor.

PreInterceptor apparently runs before Hibernate transaction gets created. When an exception in the proxied method occurs, the transaction is canceled and is not re-created when retry is attempted. This leads to "no session" or "read only transaction on write" errors.

PostInterceptor seems to work when the transaction is already created, so retries happen witin its scope.

· /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml

(-1, +1)

| History

| Source

| Diff

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

(-11, +11)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml

(-1, +1)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml

(-1, +5)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml

(-1, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

(-2, +2)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/.../lams/tool/assessment/assessmentApplicationContext.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml

(-2, +2)

| History

| Source

| Diff

· /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml

(-2, +2)

| History

| Source

| Diff

… 25 more files in changeset.

lams (MAIN): LDEV-3514: Wrap all transactional methods with TransactionRetryInterceptor. Set number of attempts to 3....

Marcin Cieslak — Wed, 22 Jul 2015 09:59:52 +0200

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

LDEV-3514: Wrap all transactional methods with TransactionRetryInterceptor. Set number of attempts to 3.

Remove previous safety mechanism for completeActivity() method.

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml

(-1, +5)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml

(-0, +5)

| History

| Source

| Diff

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

(-1, +4)

| History

| Source

| Diff

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

(-7, +60)

| History

| Source

| Diff

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

(-1, +6)

| History

| Source

| Diff

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

(-0, +15)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml

(-0, +5)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml

(-2, +7)

| History

| Source

| Diff

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

(-0, +66)

| History

| Source

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml

(-0, +1)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml

(-0, +5)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

(-0, +10)

| History

| Source

| Diff

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

(-31, +3)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml

(-0, +5)

| History

| Source

| Diff

… 28 more files in changeset.