lams / lams_common

src

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 25
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 19 Sep 2008
1:47 pm

dcarlier

LDEV-1909 -Competence editor backend model

Options
    • -0
    • +10
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +70
    ./java/org/lamsfoundation/lams/learningdesign/Competence.java
    • -0
    • +64
    ./java/org/lamsfoundation/lams/learningdesign/CompetenceMapping.java
    • -2
    • +15
    ./java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
    • -4
    • +37
    ./java/org/lamsfoundation/lams/learningdesign/ToolActivity.java
    • -0
    • +16
    ./java/org/lamsfoundation/lams/learningdesign/dao/ICompetenceDAO.java
    • -0
    • +16
    ./java/org/lamsfoundation/lams/learningdesign/dao/ICompetenceMappingDAO.java
    • -0
    • +80
    ./java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java
    • -0
    • +45
    ./java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java
    • -347
    • +235
    ./java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -0
    • +53
    ./java/org/lamsfoundation/lams/learningdesign/dto/CompetenceDTO.java
    • -0
    • +45
    ./java/org/lamsfoundation/lams/learningdesign/dto/CompetenceMappingDTO.java
    • -2
    • +31
    ./java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -108
    • +115
    ./java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
  16. … 3 more files in changeset.
9:43 am

Marcin Cieslak

LDEV-1893: Quartz job for resending messages is not rescheduled anymore.

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/events/EventNotificationService.java
9:42 am

Marcin Cieslak

LDEV-1893: Quartz job for resending messages is not rescheduled anymore.

Options
    • -9
    • +18
    ./java/org/lamsfoundation/lams/events/EventNotificationService.java
9:23 am

Marcin Cieslak

LDEV-1581: Fixing a small bug in DTO.

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java
Thursday 18 Sep 2008
10:42 am

Marcin Cieslak

LDEV-1581: Addin final version of logic.

Options
    • -7
    • +7
    ./java/org/lamsfoundation/lams/learningdesign/LearnerChoiceGrouping.java
    • -8
    • +10
    ./java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  4. … 7 more files in changeset.
10:30 am

jliew

LDEV-1910 hibernate loses branch_activity_id value when association is uni-directional, make it bi-directional. Putting link in the top level Activity class rather than BranchingActivity because of new work for LDEV-1299 that will allow more types of Activities to be mapped to branch_activity_id in lams_branching_activity_entry

Options
    • -2
    • +23
    ./java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -3
    • +4
    ./java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java
    • -3
    • +4
    ./java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java
  16. … 5 more files in changeset.
Wednesday 17 Sep 2008
3:08 pm

lfoxton

LDEV-1897 - Use pretty print name for workspace folders

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -2
    • +23
    ./java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -1
    • +8
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +23
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  5. … 6 more files in changeset.
9:08 am

Marcin Cieslak

LDEV-1893: In Event Notification Service persistent classes - made zero-argument constructors public for Hibernate purposes.

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/events/Event.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/events/Subscription.java
  3. … 1 more file in changeset.
Tuesday 16 Sep 2008
11:18 am

Marcin Cieslak

LDEV-1299: Added some logic for the new "condition gate" that allows learners to pass depending on condition satisfaction.

Options
    • -380
    • +352
    ./java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -66
    • +61
    ./java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java
    • -159
    • +167
    ./java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
    • -0
    • +144
    ./java/org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java
    • -13
    • +13
    ./java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -72
    • +73
    ./java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -231
    • +402
    ./java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -412
    • +473
    ./java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
    • -1
    • +15
    ./java/org/lamsfoundation/lams/learningdesign/dto/ValidationErrorDTO.java
    • -2
    • +10
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +63
    ./java/org/lamsfoundation/lams/learningdesign/strategy/ConditionGateActivityStrategy.java
    • -4
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/strategy/GateActivityStrategy.java
    • -295
    • +275
    ./java/org/lamsfoundation/lams/tool/SystemTool.java
  14. … 24 more files in changeset.
Saturday 13 Sep 2008
10:11 am

Marcin Cieslak

LDEV-1896: Extended permission gate. Teacher can now allow a single learner to pass the gate.

