Fisheye on lams-github/lams_learning/web/grouping/wait.jsp

lams-github (v4.8): LDEV-5397 make sure all buttons have proper "type" attribute

Andrey Balan — Wed, 20 Dec 2023 01:24:02 +0100

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

LDEV-5397 make sure all buttons have proper "type" attribute

· /lams_learning/web/grouping/choose.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/grouping/show.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/grouping/wait.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/optionsActivity.jsp

(-1, +1)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

· /lams_tool_daco/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_larsrc/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_mindmap/web/pages/learning/singleMindmap.jsp

(-1, +3)

| History

| Source

| Diff

· /lams_tool_nb/web/learnerContent.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_tool_preview/web/pages/learning/rubrics.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_preview/web/pages/learning/rubricsPivot.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_sbmt/web/learner/sbmtlearner.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_tool_scratchie/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

… 10 more files in changeset.

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-4874 Restrict displaying names for students that are not within student's group

Andrey Balan — Fri, 11 Oct 2019 19:43:54 +0200

Andrey Balan committed e325f88 on branch v4.7, v4.8 in lams-github

LDEV-4874 Restrict displaying names for students that are not within student's group

· /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(-0, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20191010.sql	(-0, +10)	\| History	\| Source
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupDTO.java	(-14, +16)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java	(-101, +49)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-31, +28)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-45, +48)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/wait.jsp	(-4, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Fixed TBL template in Authoring. Tweaks to gates, branch

Fri, 21 Sep 2018 06:08:34 +0200

Fiona Malikoff committed 54007f9 on branch v4.7, v4.8 in lams-github

LDEV-4440 Fixed TBL template in Authoring. Tweaks to gates, branch

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

(-9, +9)

| History

| Source

| Diff

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

(-4, +2)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/BranchingActivityController.java

(-13, +13)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-13, +5)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

· /lams_learning/web/branching/preview.jsp

(-6, +6)

| History

| Source

| Diff

· /lams_learning/web/branching/wait.jsp

(-5, +5)

| History

| Source

| Diff

· /lams_learning/web/gate/conditionGateContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/gate/gateDescription.jsp

(-4, +4)

| History

| Source

| Diff

· /lams_learning/web/gate/gateNext.jsp

(-7, +5)

| History

| Source

| Diff

· /lams_learning/web/gate/permissionGateContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/gate/scheduleGateContent.jsp

(-8, +8)

| History

| Source

| Diff

· /lams_learning/web/gate/synchGateContent.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_learning/web/grouping/choose.jsp

(-1, +1)

| History

| Source

| Diff

… 15 more files in changeset.

lams-github (v4.7): LDEV-4440 Grouping fixes

Tue, 21 Aug 2018 14:44:33 +0200

MichalKowalski committed 580d890 on branch v4.7, v4.8 in lams-github

LDEV-4440 Grouping fixes

