Activity lams/

8:20 pm

fmalikoff

More
MAIN:fmalikoff:20101101122054
changed 30 files
MAIN

Merging changes from 2.3 release branch for LDEV-2524.

- -1
- +1
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/conf/.../qa/QaContent.hbm.xml
- -0
- +10
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/conf/.../QaQueContent.hbm.xml
- -0
- +1
/lams_tool_laqa/db/sql/create_lams_tool_qa.sql
- History
- Source
- Diff
/lams_tool_laqa/.../create_lams_tool_qa.sql
- -0
- +9
/lams_tool_laqa/db/sql/updatescripts/updateTo20101022.sql
- History
- Source
- Diff
/lams_tool_laqa/db/.../updateTo20101022.sql
- -22
- +5
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java
- History
- Source
- Diff
/lams_tool_laqa/.../GeneralLearnerFlowDTO.java
- -16
- +1
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralMonitoringDTO.java
- History
- Source
- Diff
/lams_tool_laqa/.../GeneralMonitoringDTO.java
- -2
- +2
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaAppConstants.java
- -3
- +3
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaCondition.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../qa/QaCondition.java
- -2
- +2
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConditionDTO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaConditionDTO.java
- -18
- +2
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java
- History
- Source
- Diff
/lams_tool_laqa/.../QaGeneralAuthoringDTO.java
- -27
- +23
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../qa/QaQueContent.java
- -2
- +33
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestionContentDTO.java
- History
- Source
- Diff
/lams_tool_laqa/.../QaQuestionContentDTO.java
- -12
- +1
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
- History
- Source
- Diff
/lams_tool_laqa/src/java/.../qa/QaUtils.java
- -103
- +44
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../AuthoringUtil.java
- -12
- +7
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../web/LearningUtil.java
… 15 more files in changeset.

8:18 pm

fmalikoff

More
MAIN:fmalikoff:20101101121817
changed 2 files
MAIN

Merging changes from 2.3 release branch. Working on bugs LDEV-2524, LDEV-2578, LDEV-2581

- -1
- +1
/lams_tool_laqa/build.properties
- History
- Source
- Diff
/lams_tool_laqa/build.properties
- -33
- +97
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaLearningAction.java

7:01 pm

fmalikoff

More
lams2_3_release:fmalikoff:20101101110122
changed 2 files
lams2_3_release

LDEV-2524 Implementing the compulsory question option.

- -3
- +4
/lams_tool_laqa/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_laqa/.../ApplicationResources.properties
- -3
- +4
/lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_laqa/.../ApplicationResources_en_AU.properties

6:44 pm

fmalikoff

More
lams2_3_release:fmalikoff:20101101104407
changed 1 file
lams2_3_release

LDEV-2524 Implementing the compulsory question option.

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

- -73
- +28
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../web/QaAction.java

6:43 pm

fmalikoff

More
lams2_3_release:fmalikoff:20101101104348
changed 1 file
lams2_3_release

LDEV-2524 Implementing the compulsory question option. Make the question object more complex so we don't have a new map for every field added, and ensure all the necessary data is set up when we redisplay a screen with the error message.

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

LDEV-2581 Make sure the rich text field setting is honoured for more than just the first screen!

- -33
- +97
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaLearningAction.java

6:39 pm

fmalikoff

More
lams2_3_release:fmalikoff:20101101103918
changed 2 files
lams2_3_release

LDEV-2524 Implementing the compulsory question option. Made the question map contain a complex object rather than a single string so that we didn't have to keep adding maps every time we added more data for each question.

- -12
- +7
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../web/LearningUtil.java
- -4
- +10
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
- History
- Source
- Diff
/lams_tool_laqa/.../QaLearningStarterAction.java

6:33 pm

fmalikoff

More
lams2_3_release:fmalikoff:20101101103353
changed 5 files
lams2_3_release

LDEV-2524 Implementing the compulsory question option.

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

- -103
- +44
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../AuthoringUtil.java
- -17
- +11
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaAuthoringForm.java
- -33
- +22
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
- History
- Source
- Diff
/lams_tool_laqa/.../QaMonitoringAction.java
- -6
- +4
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
- History
- Source
- Diff
/lams_tool_laqa/.../QaMonitoringStarterAction.java
- -42
- +13
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaStarterAction.java

6:30 pm

fmalikoff

More
lams2_3_release:fmalikoff:20101101103002
changed 1 file
lams2_3_release

LDEV-2524 Implementing the compulsory question option. Add a new required field, and removed the optional field that had never been implemented properly.

- -41
- +23
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../qa/QaQueContent.java

6:28 pm

fmalikoff

More
lams2_3_release:fmalikoff:20101101102856
changed 1 file
lams2_3_release

LDEV-2524 Implementing the compulsory question option. Removed excess debugging to make debug level run faster.

- -12
- +1
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
- History
- Source
- Diff
/lams_tool_laqa/src/java/.../qa/QaUtils.java

6:27 pm

fmalikoff

More
lams2_3_release:fmalikoff:20101101102738
changed 1 file
lams2_3_release

LDEV-2524, LDEV-2578 and LDEV-2581. Needed new database field for LDEV-2524

- -1
- +1
/lams_tool_laqa/build.properties
- History
- Source
- Diff
/lams_tool_laqa/build.properties

6:26 pm

fmalikoff

More
lams2_3_release:fmalikoff:20101101102612
changed 1 file
lams2_3_release

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

- -1
- +1
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/conf/.../qa/QaContent.hbm.xml

6:24 pm

fmalikoff

More
lams2_3_release:fmalikoff:20101101102452
changed 9 files
lams2_3_release

LDEV-2524 Implementing the compulsory question option.

- -0
- +10
/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
- History
- Source
- Diff
/lams_tool_laqa/conf/.../QaQueContent.hbm.xml
- -0
- +1
/lams_tool_laqa/db/sql/create_lams_tool_qa.sql
- History
- Source
- Diff
/lams_tool_laqa/.../create_lams_tool_qa.sql
- -0
- +9
/lams_tool_laqa/db/sql/updatescripts/updateTo20101022.sql
- History
- Source
- Diff
/lams_tool_laqa/db/.../updateTo20101022.sql
- -16
- +1
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralMonitoringDTO.java
- History
- Source
- Diff
/lams_tool_laqa/.../GeneralMonitoringDTO.java
- -2
- +1
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaAppConstants.java
- -2
- +2
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConditionDTO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaConditionDTO.java
- -18
- +2
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java
- History
- Source
- Diff
/lams_tool_laqa/.../QaGeneralAuthoringDTO.java
- -2
- +33
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestionContentDTO.java
- History
- Source
- Diff
/lams_tool_laqa/.../QaQuestionContentDTO.java
- -2
- +2
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java
- History
- Source
- Diff
/lams_tool_laqa/.../QaPedagogicalPlannerAction.java

6:24 pm

fmalikoff

More
MAIN:fmalikoff:20101101102452
deleted 1 file
MAIN

file updateTo20101022.sql was initially added on branch lams2_3_release.

- -0
- +0
/lams_tool_laqa/db/sql/updatescripts/updateTo20101022.sql
- History
- Source
/lams_tool_laqa/db/.../updateTo20101022.sql

6:24 pm

fmalikoff

More
lams2_3_release:fmalikoff:20101101102409
changed 4 files
lams2_3_release

LDEV-2524 Implementing the compulsory question option. Made the question map contain a complex object rather than a single string so that we didn't have to keep adding maps every time we added more data for each question.