Fisheye on lams/lams_learning/src https://code.lamsfoundation.org/fisheye/changelog/~br%3Deditonfly_branching/lams/lams_learning/src Recent activity in "lams" under directory /lams_learning/src lams (editonfly_branching): Converted the CompleteActivity logic to use a forward, rather than a redirect, to make it more efficient. Wed, 11 Apr 2007 09:05:03 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070411070503 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070411070503 fmalikoff committed editonfly_branching:fmalikoff:20070411070503 on branch editonfly_branching in lams Converted the CompleteActivity logic to use a forward, rather than a redirect, to make it more efficient.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (-6, +8) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java (-7, +9) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java (-3, +6) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java (-5, +3) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java (-5, +3) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (-66, +22) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java (-6, +8) | History | Source | Diff
]]> lams (editonfly_branching): Refactoring the "complete activity" logic so that tools, gates and grouping screens all complete in the same way. Withou... Wed, 11 Apr 2007 01:32:52 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070410233252 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070410233252 fmalikoff committed editonfly_branching:fmalikoff:20070410233252 on branch editonfly_branching in lams Refactoring the "complete activity" logic so that tools, gates and grouping screens all complete in the same way. Without this change, when the gates and grouping screens were opened in popup window (after completion), it tried to go to the next activity rather than closing the window.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java (-22, +11) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java (-25, +20) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java (-8, +9) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java (-3, +36) | History | Source | Diff
]]> lams (editonfly_branching): Breaking the completeToolSession functionality into two parts. Now the tool session is completed but it forwards to anot... Tue, 10 Apr 2007 07:03:20 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070410050320 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070410050320 fmalikoff committed editonfly_branching:fmalikoff:20070410050320 on branch editonfly_branching in lams Breaking the completeToolSession functionality into two parts. Now the tool session is completed but it forwards to another call to complete the activity and calculate the next activity. This is to reduce the chances of collisions when live edit is being started, in a clustering environment. See the live edit wiki page for more details.

· /lams_build/lib/lams/lams-learning.jar (binary) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources.properties (-2, +3) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (-2, +3) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (-5, +17) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java (-14, +17) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (-41, +36) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java (-3, +9) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java (-20, +27) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java (-4, +19) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java (-5, +16) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (-2, +1) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (-6, +17) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java (-1, +9) | History | Source | Diff
· /lams_learning/web/progressBroken.jsp (-5, +1) | History | Source | Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (-2, +3) | History | Source | Diff
]]> lams (editonfly_branching): More handling for "null" current/next activity - needed for the stop gates being removed.... Fri, 30 Mar 2007 07:02:17 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070330050217 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070330050217 fmalikoff committed editonfly_branching:fmalikoff:20070330050217 on branch editonfly_branching in lams More handling for "null" current/next activity - needed for the stop gates being removed.

Also now check that any activity being commenced isn't a live edit + not read only activity. This will stop any user that evades the stop gates from making activities after the stop gate read only - they will not be able to do the next activity. Given that the learning design is already loaded into memory, it shouldn't add greatly to the progress engine steps (not compared to everything else!)

· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (-24, +73) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (-3, +3) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (-12, +12) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java (-2, +20) | History | Source | Diff
]]> lams (editonfly_branching): Trying to make progress engine cope with "holes" in the progress ie if the user's current activity disappears (e.g. temp... Wed, 28 Mar 2007 08:41:35 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070328064135 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070328064135 fmalikoff committed editonfly_branching:fmalikoff:20070328064135 on branch editonfly_branching in lams Trying to make progress engine cope with "holes" in the progress ie if the user's current activity disappears (e.g. temporary system gate and live edit end)

