Fisheye on lams-github/lams_monitoring/web/branching

lams-github (v4.7): LDEV-4199 Reintroduce group based branching monitoring page...

Marcin Cieslak — Mon, 24 Apr 2023 12:30:56 +0200

Marcin Cieslak committed 9fed001 on branch v4.7, v4.8 in lams-github

LDEV-4199 Reintroduce group based branching monitoring page

It is difficult to determine which groups have been mapped to branches in monitoring and whether they are not broken. We needed a page to be able to review groupings.

· /lams_central/web/includes/javascript/authoring/authoringProperty.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-2, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingController.java	(-0, +40)	\| History	\| Source
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-91, +65)	\| History	\| Source	\| Diff
· /lams_monitoring/web/assets/styles/main.css	(-61, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/viewGroupedBranching.jsp	(-0, +81)	\| History	\| Source
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-2, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3707: Use Flashless chosen branching interface in Monitor. Remove obsolete Flash classes and methods. Fix group ren...

Marcin Cieslak — Fri, 04 Mar 2016 14:40:56 +0100

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

LDEV-3707: Use Flashless chosen branching interface in Monitor. Remove obsolete Flash classes and methods. Fix group renaming. General clean up.

· /lams_build/lib/lams/lams-central.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	(-63, +67)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/orgGroup.js	(-3, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040056.sql	(-0, +8)	\| History	\| Source
· /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	(-9, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-45, +19)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java	(-369, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java	(-399, +31)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/PerformChosenGroupingServlet.java	(-127, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/web/WEB-INF/web.xml	(-9, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/BranchManager.swf	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/chosenSelection.jsp	(-153, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/groupedSelection.jsp	(-380, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/viewBranches.jsp	(-128, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-2917: Use <!DOCTYPE html> everywhere.

Marcin Cieslak — Tue, 09 Feb 2016 19:53:33 +0100

Marcin Cieslak committed 2ef18e4 on branch v4.7, v4.8 in lams-github

LDEV-2917: Use everywhere.

· /TestHarness4LAMS2/template.html

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/import/status.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/openidConfig.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/template.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/timezoneServerManagement.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/toolcontent/learningLibraryGroup.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/addLesson.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmactualfolder.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmcreatefolder.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmfolders.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmresourceslist.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmresourcetype.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/filemanager/browser/default/frmupload.html

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/ckeditor/plugins/jlatexmath/jlatexmath.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/comments/comments.jsp

(-1, +1)

| History

| Source

| Diff

… 156 more files in changeset.

lams-github (v4.7): LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options

Andrey Balan — Fri, 17 Jan 2014 23:37:29 +0100

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

LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options

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

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/.settings/org.eclipse.core.resources.prefs

(-3, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

(-16, +0)

| History

| Source

| Diff

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

(-28, +7)

| History

| Source

| Diff

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

(-11, +0)

| History

| Source

| Diff

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

(-3, +2)

| History

| Source

| Diff

· /lams_common/.classpath

(-1, +1)

| History

| Source

| Diff

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

(-8, +0)

| History

| Source

| Diff

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

(-8, +0)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml

(-45, +0)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml

(-28, +1)

| History

| Source

| Diff

· /lams_common/conf/middlegen/learningdesign-prefs.properties

(-10, +0)

| History

| Source

| Diff

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

(-0, +19)

| History

| Source

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

(-35, +7)

| History

| Source

| Diff

… 58 more files in changeset.

lams-github (v4.7): LDEV-2170 moved playerProduct swf for flex apps.

mseaton — Thu, 12 Mar 2009 02:35:59 +0100

mseaton committed f94fd76 on branch v4.7, v4.8 in lams-github

LDEV-2170 moved playerProduct swf for flex apps.

· /lams_monitoring/web/branching/viewBranches.jsp

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-2170 moved playerProduct swf for flex apps.

mseaton — Thu, 12 Mar 2009 02:12:54 +0100

mseaton committed 704c3a3 on branch v4.7, v4.8 in lams-github

LDEV-2170 moved playerProduct swf for flex apps.

· /lams_central/web/includes/flash/playerProductInstall.swf	(binary)	\| History	\| Source
· /lams_monitoring/web/branching/chosenSelection.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/playerProductInstall.swf	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/web/grouping/chosenGrouping.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/grouping/playerProductInstall.swf	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/web/grouping/viewGroups.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): Hopefully solving the problem of grouping/branching not appearing

paulg — Wed, 03 Dec 2008 07:12:11 +0100

paulg committed fb22b5b on branch v4.7, v4.8 in lams-github

Hopefully solving the problem of grouping/branching not appearing

· /lams_monitoring/web/branching/playerProductInstall.swf	(binary)	\| History	\| Source
· /lams_monitoring/web/grouping/playerProductInstall.swf	(binary)	\| History	\| Source

lams-github (v4.7): LDEV-2036 Grouping now showing in viewMode (src typo) LDEV-2026 Flashless presence showing all characters perfect (html)...

paulg — Mon, 24 Nov 2008 01:19:47 +0100

paulg committed 12450cb on branch v4.7, v4.8 in lams-github

LDEV-2036 Grouping now showing in viewMode (src typo) LDEV-2026 Flashless presence showing all characters perfect (html), in Flash latin accents are removed to ensure that they display correctly (mx2004 issue?) LDEV-2025 Flash presence now displaying OK in IE6 LDEV-2040 New checkboxes were not being skinned

· /lams_central/conf/flashxml/lams/defaultTheme.xml

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/css/defaultHTML_learner.css

(-0, +6)

| History

| Source

| Diff

· /lams_flash/src/central/flash/lam_addseq_wiz.fla

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/lams_learner.fla

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/lams_monitoring_v1.fla

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Presence.as

(-3, +4)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as

(-13, +38)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as

(-18, +16)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as

(-0, +3)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as

(-0, +4)

| History

| Source

| Diff

· /lams_flash/src/central/flex/BranchManager/.project

(-0, +5)

| History

| Source

| Diff

· /lams_flash/src/central/flex/BranchManager/src/BranchManager.mxml

(-4, +4)

| History

| Source

| Diff

· /lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml

(-4, +4)

| History

| Source

| Diff

· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as

(-0, +46)

| History

| Source

| Diff

· /lams_learning/web/includes/presence.js

(-7, +59)

| History

| Source

| Diff

… 15 more files in changeset.

lams-github (v4.7): LDEV-2001 Monitors should be able to add unlocated learners to branches and groups even if the mayDelete flag is set to ...

paulg — Fri, 07 Nov 2008 02:41:24 +0100

paulg committed 12ff0e1 on branch v4.7, v4.8 in lams-github

LDEV-2001 Monitors should be able to add unlocated learners to branches and groups even if the mayDelete flag is set to false

· /lams_flash/src/central/flex/BranchManager/src/BranchManager.mxml	(-13, +14)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml	(-23, +39)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(-3, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingAction.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/BranchManager.swf	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/web/grouping/GroupManager.swf	(binary)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1995 Branching and Grouping modules completed Flex projects added to a new folder in the flash project The servlets...

paulg — Thu, 06 Nov 2008 01:49:32 +0100

paulg committed edba2c2 on branch v4.7, v4.8 in lams-github

LDEV-1995 Branching and Grouping modules completed Flex projects added to a new folder in the flash project The servlets used now send back a string of XML which is parsed in Flex instead of a custom string The Grouper and Brancher were separated into two separate modules even if they are very similar. I'm sure that there is a better way of doing it but given that 2.2 is coming up I set things up this way.

· /lams_flash/src/central/flex/BranchManager/.actionScriptProperties

(-0, +16)

| History

| Source

· /lams_flash/src/central/flex/BranchManager/.flexProperties

(-0, +2)

| History

| Source

· /lams_flash/src/central/flex/BranchManager/.project

(-0, +25)

| History

| Source

· /lams_flash/src/central/flex/BranchManager/html-template/AC_OETags.js

(-0, +278)

| History

| Source

· /lams_flash/src/central/flex/BranchManager/html-template/index.template.html

(-0, +121)

| History

| Source

· /lams_flash/src/central/flex/BranchManager/html-template/playerProductInstall.swf

(binary)

| History

| Source

· /lams_flash/src/central/flex/BranchManager/src/BranchManager.mxml

(-0, +422)

| History

| Source

· /lams_flash/src/central/flex/GroupManager/.actionScriptProperties

(-0, +16)

| History

| Source

· /lams_flash/src/central/flex/GroupManager/.flexProperties

(-0, +2)

| History

| Source

· /lams_flash/src/central/flex/GroupManager/.project

(-0, +25)

| History

| Source

· /lams_flash/src/central/flex/GroupManager/.settings/org.eclipse.core.resources.prefs

(-0, +3)

| History

| Source

· /lams_flash/src/central/flex/GroupManager/html-template/AC_OETags.js

(-0, +278)

| History

| Source

· /lams_flash/src/central/flex/GroupManager/html-template/index.template.html

(-0, +121)

| History

| Source

· /lams_flash/src/central/flex/GroupManager/html-template/playerProductInstall.swf

(binary)

| History

| Source

· /lams_flash/src/central/flex/GroupManager/src/ChangePanelTitlePopUp.mxml

(-0, +47)

| History

| Source

… 13 more files in changeset.

lams-github (v4.7): LDEV-1753: Ajax based selection screens in monitoring were not indicating to the user if any exceptions thrown on the se...

fmalikoff — Tue, 03 Jun 2008 04:36:03 +0200

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

LDEV-1753: Ajax based selection screens in monitoring were not indicating to the user if any exceptions thrown on the server. Added some javascript to check if the return value from the server was the general struts error message. If it is, it extracts the message and displays that in an alert box.

· /lams_central/web/error.jsp	(-0, +2)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/error.js	(-0, +18)	\| History	\| Source
· /lams_monitoring/web/branching/chosenSelection.jsp	(-0, +7)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/groupedSelection.jsp	(-1, +8)	\| History	\| Source	\| Diff
· /lams_monitoring/web/grouping/chosenGrouping.jsp	(-1, +10)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1725: Avoid permission denied message on Shaun by ensuring the server url exactly matches the url that was used to ...

fmalikoff — Mon, 26 May 2008 08:04:31 +0200

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

LDEV-1725: Avoid permission denied message on Shaun by ensuring the server url exactly matches the url that was used to call this page.

· /lams_monitoring/web/branching/chosenSelection.jsp	(-5, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/groupedSelection.jsp	(-5, +5)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1375: Implementing the class export portfolio page for sequence activities

fmalikoff — Fri, 19 Oct 2007 03:03:00 +0200

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

LDEV-1375: Implementing the class export portfolio page for sequence activities

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java	(-12, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/WEB-INF/struts/struts-config.xml	(-16, +29)	\| History	\| Source	\| Diff
· /lams_monitoring/web/WEB-INF/struts/tiles-defs.xml	(-0, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/WEB-INF/web.xml	(-9, +18)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/viewBranches.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/viewSequence.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1280: Implementing assign groups to branch in monitor screen (for define later). Split the current branching activi...

fmalikoff — Wed, 10 Oct 2007 09:12:40 +0200

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

LDEV-1280: Implementing assign groups to branch in monitor screen (for define later). Split the current branching activity into three - one for each type of branching. Also moved the UTF-8 ajax fix to a common class in lams.jar so it can be used for all AJAX calls if desired.

· /lams_common/db/sql/insert_types_data.sql	(-6, +6)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(-0, +29)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-0, +136)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingAction.java	(-0, +175)	\| History	\| Source
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java	(-131, +9)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXAction.java	(-0, +283)	\| History	\| Source
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java	(-14, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ToolOutputBranchingAction.java	(-0, +41)	\| History	\| Source
· /lams_monitoring/web/WEB-INF/struts/struts-config.xml	(-1, +32)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/chosenSelection.jsp	(-5, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/groupedSelection.jsp	(-0, +373)	\| History	\| Source

lams-github (v4.7): LDEV-1134: Moved the "add user" and "remove user" buttons one column to the right so that they line up with the group/gr...

fmalikoff — Mon, 17 Sep 2007 03:20:27 +0200

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

LDEV-1134: Moved the "add user" and "remove user" buttons one column to the right so that they line up with the group/group members columns.

· /lams_monitoring/web/branching/chosenSelection.jsp

(-0, +3)

| 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): View branch screen done for the group based branching and tool based branching activities.

fmalikoff — Mon, 09 Jul 2007 07:41:50 +0200

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

View branch screen done for the group based branching and tool based branching activities.

· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-2, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java	(-1, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/web/WEB-INF/struts/struts-config.xml	(-0, +18)	\| History	\| Source	\| Diff
· /lams_monitoring/web/WEB-INF/struts/tiles-defs.xml	(-0, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/viewBranches.jsp	(-24, +22)	\| History	\| Source	\| Diff

lams-github (v4.7): Make space for the loading message

fmalikoff — Fri, 06 Jul 2007 06:22:43 +0200

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

Make space for the loading message

· /lams_monitoring/web/branching/chosenSelection.jsp

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): Branching: Teacher chosen branch screen basically working. Still a bit of clean up on the messages to go.

fmalikoff — Wed, 04 Jul 2007 10:18:48 +0200

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

Branching: Teacher chosen branch screen basically working. Still a bit of clean up on the messages to go.

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java	(-5, +30)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java	(-2, +39)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java	(-5, +6)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(-5, +7)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-0, +8)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +8)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(-13, +23)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-10, +88)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java	(-69, +22)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java	(-4, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/chosenSelection.jsp	(-173, +67)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/viewBranches.jsp	(-0, +70)	\| History	\| Source

lams-github (v4.7): Branching: Create the Teacher Chosen branching screen, based on the existing Chosen Grouping screen. Not working yet but...

fmalikoff — Tue, 03 Jul 2007 04:07:22 +0200

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

Branching: Create the Teacher Chosen branching screen, based on the existing Chosen Grouping screen. Not working yet but the changes have required changing the LessonService (in lams.jar) to take Grouping as a parameter, rather than GroupingActivity, so checking in Monitoring changes to match.

· /lams_monitoring/build.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(-8, +30)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-37, +94)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java	(-0, +392)	\| History	\| Source
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java	(-5, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/chosenSelection.jsp	(-0, +477)	\| History	\| Source