Activity lams-github/

LDEV-1569: Validation for number of groups no longer does comparison if (max) number of groups = 0 as this was causing problems in Live Edit. When it is set to 0, it implies that there can be any number of groups.

- -4
- +14
/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
- History
- Source
- Diff
/lams_central/src/.../ObjectExtractor.java
- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
- History
- Source
- Diff
/lams_common/src/.../RandomGrouper.java
- -3
- +5
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignValidator.java
- History
- Source
- Diff
/lams_common/.../LearningDesignValidator.java

2:14 pm

mseaton

More
34cb172
changed 15 files
v4.7, v4.8

LDEV-1649 LDEV-1650 Added functionality to copy/pastle optional and parallel activities.

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf
- binary
/lams_central/web/lams_authoring_library.swf
- History
- Source
- Diff
/lams_central/.../lams_authoring_library.swf
- -8
- +9
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/Activity.as
- -3
- +3
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/Application.as
- -0
- +13
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
- History
- Source
- Diff
/lams_flash/src/.../BranchingActivity.as
- -0
- +3
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as
- History
- Source
- Diff
/lams_flash/src/.../ComplexActivity.as
- -0
- +7
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateActivity.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/GateActivity.as
- -0
- +12
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupingActivity.as
- History
- Source
- Diff
/lams_flash/src/.../GroupingActivity.as
- -4
- +3
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/ToolActivity.as
- -2
- +8
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Transition.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/Transition.as
- -5
- +6
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
- History
- Source
- Diff
/lams_flash/src/.../cv/CanvasController.as
- -21
- +134
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
- History
- Source
- Diff
/lams_flash/src/.../cv/CanvasHelper.as
- -1
- +0
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
- History
- Source
- Diff
/lams_flash/src/central/.../cv/CanvasView.as
- -1
- +1
/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as
- History
- Source
- Diff
/lams_flash/src/.../monitoring/Application.as
- -1
- +1
/lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as
- History
- Source
- Diff
/lams_flash/src/.../util/CustomContextMenu.as

2:34 pm

fmalikoff

More
dba3e60
changed 19 files
v4.7, v4.8

LDEV-1676: Adding a new column in forun that shows if any of a learner's files have been marked.

Also fixed a problem with the view forum screen in teacher mode. When accessed from monitoring, the teacher was able to see and edit the learner's reflection. Now when the screen is accessed from the summary screen, the reflection cannot be seen (as this is primarily for marking). When the screen is accessed from the learner progress screen the reflection can be seen but not modified.

- -1
- +1
/lams_tool_forum/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_forum/.../ApplicationResources.properties
- -1
- +1
/lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_forum/.../ApplicationResources_en_AU.properties
- -0
- +2
/lams_tool_forum/conf/xdoclet/struts-actions.xml
- History
- Source
- Diff
/lams_tool_forum/conf/.../struts-actions.xml
- -0
- +9
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/UserDTO.java
- History
- Source
- Diff
/lams_tool_forum/src/.../dto/UserDTO.java
- -0
- +1
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumConstants.java
- -14
- +45
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_forum/src/.../LearningAction.java
- -9
- +38
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_forum/.../MonitoringAction.java
- -0
- +2
/lams_tool_forum/web/WEB-INF/struts-config.xml
- History
- Source
- Diff
/lams_tool_forum/web/.../struts-config.xml
- -0
- +8
/lams_tool_forum/web/common/header.jsp
- History
- Source
- Diff
/lams_tool_forum/web/common/header.jsp
- -1
- +1
/lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../topiceditform.jsp
- -1
- +1
/lams_tool_forum/web/jsps/learning/message/topicform.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../topicform.jsp
- -1
- +1
/lams_tool_forum/web/jsps/learning/message/topiclist.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../topiclist.jsp
- -1
- +1
/lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../topicreplyform.jsp
- -3
- +3
/lams_tool_forum/web/jsps/learning/message/topicview.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../topicview.jsp
- -7
- +9
/lams_tool_forum/web/jsps/learning/viewforum.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../viewforum.jsp
… 4 more files in changeset.

2:24 pm

dcarlier

More
19af16b
changed 6 files
v4.7, v4.8

LDEV-1643 Fixed non retractable (flow and optional) menus on outside click in author

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf
- binary
/lams_central/web/lams_authoring_library.swf
- History
- Source
- Diff
/lams_central/.../lams_authoring_library.swf
- -0
- +4
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
- History
- Source
- Diff
/lams_flash/src/.../cv/CanvasController.as
- -3
- +5
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as
- History
- Source
- Diff
/lams_flash/src/.../tb/ToolbarController.as
- -0
- +6
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as
- History
- Source
- Diff
/lams_flash/src/central/.../tb/ToolbarView.as
- -0
- +4
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as
- History
- Source
- Diff
/lams_flash/src/.../tk/ToolkitController.as

11:52 am

fmalikoff

More
f4e4714
changed 1 file
v4.7, v4.8

LDEV-1676: Changing submit and forum so that after the marks screen is closed (in monitoring) the main tool monitoring screen is refreshed. Want to share the code used in the Edit Activity refresh, so move it to common.js. Also fixed the code so that if the currentTab has been appended previously then it is replaced - this fixes a problem with the current tab getting stuck if you opened edit activity/mark multiple times but the current tab was changed.