Activity lams-github/

change in the naming convention for three keys for 1) Alert message when user tries to move child activity of any parallel activity container 2) replacement for word activities on complex activity container 3) Title for Optional Activity Container

- -1
- +1
/lams_central/web/flashxml/authoring/en_AU_dictionary.xml
- History
- Source
- Diff
/lams_central/web/.../en_AU_dictionary.xml
- -1
- +1
/lams_central/web/flashxml/authoring/en_dictionary.xml
- History
- Source
- Diff
/lams_central/web/.../en_dictionary.xml

12:03 pm

psharma

More
0ccac57
updated 1 file
v4.7, v4.8

latest flash file with changes in the parallel activity moviclip. This acitity is now not showing the number of activities as there alway s be only two activities

- binary
/lams_central/src/flash/lams_authoring.fla
- History
- Source
- Diff
/lams_central/src/.../lams_authoring.fla

12:01 pm

psharma

More
483498c
changed 1 file
v4.7, v4.8

wrote a condition in "activityClick" method to check if the activity has a parent then check if the parant is parallel actvitiy, if yes then do not allow that activity to be moved aroubd on the canvas out of its container.

- -4
- +15
/lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
- History
- Source
- Diff
/lams_central/src/.../cv/CanvasController.as

11:30 am

psharma

More
ef63a05
changed 2 files
v4.7, v4.8

added new entry for alert message when user tries to move any child activity in any parallel activity container

- -1
- +1
/lams_central/web/flashxml/authoring/en_AU_dictionary.xml
- History
- Source
- Diff
/lams_central/web/.../en_AU_dictionary.xml
- -1
- +1
/lams_central/web/flashxml/authoring/en_dictionary.xml
- History
- Source
- Diff
/lams_central/web/.../en_dictionary.xml

11:17 am

psharma

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

adjusted the hight for transparent glass on the parallel acitivity header panel used for opeing and closing of lock

- -1
- +1
/lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
- History
- Source
- Diff
/lams_central/.../CanvasParallelActivity.as

11:16 am

psharma

More
cd01a61
updated 1 file
v4.7, v4.8

latest flash file after removing acitivity count from the parallel activity container

- binary
/lams_central/src/flash/lams_authoring.fla
- History
- Source
- Diff
/lams_central/src/.../lams_authoring.fla

11:10 am

psharma

More
877d908
changed 2 files
v4.7, v4.8

made key to all lower case for titile_Opt_Activity to title_opt_activity

- -1
- +1
/lams_central/web/flashxml/authoring/en_AU_dictionary.xml
- History
- Source
- Diff
/lams_central/web/.../en_AU_dictionary.xml
- -1
- +1
/lams_central/web/flashxml/authoring/en_dictionary.xml
- History
- Source
- Diff
/lams_central/web/.../en_dictionary.xml

10:56 am

psharma

More
6031c0d
changed 2 files
v4.7, v4.8

fixed spelling mistake and

- -1
- +1
/lams_central/web/flashxml/authoring/en_AU_dictionary.xml
- History
- Source
- Diff
/lams_central/web/.../en_AU_dictionary.xml
- -1
- +1
/lams_central/web/flashxml/authoring/en_dictionary.xml
- History
- Source
- Diff
/lams_central/web/.../en_dictionary.xml

10:48 am

fmalikoff

More
5aff7aa
changed 19 files
v4.7, v4.8

Call passon to update the progress bar on tool pages, optional activities and the completed screen.

Should also cope with the user partially doing an optional activity, continuing on in the design, then coming back later to the optional activity to do more, and then going back to where they were up to in the sequence before jumping back.

