• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2204 Adding learner views for gradebook

    • -1
    • +9
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -15
    • +20
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -1
    • +5
    ./lams/gradebook/dto/GradeBookGridRowDTO.java
  1. … 7 more files in changeset.
LDEV-2173 Using an enum type to identify the view for gradebook so it is more re-usable

    • -1
    • +3
    ./lams/gradebook/dao/IGradeBookDAO.java
    • -29
    • +13
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -23
    • +32
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -33
    • +18
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -2
    • +6
    ./lams/gradebook/dto/GradeBookGridRowDTO.java
    • -0
    • +31
    ./lams/gradebook/util/GBGridView.java
  1. … 10 more files in changeset.
LDEV-2187 LDEV-2115 Updated DTO to include new start time for completed activity (record).

    • -1
    • +11
    ./lams/lesson/dto/CompletedActivityDTO.java
LDEV-2173 Adding in an averageTime and an averageMark parameter to the abstract GradeBookGridRow class as it makes sense for all views to have these parameters

    • -5
    • +5
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -5
    • +5
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -2
    • +25
    ./lams/gradebook/dto/GradeBookGridRowDTO.java
    • -0
    • +47
    ./lams/gradebook/dto/comparators/GBAverageMarkComparator.java
  1. … 5 more files in changeset.
LDEV-2187 Put time taken for activities and lessons in gradebook.

Adding in averaget time for activities for activity view in gradebook lesson monitor

    • -1
    • +3
    ./lams/gradebook/dao/IGradeBookDAO.java
    • -1
    • +7
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -1
    • +7
    ./lams/gradebook/dto/GBUserGridRowDTO.java
  1. … 3 more files in changeset.
LDEV-2187 Put time taken for activities and lessons in gradebook.

Fixing up LearnerProgress.java so it stores both finish time and start time for all completed activities

    • -0
    • +108
    ./lams/lesson/CompletedActivityProgress.java
    • -373
    • +400
    ./lams/lesson/LearnerProgress.java
    • -2
    • +2
    ./lams/lesson/service/LessonService.java
  1. … 6 more files in changeset.
LDEV-2173 Standardising sorting and searching for GradeBookGridRows, now all can sort on name, id, mark and timeTaken (common properties for all types) and all can search on name

    • -68
    • +12
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -46
    • +11
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -62
    • +6
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -2
    • +46
    ./lams/gradebook/dto/GradeBookGridRowDTO.java
    • -0
    • +44
    ./lams/gradebook/dto/comparators/GBRowNameComparator.java
    • -0
    • +47
    ./lams/gradebook/dto/comparators/GBTimeTakenComparator.java
  1. … 5 more files in changeset.
LDEV-2187 - Adding in time columns for gradebook

    • -1
    • +3
    ./lams/gradebook/dao/IGradeBookDAO.java
    • -28
    • +9
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -1
    • +29
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -2
    • +24
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -1
    • +30
    ./lams/gradebook/dto/GradeBookGridRowDTO.java
    • -0
    • +49
    ./lams/gradebook/dto/comparators/GBLessonIDComparator.java
  1. … 3 more files in changeset.
Fixing up unmerged gradebook contexts

- Updated jQuery core to v1.3.2

- Updated jQuery UI to v1.7.1

- Classic Wizard now has checkbox visible to enable Presence Chat

- Learner no longer has a Presence box

- Presence Chat committed

    • -0
    • +42
    ./lams/presence/dao/IPresenceChatMessageDAO.java
    • -0
    • +68
    ./lams/presence/dao/hibernate/PresenceChatMessageDAO.java
    • -0
    • +112
    ./lams/presence/dto/PresenceChatMessageDTO.java
    • -0
    • +137
    ./lams/presence/model/PresenceChatMessage.java
    • -0
    • +48
    ./lams/presence/service/IPresenceChatLoggerService.java
    • -0
    • +84
    ./lams/presence/service/PresenceChatLoggerService.java
  1. … 258 more files in changeset.
LDEV-2173 Restructuring jqgrid javascript functions and jsps for re-use

    • -3
    • +3
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -3
    • +3
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -2
    • +2
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -65
    • +104
    ./lams/learningdesign/Activity.java
  1. … 3 more files in changeset.