· /lams_build/lib/lams/lams-gradebook.jar	(binary)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams-learning.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql	(-0, +59)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/.../gradebook/web/controller/GradebookMonitoringController.java	(-3, +2)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java	(-6, +7)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/wait.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/groupWaitLayout.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/notebook/addnew.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/notebook/viewall.jsp	(-2, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Learning server start

Fri, 17 Aug 2018 12:26:22 +0200

MichalKowalski committed b546f3a on branch v4.7, v4.8 in lams-github

LDEV-4440 Learning server start

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

(binary)

| History

| Source

| Diff

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

(binary)

| History

| Source

| Diff

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

(-0, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/branching/preview.jsp

(-98, +118)

| History

| Source

| Diff

· /lams_learning/web/branching/wait.jsp

(-21, +38)

| History

| Source

| Diff

· /lams_learning/web/close.jsp

(-34, +54)

| History

| Source

| Diff

· /lams_learning/web/gate/conditionGateContent.jsp

(-22, +53)

| History

| Source

| Diff

· /lams_learning/web/gate/permissionGateContent.jsp

(-22, +54)

| History

| Source

| Diff

· /lams_learning/web/gate/scheduleGateContent.jsp

(-39, +71)

| History

| Source

| Diff

· /lams_learning/web/gate/synchGateContent.jsp

(-11, +40)

| History

| Source

| Diff

· /lams_learning/web/grouping/choose.jsp

(-82, +100)

| History

| Source

| Diff

· /lams_learning/web/grouping/show.jsp

(-85, +105)

| History

| Source

| Diff

· /lams_learning/web/grouping/wait.jsp

(-27, +38)

| History

| Source

| Diff

· /lams_learning/web/lessonComplete.jsp

(-171, +190)

| History

| Source

| Diff

… 11 more files in changeset.

lams-github (v4.7): LDEV-4440 Learning

Thu, 16 Aug 2018 15:59:29 +0200

MichalKowalski committed 1f7150d on branch v4.7, v4.8 in lams-github

LDEV-4440 Learning

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/BranchingActivityController.java

(-17, +15)

| History

| Source

| Diff

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

(-13, +11)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/CompleteActivityController.java

(-11, +13)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/DisplayActivityController.java

(-12, +11)

| History

| Source

| Diff

· /lams_learning/src/java/org/.../learning/web/controller/DisplayOptionsActivityController.java

(-17, +13)

| History

| Source

| Diff

· /lams_learning/src/java/org/.../learning/web/controller/DisplayParallelActivityController.java

(-14, +12)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/DisplayToolActivityController.java

(-11, +11)

| History

| Source

| Diff

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

(-19, +17)

| History

| Source

| Diff

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

(-28, +20)

| History

| Source

| Diff

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

(-454, +0)

| History

| Source

| Diff

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

(-0, +480)

| History

| Source

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/LessonCompleteActivityAction.java

(-97, +0)

| History

| Source

| Diff

· /lams_learning/src/java/org/.../learning/web/controller/LessonCompleteActivityController.java

(-0, +112)

| History

| Source

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

(-133, +0)

| History

| Source

| Diff

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

(-0, +143)

| History

| Source

… 41 more files in changeset.

lams-github (v4.7): LDEV-4278: Put and get activity ID from form since it is not present in request anymore.

Marcin Cieslak — Fri, 17 Mar 2017 05:57:55 +0100

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

LDEV-4278: Put and get activity ID from form since it is not present in request anymore.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/struts-config.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/wait.jsp	(-9, +5)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3724: updating LAMS Learning to bootstrap

Sun, 13 Mar 2016 00:48:18 +0100

erniegx committed 5d896b9 on branch v4.7, v4.8 in lams-github

LDEV-3724: updating LAMS Learning to bootstrap

· /lams_learning/web/WEB-INF/tags/Alert.tag	(-0, +46)	\| History	\| Source
· /lams_learning/web/WEB-INF/tags/Page.tag	(-0, +36)	\| History	\| Source
· /lams_learning/web/WEB-INF/tlds/lams/lams.tld	(-0, +8)	\| History	\| Source	\| Diff
· /lams_learning/web/css/nprogress.css	(-0, +74)	\| History	\| Source
· /lams_learning/web/gate/conditionGateContent.jsp	(-7, +10)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/gateNext.jsp	(-10, +15)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/permissionGateContent.jsp	(-8, +11)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/scheduleGateContent.jsp	(-64, +33)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/synchGateContent.jsp	(-14, +22)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-55, +47)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-66, +92)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/wait.jsp	(-32, +30)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/nprogress.js	(-0, +1)	\| History	\| Source
· /lams_learning/web/layout/gateLayout.jsp	(-16, +19)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/layout.jsp	(-0, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/loadToolActivity.jsp	(-34, +52)	\| History	\| Source	\| Diff

lams-github (v4.7): Added "copy-tags" to the build to make it easier to update the tags. Updated the jsp pages to support stripes and the se...

fmalikoff — Fri, 29 Sep 2006 01:32:06 +0200

fmalikoff committed ca73a51 on branch v4.7, v4.8 in lams-github

Added "copy-tags" to the build to make it easier to update the tags. Updated the jsp pages to support stripes and the separate learner stylesheet.

· /lams_admin/build.xml

(-0, +9)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/lams.tld

(-0, +8)

| History

| Source

| Diff

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

(-26, +26)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/web.xml

(-6, +13)

| History

| Source

| Diff

· /lams_admin/web/error.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/template.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/build.xml

(-1, +0)

| History

| Source

| Diff

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

(-0, +31)

| History

| Source

| Diff

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

(-1, +29)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/struts/struts-config.xml

(-1, +11)

| History

| Source

| Diff

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

(-1, +2)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/web.xml

(-19, +54)

| History

| Source

| Diff

· /lams_central/web/addLesson.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/admin.jsp

(-8, +3)

| History

| Source

| Diff

… 255 more files in changeset.

lams-github (v4.7): Updated address of FSF in copyright statement

fmalikoff — Sun, 17 Sep 2006 08:31:29 +0200

fmalikoff committed 08950e1 on branch v4.7, v4.8 in lams-github

Updated address of FSF in copyright statement

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 1378 more files in changeset.

lams-github (v4.7): Converted to the learner content styles

fmalikoff — Sat, 01 Jul 2006 14:49:10 +0200

fmalikoff committed 88e3681 on branch v4.7, v4.8 in lams-github

Converted to the learner content styles

· /lams_learning/conf/xdoclet/struts-forms.xml

(-0, +1)

| History

| Source

| Diff

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

(-0, +6)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/struts/struts-config.xml

(-0, +1)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/struts/tiles-defs.xml

(-19, +8)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/web.xml

(-6, +1)

| History

| Source

| Diff

· /lams_learning/web/css/learner.css

(-341, +0)

| History

| Source

| Diff

· /lams_learning/web/error.jsp

(-6, +22)

| History

| Source

| Diff

· /lams_learning/web/exit.jsp

(-27, +0)

| History

| Source

| Diff

· /lams_learning/web/exportPortfolio/notSupported.jsp

(-6, +9)

| History

| Source

| Diff

· /lams_learning/web/exportWaitingPage.jsp

(-5, +16)

| History

| Source

| Diff

· /lams_learning/web/gate/gateNext.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/gate/permissionGateContent.jsp

(-6, +0)

| History

| Source

| Diff

· /lams_learning/web/gate/scheduleGateContent.jsp

(-2, +0)

| History

| Source

| Diff

· /lams_learning/web/gate/synchGateContent.jsp

(-2, +0)

| History

| Source

| Diff

· /lams_learning/web/grouping/show.jsp

(-11, +24)

| History

| Source

| Diff

… 11 more files in changeset.

lams-github (v4.7): Converting to the new CSS look

fmalikoff — Thu, 29 Jun 2006 01:10:26 +0200

fmalikoff committed d75aa10 on branch v4.7, v4.8 in lams-github

Converting to the new CSS look

· /lams_learning/web/error.jsp

(-11, +4)

| History

| Source

| Diff

· /lams_learning/web/exit.jsp

(-10, +3)

| History

| Source

| Diff

· /lams_learning/web/exportPortfolio/main.jsp

(-15, +25)

| History

| Source

| Diff

· /lams_learning/web/exportPortfolio/notSupported.jsp

(-0, +6)

| History

| Source

| Diff

· /lams_learning/web/exportWaitingPage.jsp

(-2, +5)

| History

| Source

| Diff

· /lams_learning/web/gate/gateNext.jsp

(-17, +11)

| History

| Source

| Diff

· /lams_learning/web/gate/permissionGateContent.jsp

(-6, +3)

| History

| Source

| Diff

· /lams_learning/web/gate/scheduleGateContent.jsp

(-9, +4)

| History

| Source

| Diff

· /lams_learning/web/gate/synchGateContent.jsp

(-18, +7)

| History

| Source

| Diff

· /lams_learning/web/grouping/show.jsp

(-23, +16)

| History

| Source

| Diff

· /lams_learning/web/grouping/wait.jsp

(-20, +6)

| History

| Source

| Diff

· /lams_learning/web/layout/activityLayout.jsp

(-7, +5)

| History

| Source

| Diff

· /lams_learning/web/layout/gateLayout.jsp

(-6, +8)

| History

| Source

| Diff

· /lams_learning/web/layout/groupWaitLayout.jsp

(-1, +6)

| History

| Source

| Diff

· /lams_learning/web/layout/layout.jsp

(-10, +18)

| History

| Source

| Diff

… 17 more files in changeset.

lams-github (v4.7): Removing learnerProgress from the user's shared session. This should allow preview and learner to run without interferin...

fmalikoff — Sun, 18 Jun 2006 15:08:53 +0200

fmalikoff committed e5049e0 on branch v4.7, v4.8 in lams-github

Removing learnerProgress from the user's shared session. This should allow preview and learner to run without interfering with each other.

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

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

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

(-0, +6)

| History

| Source

| Diff

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

(-0, +19)

| History

| Source

| Diff

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

(-12, +26)

| History

| Source

| Diff

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

(-42, +55)

| History

| Source

| Diff

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

(-28, +9)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

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

(-8, +6)

| History

| Source

| Diff

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

(-7, +21)

| History

| Source

| Diff

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

(-3, +4)

| History

| Source

| Diff

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

(-2, +4)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-42, +14)

