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

lams (lams2_head_wildfly): 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 lams2_head_wildfly:marcin:20170317045755 on branch lams2_head_wildfly in lams

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 (lams2_head_wildfly): LDEV-3724: updating LAMS Learning to bootstrap

Ernie Ghiglione — Sun, 13 Mar 2016 00:48:18 +0100

Ernie Ghiglione committed lams2_head_wildfly:ernieg:20160312234818 on branch lams2_head_wildfly in lams

LDEV-3724: updating LAMS Learning to bootstrap

· /lams_learning/web/loadToolActivity.jsp	(-35, +53)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/tags/Alert.tag	(-0, +46)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/tags/Page.tag	(-0, +36)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/tlds/lams/lams.tld	(-0, +8)	\| History	\| Source	\| Diff
· /lams_learning/web/css/nprogress.css	(-0, +74)	\| History	\| Source	\| Diff
· /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	(-65, +34)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/synchGateContent.jsp	(-12, +20)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-55, +47)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-65, +91)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/wait.jsp	(-33, +31)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/nprogress.js	(-0, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/gateLayout.jsp	(-16, +19)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/layout.jsp	(-0, +3)	\| History	\| Source	\| Diff

lams (MAIN): Added "copy-tags" to the build to make it easier to update the tags....

fmalikoff — Fri, 29 Sep 2006 01:24:42 +0200

fmalikoff committed MAIN:fmalikoff:20060928232442 on branch MAIN in lams

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/error.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/template.jsp

(-2, +2)

| History

| Source

| Diff

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

(-0, +8)

| History

| Source

| Diff

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

(-6, +13)

| 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_central/build.xml

(-1, +0)

| History

| Source

| Diff

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

(-1, +32)

| History

| Source

| Diff

· /lams_central/web/addLesson.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/admin.jsp

(-8, +3)

| History

| Source

| Diff

· /lams_central/web/author.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/authoringConfirm.jsp

(-20, +16)

| History

| Source

| Diff

· /lams_central/web/copyright.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/index.jsp

(-8, +3)

| History

| Source

| Diff

… 256 more files in changeset.

lams (MAIN): Updated address of FSF in copyright statement

fmalikoff — Sun, 17 Sep 2006 08:09:25 +0200

fmalikoff committed MAIN:fmalikoff:20060917060925 on branch MAIN in lams

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

… 571 more files in changeset.

lams (MAIN): Converted to the learner content styles

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

fmalikoff committed MAIN:fmalikoff:20060701124910 on branch MAIN in lams

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

(-1, +7)

| 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/exportWaitingPage.jsp

(-5, +16)

| History

| Source

| Diff

· /lams_learning/web/lessonComplete.jsp

(-4, +18)

| History

| Source

| Diff

· /lams_learning/web/loadToolActivity.jsp

(-5, +23)

| History

| Source

| Diff

· /lams_learning/web/optionsActivity.jsp

(-15, +28)

| History

| Source

| Diff

· /lams_learning/web/partialCompleted.jsp

(-3, +18)

| History

| Source

| Diff

· /lams_learning/web/previewDefineLater.jsp

(-6, +22)

| History

| Source

| Diff

· /lams_learning/web/welcome.jsp

(-1, +18)

| History

| Source

| Diff

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

(-6, +1)

| 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/css/learner.css

(-341, +0)

| History

| Source

| Diff

… 11 more files in changeset.

lams (MAIN): Converting to the new CSS look

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

fmalikoff committed MAIN:fmalikoff:20060628231003 on branch MAIN in lams

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/exportWaitingPage.jsp

(-2, +5)

| History

| Source

| Diff

· /lams_learning/web/lessonComplete.jsp

(-4, +3)

| History

| Source

| Diff

· /lams_learning/web/loadToolActivity.jsp

(-10, +2)

| History

| Source

| Diff

· /lams_learning/web/optionsActivity.jsp

(-97, +46)

| History

| Source

| Diff

· /lams_learning/web/partialCompleted.jsp

(-5, +2)

| History

| Source

| Diff

· /lams_learning/web/previewDefineLater.jsp

(-15, +6)

| History

| Source

| Diff

· /lams_learning/web/welcome.jsp

(-10, +1)

| History

| Source

| Diff

· /lams_learning/web/exportPortfolio/main.jsp

(-17, +27)

| History

| Source

| Diff

· /lams_learning/web/exportPortfolio/notSupported.jsp

(-0, +6)

| 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

… 17 more files in changeset.

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

fmalikoff — Sun, 18 Jun 2006 15:06:54 +0200

fmalikoff committed MAIN:fmalikoff:20060618130654 on branch MAIN in lams

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

(-1, +7)

| History

| Source

| Diff

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

(-1, +20)

| History

| Source

| Diff

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

(-13, +27)

| History

| Source

| Diff

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

(-43, +56)

| History

| Source

| Diff

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

(-29, +10)

| History

| Source

| Diff

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

(-5, +6)

| History

| Source

| Diff

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

(-9, +7)

| History

| Source

| Diff

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

(-8, +22)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

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

(-3, +5)

| 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

(-43, +15)

| History

| Source

| Diff

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

(-12, +5)

| History

| Source

| Diff

… 11 more files in changeset.

lams (MAIN): 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:29 +0200

fmalikoff committed MAIN:fmalikoff:20060614231329 on branch MAIN in lams

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	(-7, +13)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(-17, +42)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java	(-10, +22)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java	(-4, +17)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	(-3, +17)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	(-3, +9)	\| History	\| Source	\| Diff
· /lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(-4, +4)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/previewDefineLater.jsp	(-0, +43)	\| History	\| Source
· /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 (MAIN): 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:26 +0200

fmalikoff committed MAIN:fmalikoff:20060602075626 on branch MAIN in lams

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	(-22, +6)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(-46, +25)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceException.java	(-1, +25)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	(-17, +23)	\| History	\| Source	\| Diff
· /lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(-2, +2)	\| 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