Activity lams-github/

7:43 am

fmalikoff

More
e023857
changed 13 files
v4.7, v4.8

LDEV-1051 and LDEV-1198: Fixed the break out of frames logic for parallels at the end of a design and inside an optional activity.

- binary
/lams_build/lib/lams/lams-learning.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams-learning.jar
- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -1
- +1
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../LearnerProgress.hbm.xml
- -3
- +10
/lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java
- History
- Source
- Diff
/lams_common/src/.../LearnerProgress.java
- -7
- +20
/lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
- History
- Source
- Diff
/lams_learning/src/.../ProgressEngine.java
- -1
- +3
/lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
- History
- Source
- Diff
/lams_learning/.../ICoreLearnerService.java
- -9
- +6
/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
/lams_learning/src/.../LearnerService.java
- -0
- +1
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
- History
- Source
- Diff
/lams_learning/.../DisplayOptionsActivityAction.java
- -1
- +8
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java
- History
- Source
- Diff
/lams_learning/.../OptionsActivityForm.java
- -15
- +22
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
- History
- Source
- Diff
/lams_learning/src/.../ActivityMapping.java
- -15
- +28
/lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
- History
- Source
- Diff
/lams_learning/.../TestLearnerService.java
- -1
- +2
/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java
- History
- Source
- Diff
/lams_learning/.../TestDisplayActivityAction.java
- -0
- +2
/lams_learning/web/optionsActivity.jsp
- History
- Source
- Diff
/lams_learning/web/optionsActivity.jsp

7:41 am

fmalikoff

More
6f022e9
changed 7 files
v4.7, v4.8

LDEV-1051 and LDEV-1198: Fixed the break out of frames logic for parallels at the end of a design and inside an optional activity. Changing flag for waiting from boolean to a numeric flag.

- -3
- +3
/lams_common/db/model/lams_11.clay
- History
- Source
- Diff
/lams_common/db/model/lams_11.clay
- -1
- +1
/lams_common/db/sql/create_lams_11_tables.sql
- History
- Source
- Diff
/lams_common/db/.../create_lams_11_tables.sql
- -2
- +2
/lams_common/db/sql/insert_lams_unix_config_data.sql
- History
- Source
- Diff
/lams_common/.../insert_lams_unix_config_data.sql
- -2
- +2
/lams_common/db/sql/insert_rams_unix_config_data.sql
- History
- Source
- Diff
/lams_common/.../insert_rams_unix_config_data.sql
- -0
- +872
/lams_common/db/sql/lams_11.sql
- History
- Source
- Diff
/lams_common/db/sql/lams_11.sql
- -0
- +48
/lams_common/db/sql/lams_learning_design.sql
- History
- Source
/lams_common/db/sql/lams_learning_design.sql
- -0
- +7
/lams_common/db/sql/updatescripts/alter_203_learner_progress.sql
- History
- Source
/lams_common/db/.../alter_203_learner_progress.sql

3:07 pm

fmalikoff

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

LDEV-1222: Notebook window wasn't popping up in a new window

- -1
- +1
/lams_learning/web/exportPortfolio/main.jsp
- History
- Source
- Diff
/lams_learning/web/.../main.jsp

7:53 am

LDEV-1227: Export failing when the content directory under lams-www/secure had an images directory but no files in the images directory. Wasn't detected the directory as empty (as there was an images directory) but the zip failed as there were no files in the zip file. Now the check for an empty directory checks for empty subdirectories as well.

- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
- History
- Source
- Diff
/lams_common/.../ExportToolContentService.java
- -6
- +27
/lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
- History
- Source
- Diff
/lams_common/src/java/.../util/FileUtil.java

2:04 pm

fmalikoff

More
298d075
changed 1 file
v4.7, v4.8

Error message of new exception didn't actually include the message of the causing exception.

- -4
- +4
/lams_common/src/java/org/lamsfoundation/lams/util/zipfile/ZipFileUtil.java
- History
- Source
- Diff
/lams_common/src/.../zipfile/ZipFileUtil.java

11:04 am

jliew

More
5df048f
changed 1 file
v4.7, v4.8

LDEV-1155 filename parameter in response parameter needs to be enclosed by quotes otherwise firefox truncates the filename when it encounters the first space