- binary
/lams_build/lib/lams/lams-learning.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams-learning.jar
- -9
- +9
/lams_learning/conf/language/ApplicationResources.properties
- History
- Source
- Diff
/lams_learning/.../ApplicationResources.properties
- -3
- +0
/lams_learning/conf/xdoclet/struts-actions.xml
- History
- Source
- Diff
/lams_learning/conf/.../struts-actions.xml
- -28
- +56
/lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
- History
- Source
- Diff
/lams_learning/src/.../ProgressEngine.java
- -5
- +69
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
- History
- Source
- Diff
/lams_learning/src/.../ActivityAction.java
- -2
- +6
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
- History
- Source
- Diff
/lams_learning/.../ChooseActivityAction.java
- -0
- +4
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
- History
- Source
- Diff
/lams_learning/.../CompleteActivityAction.java
- -57
- +7
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
- History
- Source
- Diff
/lams_learning/.../DisplayActivityAction.java
- -0
- +3
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
- History
- Source
- Diff
/lams_learning/.../DisplayOptionsActivityAction.java
- -0
- +2
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java
- History
- Source
- Diff
/lams_learning/.../DisplayParallelActivityAction.java
- -0
- +2
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
- History
- Source
- Diff
/lams_learning/.../DisplayToolActivityAction.java
- -0
- +69
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
- History
- Source
/lams_learning/.../LessonCompleteActivityAction.java
- -1
- +4
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
- History
- Source
- Diff
/lams_learning/.../LoadToolActivityAction.java
- -48
- +1
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
- History
- Source
- Diff
/lams_learning/src/.../ActivityMapping.java
- -1
- +1
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
- History
- Source
- Diff
/lams_learning/.../ActivityMappingStrategy.java
… 4 more files in changeset.

10:39 am

psharma

More
03f9585
changed 1 file
v4.7, v4.8

removed code to used for expansion and collapse for linear representation for monitoring

- -11
- +0
/lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
- History
- Source
- Diff
/lams_central/.../CanvasOptionalActivity.as

10:37 am

psharma

More
dc8cd8c
changed 2 files
v4.7, v4.8

added 3 new entries for parallel activity title for property inspector, optional activity tile for optional activity container on canvas and dictionalry value for word "activities"

- -1
- +1
/lams_central/web/flashxml/authoring/en_AU_dictionary.xml
- History
- Source
- Diff
/lams_central/web/.../en_AU_dictionary.xml
- -1
- +1
/lams_central/web/flashxml/authoring/en_dictionary.xml
- History
- Source
- Diff
/lams_central/web/.../en_dictionary.xml

10:35 am

psharma

More
918cecb
updated 1 file
v4.7, v4.8

latest flash file after making some ui changes for parallel activity

- binary
/lams_central/src/flash/lams_authoring.fla
- History
- Source
- Diff
/lams_central/src/.../lams_authoring.fla

10:33 am

psharma

More
cf287f7
changed 2 files
v4.7, v4.8

added dictionary values for items to be internationalised

- -2
- +5
/lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
- History
- Source
- Diff
/lams_central/.../CanvasOptionalActivity.as
- -23
- +4
/lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
- History
- Source
- Diff
/lams_central/.../CanvasParallelActivity.as

10:19 am

mseaton

More
3e5133c
changed 1 file
v4.7, v4.8

added parallel activity case

- -1
- +32
/lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
- History
- Source
- Diff
/lams_central/src/.../cv/PropertyInspector.as

10:00 am

mseaton

More
a8747cc
changed 2 files
v4.7, v4.8

added pi_parallel_activity item

- -1
- +1
/lams_central/web/flashxml/authoring/en_AU_dictionary.xml
- History
- Source
- Diff
/lams_central/web/.../en_AU_dictionary.xml
- -1
- +1
/lams_central/web/flashxml/authoring/en_dictionary.xml
- History
- Source
- Diff
/lams_central/web/.../en_dictionary.xml

12:43 am

ozgurd

More
1dff746
changed 7 files
v4.7, v4.8

Fix to LDEV-266

- -0
- +11
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McLearningAction.java
- -1
- +26
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McLearningForm.java
- -0
- +3
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
- History
- Source
- Diff
/lams_tool_lamc/.../McLearningStarterAction.java
- -0
- +10
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McStarterAction.java
- -9
- +6
/lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
- History
- Source
- Diff
/lams_tool_lamc/.../IndividualLearnerResults.jsp
- -3
- +6
/lams_tool_lamc/web/learning/ResultsSummary.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../ResultsSummary.jsp
- -7
- +5
/lams_tool_lamc/web/learning/ViewAnswers.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../ViewAnswers.jsp

5:54 pm

asukkar

More
b870f1d
changed 12 files
v4.7, v4.8

Changed the nickname used to join the jabber chat group from the users login name to the user full name. The nickname is constructed by taking the users first name and last name followed by an optional number to ensure the nickname is unique for each session.