lams / lams_common / src

java

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 22
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 81,741
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 02 Jun 2006
4:09 pm

fmalikoff

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.

Options
    • -2
    • +4
    ./org/lamsfoundation/lams/learningdesign/ChosenGrouper.java
    • -0
    • +53
    ./org/lamsfoundation/lams/learningdesign/GroupComparator.java
    • -8
    • +37
    ./org/lamsfoundation/lams/learningdesign/Grouper.java
    • -40
    • +10
    ./org/lamsfoundation/lams/learningdesign/Grouping.java
    • -18
    • +25
    ./org/lamsfoundation/lams/learningdesign/RandomGrouper.java
    • -1
    • +4
    ./org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
    • -1
    • +23
    ./org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -7
    • +91
    ./org/lamsfoundation/lams/lesson/service/LessonService.java
    • -0
    • +73
    ./org/lamsfoundation/lams/lesson/service/LessonServiceException.java
  10. … 7 more files in changeset.
3:29 pm

steven

Import tool content works!!! in rsrc and submit tool with sigle file and pacakge testing!!!

Options
    • -1
    • +6
    ./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
2:57 pm

fyang

extends BaseDAO and implements IBaseDAO to simplify the DAOs

Options
    • -29
    • +3
    ./org/lamsfoundation/lams/usermanagement/dao/IAuthenticationMethodDAO.java
    • -29
    • +3
    ./org/lamsfoundation/lams/usermanagement/dao/IAuthenticationMethodTypeDAO.java
    • -29
    • +3
    ./org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java
    • -28
    • +2
    ./org/lamsfoundation/lams/usermanagement/dao/IOrganisationStateDAO.java
    • -29
    • +3
    ./org/lamsfoundation/lams/usermanagement/dao/IOrganisationTypeDAO.java
    • -29
    • +3
    ./org/lamsfoundation/lams/usermanagement/dao/IRoleDAO.java
    • -29
    • +3
    ./org/lamsfoundation/lams/usermanagement/dao/IUserDAO.java
    • -29
    • +3
    ./org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationDAO.java
    • -29
    • +4
    ./org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationRoleDAO.java
    • -33
    • +4
    ./org/lamsfoundation/lams/usermanagement/dao/hibernate/AuthenticationMethodDAO.java
    • -32
    • +4
    ./org/lamsfoundation/lams/usermanagement/dao/hibernate/AuthenticationMethodTypeDAO.java
    • -26
    • +5
    ./org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java
    • -34
    • +4
    ./org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationStateDAO.java
    • -31
    • +3
    ./org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAO.java
    • -33
    • +5
    ./org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java
  16. … 4 more files in changeset.
2:03 pm

fyang

added OrganisationStateId constants

Options
    • -0
    • +5
    ./org/lamsfoundation/lams/usermanagement/OrganisationState.java
2:03 pm

fyang

added getOrganisationTypeById method

Options
    • -1
    • +10
    ./org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +5
    ./org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
1:51 pm

steven

Update import tool content interface.

Options
    • -129
    • +132
    ./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/ToolContentManager.java
  3. … 3 more files in changeset.
12:09 pm

fyang

Added code field and its getter and setter which was missing

Options
    • -1
    • +18
    ./org/lamsfoundation/lams/usermanagement/Organisation.java
12:09 pm

fyang

Added organisationState related methods

Options
    • -1
    • +37
    ./org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +20
    ./org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
12:08 pm

fyang

OrganisationState DAO hibernate implementation

Options
    • -0
    • +117
    ./org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationStateDAO.java
12:08 pm

fyang

OrganisationState DAO Interface

Options
    • -0
    • +102
    ./org/lamsfoundation/lams/usermanagement/dao/IOrganisationStateDAO.java
12:07 pm

fyang

added organisationStateDAO to userManagementService

Options
    • -0
    • +5
    ./org/lamsfoundation/lams/commonContext.xml
7:00 am

fmalikoff

Random grouping now working.

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.

Options
    • -8
    • +10
    ./org/lamsfoundation/lams/learningdesign/dao/IGroupingDAO.java
    • -15
    • +22
    ./org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java
    • -6
    • +3
    ./org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -7
    • +5
    ./org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
  5. … 3 more files in changeset.
Thursday 01 Jun 2006
2:55 pm

steven

Working on import tool content.

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/commonContext.xml
    • -3
    • +14
    ./org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -66
    • +229
    ./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -2
    • +7
    ./org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/ToolContentManager.java
12:49 pm

fmalikoff

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.

Options
    • -1
    • +18
    ./org/lamsfoundation/lams/learningdesign/OptionsActivity.java
    • -2
    • +3
    ./org/lamsfoundation/lams/learningdesign/strategy/OptionsActivityStrategy.java
  3. … 1 more file in changeset.
9:39 am

fyang