| History

| Source

| Diff

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

(-11, +4)

| History

| Source

| Diff

… 11 more files in changeset.

lams-github (v4.7): Preview changes: (1) when define later activity occurs don't tell the tool that it is define later but display a special...

fmalikoff — Thu, 15 Jun 2006 01:13:32 +0200

fmalikoff committed a0722fe on branch v4.7, v4.8 in lams-github

Preview changes: (1) when define later activity occurs don't tell the tool that it is define later but display a special screen before going to the next tool (2) for chosen grouping, schedule and permission gates show the normal page with an extra preview message then override the normal process and continue.

Also part A of a change to the Flash call to get the learner progress - it should take the lesson id not the progress id.

· /lams_learning/conf/language/ApplicationResources.properties	(-5, +21)	\| History	\| Source	\| Diff
· /lams_learning/conf/xdoclet/struts-forms.xml	(-0, +2)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	(-6, +12)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(-16, +41)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java	(-9, +21)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java	(-3, +16)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	(-2, +16)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	(-2, +8)	\| History	\| Source	\| Diff
· /lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/struts/struts-config.xml	(-0, +7)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/gateNext.jsp	(-11, +20)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/wait.jsp	(-3, +15)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/previewDefineLater.jsp	(-0, +43)	\| History	\| Source

lams-github (v4.7): Clean up grouping code so that the shared code is in lams.jar, and making it so that learner can't trigger the chosen gr...

fmalikoff — Fri, 02 Jun 2006 09:56:27 +0200

fmalikoff committed 4f63e22 on branch v4.7, v4.8 in lams-github

Clean up grouping code so that the shared code is in lams.jar, and making it so that learner can't trigger the chosen grouping. I18N the grouping screen and added a wait page for the chosen grouping.

· /lams_learning/conf/language/ApplicationResources.properties	(-2, +7)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	(-21, +5)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(-45, +24)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceException.java	(-0, +24)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	(-16, +22)	\| History	\| Source	\| Diff
· /lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/controlFrame.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/grouping.jsp	(-79, +0)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-0, +62)	\| History	\| Source
· /lams_learning/web/grouping/wait.jsp	(-0, +46)	\| History	\| Source
· /lams_learning/web/layout/groupWaitLayout.jsp	(-0, +46)	\| History	\| Source