Options
    • -189
    • +179
    ./java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -0
    • +43
    ./java/org/lamsfoundation/lams/learningdesign/GateUser.java
    • -65
    • +67
    ./java/org/lamsfoundation/lams/learningdesign/strategy/GateActivityStrategy.java
  4. … 13 more files in changeset.
Thursday 11 Sep 2008
2:24 pm

lfoxton

LDEV-1908 If the requestSrc and the notifyCloseURL are not included in the LoginRequest calls for integrations, then tool adapter tools do not appear

- Fixed

Options
    • -2
    • +10
    ./java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
10:23 am

Marcin Cieslak

LDEV-1581: Added most of the logic for creating/managing learner's choice grouping.

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/Grouping.java
    • -92
    • +114
    ./java/org/lamsfoundation/lams/learningdesign/LearnerChoiceGrouper.java
    • -4
    • +39
    ./java/org/lamsfoundation/lams/learningdesign/LearnerChoiceGrouping.java
    • -34
    • +40
    ./java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java
    • -41
    • +88
    ./java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java
    • -81
    • +89
    ./java/org/lamsfoundation/lams/learningdesign/dto/ValidationErrorDTO.java
    • -808
    • +981
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -201
    • +208
    ./java/org/lamsfoundation/lams/learningdesign/service/LearningDesignValidator.java
    • -150
    • +158
    ./java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -451
    • +482
    ./java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -113
    • +109
    ./java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
  12. … 126 more files in changeset.
Wednesday 03 Sep 2008
3:19 pm

Marcin Cieslak

LDEV-1581: Added new grouping classes (unfinished yet).

Options
    • -0
    • +160
    ./java/org/lamsfoundation/lams/learningdesign/LearnerChoiceGrouper.java
    • -0
    • +65
    ./java/org/lamsfoundation/lams/learningdesign/LearnerChoiceGrouping.java
3:09 pm

Marcin Cieslak

LDEV-1581: Added constants that recognise the new grouping type.

Options
    • -285
    • +289
    ./java/org/lamsfoundation/lams/learningdesign/Grouping.java
10:40 am

jliew

LDEV-1890 get lessons by organisation id as well as original learning design id

Options
    • -2
    • +3
    ./java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -4
    • +6
    ./java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -2
    • +3
    ./java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/lesson/service/LessonService.java
  5. … 1 more file in changeset.
Monday 25 Aug 2008
4:15 pm

Marcin Cieslak

Added event notification service.

Options
    • -0
    • +49
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +83
    ./java/org/lamsfoundation/lams/events/AbstractDeliveryMethod.java
    • -0
    • +102
    ./java/org/lamsfoundation/lams/events/DeliveryMethodMail.java
    • -0
    • +474
    ./java/org/lamsfoundation/lams/events/Event.java
    • -0
    • +616
    ./java/org/lamsfoundation/lams/events/EventNotificationService.java
    • -0
    • +225
    ./java/org/lamsfoundation/lams/events/IEventNotificationService.java
    • -0
    • +72
    ./java/org/lamsfoundation/lams/events/ResendMessagesJob.java
    • -0
    • +204
    ./java/org/lamsfoundation/lams/events/Subscription.java
    • -0
    • +27
    ./java/org/lamsfoundation/lams/events/dao/EventDAO.java
    • -0
    • +42
    ./java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java
  11. … 8 more files in changeset.
Friday 22 Aug 2008
10:25 am

lfoxton

extLmsId parameter in loginRequests is redundant, as we can just use the existing serverId parameter instead, they are equivalent

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
Friday 15 Aug 2008
12:47 pm

lfoxton

LDEV-1861 Adding customCSV

Changed the lamsCoreToolService so that it detects when it is a tool adapter tool, and then passes a customCSV param to the copyToolContnet method so the tool can copy it's content on the external server

Options
    • -3
    • +5
    ./java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -8
    • +26
    ./java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
12:45 pm

lfoxton

LDEV-1861 Adding customCSV

New type of ToolContentManager ToolAdapterContentManager, tool adapters will implement this so that customCSV will be passed to the required methods