· /lams_learning/conf/language/lams/ApplicationResources.properties (-2, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (-9, +20) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (-20, +56) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java (-9, +11) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java (-16, +19) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java (-1, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java (-21, +34) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (-4, +1) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (-2, +6) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-2, +2) | History | Source | Diff
· /lams_learning/web/progressBroken.jsp (-0, +37) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/struts-config.xml (-19, +10) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/tiles-defs.xml (-0, +4) | History | Source | Diff
· /lams_learning/web/gate/gateNext.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/layout/gateLayout.jsp (-1, +1) | History | Source | Diff
]]> lams (editonfly_branching): updated hibernate config file for learning design table + fixed monitor locked view control + learner learning design up... Tue, 20 Mar 2007 08:05:03 +0100 mseaton https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Amseaton%3A20070320070503 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Amseaton%3A20070320070503 mseaton committed editonfly_branching:mseaton:20070320070503 on branch editonfly_branching in lams updated hibernate config file for learning design table + fixed monitor locked view control + learner learning design update triggered by version value in passon swf

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/src/flash/learnerProgress_lc.fla (binary) | History | Source | Diff
· /lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as (binary) | History | Source | Diff
· /lams_central/src/flash/org/lamsfoundation/lams/learner/Application.as (binary) | History | Source | Diff
· /lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as (binary) | History | Source | Diff
· /lams_central/src/flash/org/lamsfoundation/lams/monitoring/layout/DefaultLayoutManager.as (binary) | History | Source | Diff
· /lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (binary) | History | Source | Diff
· /lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorLockView.as (binary) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml (-0, +12) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (-4, +16) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java (-3, +13) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (-1, +18) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java (-1, +7) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java (-1, +11) | History | Source | Diff
· /lams_learning/web/lams_learner.swf (binary) | History | Source | Diff
… 4 more files in changeset.
]]> lams (editonfly_branching): Merging 2.0.1 changes from the HEAD Mon, 12 Mar 2007 06:37:51 +0100 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070312053751 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070312053751 fmalikoff committed editonfly_branching:fmalikoff:20070312053751 on branch editonfly_branching in lams Merging 2.0.1 changes from the HEAD

· /lams_learning/build.xml (-1, +0) | History | Source | Diff
· /lams_learning/conf/language/ApplicationResources_cy_GB.properties (-78, +0) | History | Source | Diff
· /lams_learning/conf/language/ApplicationResources_de_DE.properties (-78, +0) | History | Source | Diff
· /lams_learning/conf/language/ApplicationResources_en_AU.properties (-78, +0) | History | Source | Diff
· /lams_learning/conf/language/ApplicationResources_es_ES.properties (-78, +0) | History | Source | Diff
· /lams_learning/conf/language/ApplicationResources_it_IT.properties (-78, +0) | History | Source | Diff
· /lams_learning/conf/language/ApplicationResources_mi_NZ.properties (-78, +0) | History | Source | Diff
· /lams_learning/conf/language/ApplicationResources_sv_SE.properties (-78, +0) | History | Source | Diff
· /lams_learning/conf/language/ApplicationResources_vi_VN.properties (-78, +0) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources.properties (-1, +1) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources_ar_JO.properties (-1, +1) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources_cy_GB.properties (-1, +1) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources_da_DK.properties (-1, +1) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources_de_DE.properties (-1, +1) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources_el_GR.properties (-1, +1) | History | Source | Diff
… 54 more files in changeset.
]]> lams (editonfly_branching): Got the basic gate window working in learner - system gate had the wrong type id and needed to inherit from PermissionGa... Thu, 01 Mar 2007 22:33:14 +0100 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070301213314 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070301213314 fmalikoff committed editonfly_branching:fmalikoff:20070301213314 on branch editonfly_branching in lams Got the basic gate window working in learner - system gate had the wrong type id and needed to inherit from PermissionGate to pick up the default screen.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java (-2, +2) | History | Source | Diff
]]> lams (editonfly_branching): fixed read only setting for optional activity children + further validation for trying to add transition to a read only ... Tue, 13 Feb 2007 08:11:49 +0100 mseaton https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Amseaton%3A20070213071149 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Amseaton%3A20070213071149 mseaton committed editonfly_branching:mseaton:20070213071149 on branch editonfly_branching in lams fixed read only setting for optional activity children + further validation for trying to add transition to a read only activity

· /lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (binary) | History | Source | Diff
· /lams_central/web/lams_authoring.swf (binary) | History | Source | Diff
· /lams_central/web/lams_authoring_library.swf (binary) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (-1, +6) | History | Source | Diff
]]> lams (editonfly_branching): Updated author validation on read-only activities and transitions in Edit-on-the-Fly mode. Read only field is set when a... Tue, 13 Feb 2007 06:43:29 +0100 mseaton https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Amseaton%3A20070213054329 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Amseaton%3A20070213054329 mseaton committed editonfly_branching:mseaton:20070213054329 on branch editonfly_branching in lams Updated author validation on read-only activities and transitions in Edit-on-the-Fly mode. Read only field is set when activity is attempted (ProgressEngine).

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (binary) | History | Source | Diff
· /lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorNew.as (binary) | History | Source | Diff
· /lams_central/web/lams_authoring.swf (binary) | History | Source | Diff
· /lams_central/web/lams_authoring_library.swf (binary) | History | Source | Diff
· /lams_central/web/flashxml/authoring/en_AU_dictionary.xml (-1, +1) | History | Source | Diff
· /lams_central/web/flashxml/authoring/en_dictionary.xml (-1, +1) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (-2, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (-2, +7) | History | Source | Diff
]]>