Activity lams-github/

Clean up grouping code so that the shared code is in lams.jar, and making it so that learner can't trigger the chosen grouping. I18N the grouping screen and added a wait page for the chosen grouping.

- 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/learningdesign/Activity.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../Activity.hbm.xml
- -1
- +4
/lams_common/conf/language/ApplicationResources.properties
- History
- Source
- Diff
/lams_common/.../ApplicationResources.properties
- -1
- +3
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java
- History
- Source
- Diff
/lams_common/src/.../ChosenGrouper.java
- -0
- +53
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupComparator.java
- History
- Source
/lams_common/src/.../GroupComparator.java
- -7
- +36
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
- History
- Source
- Diff
/lams_common/src/.../Grouper.java
- -39
- +9
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
- History
- Source
- Diff
/lams_common/src/.../Grouping.java
- -17
- +24
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
- History
- Source
- Diff
/lams_common/src/.../RandomGrouper.java
- -1
- +4
/lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
- History
- Source
- Diff
/lams_common/.../lessonApplicationContext.xml
- -0
- +22
/lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
- History
- Source
- Diff
/lams_common/src/.../ILessonService.java
- -6
- +90
/lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
- History
- Source
- Diff
/lams_common/src/.../LessonService.java
- -0
- +73
/lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonServiceException.java
- History
- Source
/lams_common/src/.../LessonServiceException.java
- -1
- +1
/lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestChosenGrouper.java
- History
- Source
- Diff
/lams_common/test/.../TestChosenGrouper.java
- -13
- +13
/lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestRandomGrouper.java
- History
- Source
- Diff
/lams_common/test/.../TestRandomGrouper.java
- -1
- +1
/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java
- History
- Source
- Diff
/lams_common/test/.../TestGroupingDAO.java

4:03 pm

ozgurd

More
f536379
changed 14 files
v4.7, v4.8

Jsp formating updates Export portfolio skeleton implementation

- -0
- +2
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McAppConstants.java
- -0
- +149
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java
- History
- Source
/lams_tool_lamc/src/.../web/ExportServlet.java
- -66
- +0
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportServlet.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McExportServlet.java
- -2
- +2
/lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp
- History
- Source
- Diff
/lams_tool_lamc/.../AuthoringMaincontent.jsp
- -0
- +35
/lams_tool_lamc/web/export/ExportContent.jsp
- History
- Source
/lams_tool_lamc/web/export/ExportContent.jsp
- -0
- +65
/lams_tool_lamc/web/export/exportportfolio.jsp
- History
- Source
/lams_tool_lamc/web/export/exportportfolio.jsp
- -3
- +1
/lams_tool_lamc/web/learning/AnswersContent.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../AnswersContent.jsp
- -3
- +1
/lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
- History
- Source
- Diff
/lams_tool_lamc/.../IndividualLearnerResults.jsp
- -5
- +2
/lams_tool_lamc/web/learning/Preview.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/learning/Preview.jsp
- -4
- +1
/lams_tool_lamc/web/learning/RedoQuestions.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../RedoQuestions.jsp
- -4
- +1
/lams_tool_lamc/web/learning/ResultsSummary.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../ResultsSummary.jsp
- -4
- +1
/lams_tool_lamc/web/learning/ViewAnswers.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../ViewAnswers.jsp
- -0
- +1
/lams_tool_lamc/web/learning/learningHeader.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../learningHeader.jsp
- -4
- +1
/lams_tool_vote/web/authoring/AuthoringMaincontent.jsp
- History
- Source
- Diff
/lams_tool_vote/.../AuthoringMaincontent.jsp

3:57 pm

fmalikoff

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

Fixed more grouping/gate issues in authoring - if the user changed the type of grouping or gate after saving, the gate/grouping type was not updated. Now a new record is created with the new type.

- -17
- +35
/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
- History
- Source
- Diff
/lams_central/src/.../ObjectExtractor.java

3:56 pm

fmalikoff

More
4f63e22
changed 11 files
v4.7, v4.8

Clean up grouping code so that the shared code is in lams.jar, and making it so that learner can't trigger the chosen grouping. I18N the grouping screen and added a wait page for the chosen grouping.