Options
    • -0
    • +38
    ./java/org/lamsfoundation/lams/tool/ToolAdapterContentManager.java
12:44 pm

lfoxton

LDEV-1861 Adding customCSV

Adding customCSV parameter for import tool content

Options
    • -5
    • +17
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java
12:44 pm

lfoxton

LDEV-1861 Adding customCSV

Adding a method to ToolDAO so that you can retireve a tool from a tool_signature, and also update it. This is needed for tool adapter tools so they can update their extLmsId mapping

Options
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/dao/IToolDAO.java
    • -1
    • +6
    ./java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java
    • -1
    • +6
    ./java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
    • -1
    • +11
    ./java/org/lamsfoundation/lams/tool/service/LamsToolService.java
12:42 pm

lfoxton

LDEV-1861 Adding customCSV

Adding the extLmsId property to Activity and ActivityDTO so that flash can determine whether to display a external tool adapter tool or not

Options
    • -1
    • +11
    ./java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
    • -6
    • +13
    ./java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -1
    • +12
    ./java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
    • -3
    • +21
    ./java/org/lamsfoundation/lams/tool/BasicToolVO.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/tool/IToolVO.java
    • -5
    • +27
    ./java/org/lamsfoundation/lams/tool/Tool.java
    • -1
    • +4
    ./java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/web/util/AttributeNames.java
  9. … 2 more files in changeset.
Friday 04 Jul 2008
10:05 am

lfoxton

Adding configuration entry for google map key to the configuration table, included in config insert scripts and an update script

Options
    • -1
    • +3
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  2. … 6 more files in changeset.
Monday 16 Jun 2008
10:49 am

fmalikoff

LDEV-1825: When we copy a learning design, make sure any grouping details and associated mappings attached to a teacher chosen branching or a define later grouped branching are not copied. If we don't do this, we encounter problems when run a design that has been attached to a lesson. Otherwise we either throw an exception (as the grouping doesn't exist) or we use the groupings that were used in the previous lesson and they may not be wanted.

Options
    • -1
    • +9
    ./java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -2
    • +11
    ./java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
  3. … 1 more file in changeset.
Sunday 08 Jun 2008
1:20 pm

fmalikoff

LDEV-1818: Adding validation to check that a tool based branch always has at least one condition

Options
    • -2
    • +14
    ./java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/learningdesign/dto/ValidationErrorDTO.java
  3. … 1 more file in changeset.
Friday 06 Jun 2008
2:17 pm

fmalikoff

LDEV-1820: Less than wasn't working as the BranchCondition was expecting start value to be 0, and it was null. Now accepts null.

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
11:31 am

fmalikoff

LDEV-1817: Define later branching was breaking Preview. Now the preview hack allows it to be used with Random Grouping and this required regetting the grouping at one point to avoid a CGLIB class cast exception (hack on hack). Bleah.

The chosen grouping now works as I clear the number of groups before creating a group (and then allocating to a branch), otherwise I could run into the max number of branches test. Another hack.

Options
    • -6
    • +4
    ./java/org/lamsfoundation/lams/lesson/service/LessonService.java
  2. … 2 more files in changeset.
Wednesday 28 May 2008
4:17 pm

jliew

LDEV-1773 add minimum no. of waiting learners to sync gate open condition

Options
    • -4
    • +8
    ./java/org/lamsfoundation/lams/learningdesign/strategy/SynchGateActivityStrategy.java
Tuesday 27 May 2008
10:32 am

fmalikoff

LDEV-1766: Removing groups from branches on the define later screen in monitoring wasn't working as I was trying to remove them from the group end and that is only cascade all. Changed to remove from the branch end as that has all-delete-orphan.

Options
    • -12
    • +6
    ./java/org/lamsfoundation/lams/learningdesign/Group.java
    • -1
    • +17
    ./java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
Friday 23 May 2008
9:56 am

fmalikoff

LDEV-1733: Allow teachers to add any number of groups to a chosen grouping, irrespective of the max number set in authoring. If they do add more than the max number, then the max number column is set to null (and not 0) as this matches what authoring expects.

Options
    • -1
    • +13
    ./java/org/lamsfoundation/lams/learningdesign/Grouping.java