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

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-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 Fix branching in learner

Marcin Cieslak — Fri, 31 Aug 2018 17:00:15 +0200

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

LDEV-4440 Fix branching in learner

· /lams_learning/web/branching/wait.jsp

(-1, +1)

| History

| Source

| Diff

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

Fri, 31 Aug 2018 12:08:01 +0200

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

LDEV-4440 Learning branching fixes

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java	(-22, +4)	\| History	\| Source	\| Diff
· /lams_learning/web/branching/preview.jsp	(-5, +5)	\| History	\| Source	\| Diff
· /lams_learning/web/branching/wait.jsp	(-4, +4)	\| 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-3724: Bootstrapping the special authoring preview version of branching and the permission wait branching screens.

Thu, 26 May 2016 03:40:48 +0200

FionaMalikoff committed 30578f3 on branch v4.7, v4.8 in lams-github

LDEV-3724: Bootstrapping the special authoring preview version of branching and the permission wait branching screens.

· /lams_learning/web/branching/preview.jsp	(-19, +11)	\| History	\| Source	\| Diff
· /lams_learning/web/branching/wait.jsp	(-14, +5)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1134: Preview now lets the author select a branch to view, but the author can only do one branch. To view all branc...

fmalikoff — Fri, 27 Jul 2007 07:13:58 +0200

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

LDEV-1134: Preview now lets the author select a branch to view, but the author can only do one branch. To view all branches, the author needs to run preview multiple times.

· /lams_learning/conf/language/lams/ApplicationResources.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/conf/xdoclet/struts-forms.xml	(-0, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/struts/struts-config.xml	(-0, +7)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/struts/tiles-defs.xml	(-0, +4)	\| History	\| Source	\| Diff
· /lams_learning/web/branching/preview.jsp	(-0, +139)	\| History	\| Source
· /lams_learning/web/branching/wait.jsp	(-5, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1134: Branching: View screen for the class export portfolio

fmalikoff — Tue, 17 Jul 2007 03:32:21 +0200

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

LDEV-1134: Branching: View screen for the class export portfolio

· /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java	(-32, +50)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java	(-18, +15)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/struts/struts-config.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/branching/wait.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/branchingWaitLayout.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingExportPortfolioServlet.java	(-0, +69)	\| History	\| Source
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java	(-29, +61)	\| History	\| Source	\| Diff
· /lams_monitoring/web/WEB-INF/web.xml	(-0, +9)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/viewBranches.jsp	(-2, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/web/template/template.jsp	(-3, +5)	\| History	\| Source	\| Diff

lams-github (v4.7): Refactoring code so that all screens can update the progress bar.

fmalikoff — Thu, 12 Jul 2007 02:59:36 +0200

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

Refactoring code so that all screens can update the progress bar.

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

(-2, +13)

| History

| Source

| Diff

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

(-96, +0)

| History

| Source

| Diff

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

(-3, +5)

| History

| Source

| Diff

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

(-3, +2)

| History

| Source

| Diff

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

(-6, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/action/DisplayParallelActivityAction.java

(-3, +5)

| 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/GateAction.java

(-10, +12)

| History

| Source

| Diff

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

(-4, +3)

| History

| Source

| Diff

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

(-2, +3)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-11, +1)

| History

| Source

| Diff

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

(-3, +8)

| History

| Source

| Diff

… 4 more files in changeset.

lams-github (v4.7): Stop it deploying the classes directory under WEB-INF - this can give us class conflicts as the code ends up in two plac...

fmalikoff — Thu, 28 Jun 2007 08:50:42 +0200

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

Stop it deploying the classes directory under WEB-INF - this can give us class conflicts as the code ends up in two places.

· /lams_learning/build.xml

(-0, +2)

| History

| Source

| Diff

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

(-2, +6)

| History

| Source

| Diff

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

(-0, +5)

| History

| Source

| Diff

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

(-0, +9)

| History

| Source

| Diff

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

(-20, +18)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java

(-36, +23)

| History

| Source

| Diff

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

(-0, +17)

| History

| Source

| Diff

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

(-18, +121)

| History

| Source

| Diff

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

(-8, +0)

| History

| Source

| Diff

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

(-50, +70)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-9, +1)

| History

| Source

| Diff

… 11 more files in changeset.