Activity lams/lams

Fixed issues in authoring - was trying to look up grouping by UUID and that won't work for more than one design with grouping (as the UUIDs may be duplicated). Modified authoring to get all the existing groupings via the grouping activities.

Changed to make learner service changes to stop a hibernate lazy initialisation exception when grouping has just been run. Also reduced the amount of data needed to be cached in the session - only the lesson id is needed not the complete lesson.

- -8
- +10
./src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupingDAO.java
- History
- Source
- Diff
./src/java/org/.../dao/IGroupingDAO.java
- -15
- +22
./src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java
- History
- Source
- Diff
./src/java/org/.../hibernate/GroupingDAO.java
- -6
- +3
./src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
- History
- Source
- Diff
./src/java/.../dao/ILearnerProgressDAO.java
- -7
- +5
./src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
- History
- Source
- Diff
./src/java/.../LearnerProgressDAO.java
- -7
- +7
./test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java
- History
- Source
- Diff
./test/java/.../TestLearnerProgressDAO.java
… 2 more files in changeset.

2:55 pm

steven

More
MAIN:steven:20060601065502
changed 5 files
MAIN

Working on import tool content.

- -0
- +1
./src/java/org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
./src/java/org/.../lams/commonContext.xml
- -3
- +14
./src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
- History
- Source
- Diff
./src/java/.../dto/AuthoringActivityDTO.java
- -66
- +229
./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
- History
- Source
- Diff
./src/java/.../ExportToolContentService.java
- -2
- +7
./src/java/org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java
- History
- Source
- Diff
./src/java/.../IExportToolContentService.java
- -2
- +2
./src/java/org/lamsfoundation/lams/tool/ToolContentManager.java
- History
- Source
- Diff
./src/java/.../tool/ToolContentManager.java

1:01 pm

mseaton

More
MAIN:mseaton:20060601050147
updated 1 file
MAIN

added forceNodeOpen, to open root Workspace folder in wizard

- binary
./src/flash/org/lamsfoundation/lams/common/ws/WorkspaceController.as
- History
- Source
- Diff
./src/flash/org/.../ws/WorkspaceController.as

1:01 pm

mseaton

More
MAIN:mseaton:20060601050101
updated 1 file
MAIN

updated getValue method to use optional parameters to substitute variables in the dictionary item

- binary
./src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as
- History
- Source
- Diff
./src/flash/org/.../common/dict/Dictionary.as

12:49 pm

fmalikoff

More
MAIN:fmalikoff:20060601044933
changed 3 files
MAIN

Fixed Optional Activities so that there are methods that will return not-null min and max value - makes the optional activity display code easier. The client should ensure that the values aren't null but they are allowed to be null in the db so we have to cater for that.

- -1
- +18
./src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
- History
- Source
- Diff
./src/java/.../OptionsActivity.java
- -2
- +3
./src/java/org/lamsfoundation/lams/learningdesign/strategy/OptionsActivityStrategy.java
- History
- Source
- Diff
./src/java/.../OptionsActivityStrategy.java
… 1 more file in changeset.

9:39 am

fyang

More
MAIN:fyang:20060601013912
changed 2 files
MAIN

added localeLanguage and lacaleCountry properties

- -0
- +24
./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
- History
- Source
- Diff
./conf/hibernate/.../Organisation.hbm.xml
- -1
- +33
./src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
- History
- Source
- Diff
./src/java/.../Organisation.java

9:21 am

fyang

More
MAIN:fyang:20060601012148
changed 1 file
MAIN

added organisationState property mapping

- -0
- +14
./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
- History
- Source
- Diff
./conf/hibernate/.../Organisation.hbm.xml

9:21 am

fyang

More
MAIN:fyang:20060601012113
added 1 file
MAIN

hibernate mapping file for lams_organisation_state table

- -0
- +83
./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationState.hbm.xml
- History
- Source
./conf/hibernate/.../OrganisationState.hbm.xml

9:20 am

fyang

More
MAIN:fyang:20060601012037
changed 1 file
MAIN

added OrganisationState.hbm.xml to mappingResources of hibernate session factory

- -0
- +1
./src/java/org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
./src/java/org/.../lams/commonContext.xml

9:16 am

fyang

More
MAIN:fyang:20060601011635
changed 1 file
MAIN

added organisationState member

- -2
- +18
./src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
- History
- Source
- Diff
./src/java/.../Organisation.java

9:16 am

fyang

More
MAIN:fyang:20060601011614
changed 1 file
MAIN

remove unnecessary package names in front of class names, which were generated by middlegen hbm2java task

- -7
- +7
./src/java/org/lamsfoundation/lams/usermanagement/RolePrivilege.java
- History
- Source
- Diff
./src/java/.../RolePrivilege.java

9:15 am

fyang

More
MAIN:fyang:20060601011505
added 1 file
MAIN

domain object for lams_organisation_state table

- -0
- +94
./src/java/org/lamsfoundation/lams/usermanagement/OrganisationState.java
- History
- Source
./src/java/.../OrganisationState.java

8:35 pm

fmalikoff

More
MAIN:fmalikoff:20060531123556
changed 8 files
MAIN

Fixed bugs in getCountActiveLearnerByLesson, changed calls to update lesson to use the lessonId rather than the lesson. Change allowed us to reduce the amount cached in the context.

- -8
- +0
./conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
- History
- Source
- Diff
./conf/hibernate/.../lesson/Lesson.hbm.xml
- -3
- +4
./src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
- History
- Source
- Diff
./src/java/.../dao/ILearnerProgressDAO.java
- -5
- +5
./src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
- History
- Source
- Diff
./src/java/.../LearnerProgressDAO.java
- -4
- +7
./src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
- History
- Source
- Diff
./src/java/org/.../hibernate/LessonDAO.java
- -1
- +6
./src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
- History
- Source
- Diff
./src/java/org/.../service/ILessonService.java
- -2
- +10
./src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
- History
- Source
- Diff
./src/java/org/.../service/LessonService.java
- -7
- +7
./test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java
- History
- Source
- Diff
./test/java/.../TestLearnerProgressDAO.java
… 1 more file in changeset.

8:33 pm

fmalikoff

More
MAIN:fmalikoff:20060531123311
changed 2 files
MAIN

Enforce uniqueness of lesson/user id relationship in learner progress table. Ensures that the query based on lesson, user id will only return one row.