added localeLanguage and lacaleCountry properties

Options
    • -1
    • +33
    ./org/lamsfoundation/lams/usermanagement/Organisation.java
  2. … 1 more file in changeset.
9:20 am

fyang

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

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/commonContext.xml
9:16 am

fyang

added organisationState member

Options
    • -2
    • +18
    ./org/lamsfoundation/lams/usermanagement/Organisation.java
9:16 am

fyang

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

Options
    • -7
    • +7
    ./org/lamsfoundation/lams/usermanagement/RolePrivilege.java
9:15 am

fyang

domain object for lams_organisation_state table

Options
    • -0
    • +94
    ./org/lamsfoundation/lams/usermanagement/OrganisationState.java
Wednesday 31 May 2006
8:35 pm

fmalikoff

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.

Options
    • -3
    • +4
    ./org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -5
    • +5
    ./org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -4
    • +7
    ./org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -1
    • +6
    ./org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -2
    • +10
    ./org/lamsfoundation/lams/lesson/service/LessonService.java
  6. … 3 more files in changeset.
3:10 pm

steven

Working on import tool content.

Options
    • -10
    • +351
    ./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -1
    • +2
    ./org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java
    • -0
    • +54
    ./org/lamsfoundation/lams/learningdesign/service/ImportToolContentException.java
  4. … 2 more files in changeset.
3:09 pm

steven

Add more dao in export tool content service.

Options
    • -0
    • +5
    ./org/lamsfoundation/lams/commonContext.xml
1:19 pm

fyang

added Privilege.hbm.xml and RolePrivilege.hbm.xml to the mappingResources for hibernate session factory

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/commonContext.xml
1:18 pm

fyang

hibernate mapping files for privilege, role and privileges

Options
    • -0
    • +114
    ./org/lamsfoundation/lams/usermanagement/Privilege.java
    • -3
    • +26
    ./org/lamsfoundation/lams/usermanagement/Role.java
    • -0
    • +82
    ./org/lamsfoundation/lams/usermanagement/RolePrivilege.java
  4. … 3 more files in changeset.
12:32 pm

steven

Remove getLearningDesign() method.

Options
    • -53
    • +1
    ./org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
Tuesday 30 May 2006
3:26 pm

fmalikoff

Modifying the getOrganisationForUserByRole calls to return just the course and class when specified, rather than the whole organisation tree.

Replaced getActiveLessons with getLesson, to suit the change from listing all the lessons in the learner client to just working with a single lesson.

Moved the logic to cache the lesson learners from learning into the lams.jar (in the LessonService).

Replaced getAllLessonsWDDX, getLessonData with getLessonDetails. Suits the change from listing all the lessons in the monitoring client to just working with a single lesson.

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/learningdesign/strategy/GateActivityStrategy.java
    • -18
    • +13
    ./org/lamsfoundation/lams/learningdesign/strategy/SynchGateActivityStrategy.java
    • -10
    • +11
    ./org/lamsfoundation/lams/lesson/Lesson.java
    • -0
    • +18
    ./org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
    • -1
    • +9
    ./org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -1
    • +18
    ./org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -17
    • +16
    ./org/lamsfoundation/lams/lesson/dto/LessonDTO.java
    • -28
    • +33
    ./org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java
    • -0
    • +85
    ./org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -0
    • +152
    ./org/lamsfoundation/lams/lesson/service/LessonService.java
    • -8
    • +15
    ./org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -15
    • +24
    ./org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  13. … 2 more files in changeset.
3:12 pm

fyang

Fix a bug in OrganisationDTO(Organisation organisation) constructor.

this.parentID = organisation.getParentOrganisation().getOrganisationId() will throw a NullPointerException at runtime if the organisation is the top level organisation like "Root"

Now this line of code is modified like this:

this.parentID = (organsiation.getParentOrganisation()==null) ? new Integer(-1) : organisation.getParentOrganisation().getOrganisationId();

So in an organisationDTO, if parentID is -1, it means the organisation is the top level organisation which has no parent.

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java
2:11 pm

steven

Add import tool content method

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/commonContext.xml
    • -2
    • +54
    ./org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -0
    • +48
    ./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +2
    ./org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java
  5. … 5 more files in changeset.
12:18 pm

steven

Add fileUtil method and package export success.

Options
    • -11
    • +5
    ./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +22
    ./org/lamsfoundation/lams/util/FileUtil.java
Monday 29 May 2006
3:22 pm

steven

Update ToolContentManager API

Export toolcontent service.

Options
    • -1
    • +2
    ./org/lamsfoundation/lams/commonContext.xml
    • -15
    • +237
    ./org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -3
    • +44
    ./org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/ToolContentManager.java
    • -0
    • +44
    ./org/lamsfoundation/lams/util/FileUtil.java
  6. … 1 more file in changeset.