LDEV-2187 Adding time column to activities

and also, added tooltips to monitor view

    • -4
    • +41
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -0
    • +51
    ./lams/gradebook/dto/comparators/ActivityComparator.java
  1. … 3 more files in changeset.
LDEV-2041: Changed the character set name to "UTF8", which is the proper canonical name for java.io classes, instead of "UTF-8".

LDEV-2184 Created new Add Lesson wizard.

  1. … 8 more files in changeset.
LDEV-2190 - Adding course-level view to gradebook

    • -1
    • +3
    ./lams/gradebook/dao/IGradeBookDAO.java
    • -80
    • +72
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -0
    • +147
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -48
    • +46
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -4
    • +2
    ./lams/gradebook/dto/GradeBookGridRowDTO.java
    • -0
    • +47
    ./lams/gradebook/dto/comparators/GBLessonMarkComparator.java
    • -0
    • +45
    ./lams/gradebook/dto/comparators/GBLessonNameComparator.java
  1. … 10 more files in changeset.
LDEV-2174: Added shared context support to tool adapters. Added some code comments explaining how everything works.

  1. … 52 more files in changeset.
LDEV-2041: Added full functionality of exporting to XLS/CSV to Daco tool.

  1. … 14 more files in changeset.
LDEV-2173 Adding monitor link for activities in the activity view

    • -5
    • +16
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
  1. … 6 more files in changeset.
merging improvements from lams2_3_spring_jboss_tune branch

  1. … 115 more files in changeset.
LDEV-2041: Added new libraries. Added export methods in FileUtil. Moved several common constants to CentralConstants.

  1. … 10 more files in changeset.
LDEV-1998: Removed "Editor" and "Preview" links if subnode has a full description.

  1. … 3 more files in changeset.
LDEV-2184 Updated monitoring service (lesson class servlet) - to handle default lesson class when receiving null or (empty) users in wddx packet.

  1. … 3 more files in changeset.
LDEV-2174: Merged 3 separate data sources into one, as they were never used.

  1. … 1 more file in changeset.
LDEV-2182: Swapped references to transitions during import.

LDEV-2173 Added "Activity view" to gradebook, which meant a bit of changing of naming of classes etc, plus a few more services calls and actions. I attempted to take advantage of OO design as much as possible here.

    • -1
    • +5
    ./lams/gradebook/dao/IGradeBookDAO.java
    • -0
    • +180
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -0
    • +159
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -146
    • +0
    ./lams/gradebook/dto/GradeBookActivityDTO.java
    • -34
    • +0
    ./lams/gradebook/dto/GradeBookGridRow.java
    • -0
    • +36
    ./lams/gradebook/dto/GradeBookGridRowDTO.java
    • -110
    • +0
    ./lams/gradebook/dto/GradeBookUserDTO.java
    • -0
    • +53
    ./lams/gradebook/dto/comparators/GBUserFullNameComparator.java
    • -0
    • +47
    ./lams/gradebook/dto/comparators/GBUserMarkComparator.java
  1. … 6 more files in changeset.
LDEV-2174:

Merged "context.tool" and "context.central" due to Locator inheritance bug in Spring.

Removed redundant Quartz Scheduler.

  1. … 24 more files in changeset.
LDEV-2173 Adding feedback to gradebook

    • -1
    • +18
    ./lams/gradebook/GradeBookUserLesson.java
    • -4
    • +13
    ./lams/gradebook/dto/GradeBookActivityDTO.java
    • -3
    • +11
    ./lams/gradebook/dto/GradeBookUserDTO.java
  1. … 9 more files in changeset.
file beanRefContext.xml was initially added on branch lams2_3_spring_jboss_tune.

    • -0
    • +0
    ./lams/beanRefContext.xml
LDEV-2174:

Changed Spring contexts to use ContextSingletonBeanFactoryLocator.

Added Ant task to slim JBoss.

  1. … 28 more files in changeset.
LDEV-2173 - Adding user lesson status to monitor gradebook view

    • -2
    • +21
    ./lams/gradebook/dto/GradeBookActivityDTO.java
    • -16
    • +43
    ./lams/gradebook/dto/GradeBookUserDTO.java
  1. … 4 more files in changeset.