lamsfoundation

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2125: If user's time zone is not set, it defaults to server's time zone (if in the list of supported time zones) or GMT (if not in the list).

LDEV-2149 Competence mappings now imported properly

LDEV-2125: User profile has now an option to choose a time zone. This choice is later used in LocaleFilter and allows JSP pages to adjust displayed dates accordingly.

    • -0
    • +15
    ./lams/dbupdates/patch0017_updateFrom23.sql
    • -1
    • +1
    ./lams/usermanagement/dto/UserDTO.java
    • -89
    • +91
    ./lams/web/filter/LocaleFilter.java
  1. … 6 more files in changeset.
Merging lams_gradebook changes with head

LDEV-2213

LDEV-2214

LDEV-2212

LDEV-2207

    • -0
    • +68
    ./lams/learningdesign/GroupUser.java
Merging gradebook lams-common changes with head

LDEV-2213

LDEV-2214

LDEV-2212

LDEV-2207

    • -0
    • +4
    ./lams/gradebook/dao/IGradebookDAO.java
  1. … 3 more files in changeset.
LDEV-2005 = VideoRecorder tool and FCKEditor video recorder updated - export portfolio fixed - export fck recordings fixed - conditions added - preview images are now produced and displayed - more feedback for rating - instructions highlighted - clicking delete button does not trigger viewing of recording - timer display corrected - prompt validation - misc bugs

LDEV-2197 = Presence Chat updated

- no longer stacking in ie7

- scrolling improved

- logged conversations are fetched on open new tab

- status messages no longer shown in chat boxes, user icons change instead

- minimize/maximize button shown on presence tab

iFrame fixed for ie6

    • -0
    • +4
    ./lams/presence/model/PresenceChatMessage.java
    • -0
    • +50
    ./lams/util/Base64StringToImageUtil.java
  1. … 50 more files in changeset.
LDEV-2191 Can now remove staff/learners from a started lesson

    • -1
    • +23
    ./lams/lesson/service/ILessonService.java
    • -0
    • +37
    ./lams/lesson/service/LessonService.java
  1. … 5 more files in changeset.
LDEV-2173 Adding gradebook create table scripts to the dbupdates scripts for .23

LDEV-2164 add try/catch block inside processing loop in order to continue processing on error.

    • -29
    • +39
    ./lams/usermanagement/service/LdapService.java
LDEV-2159 fix missing apostrophe introduced in earlier commit; remove some string concatenators that became unnecessary after auto-formatting

LDEV-2123 escape search strings used in admin

LDEV-2030 update workspace name when user's name/s are changed; LDEV-2196 ensure user workspaces are created with utf8 strings when user is created

  1. … 1 more file in changeset.
LDEV-2173 - Putting most of gradebook into its own project for easier maintainence

Database persistence beans and DAO are staying in lams_common

    • -107
    • +0
    ./lams/gradebook/GradeBookUserLesson.java
    • -0
    • +108
    ./lams/gradebook/GradebookUserActivity.java
    • -0
    • +107
    ./lams/gradebook/GradebookUserLesson.java
    • -51
    • +0
    ./lams/gradebook/dao/IGradeBookDAO.java
    • -0
    • +51
    ./lams/gradebook/dao/IGradebookDAO.java
    • -0
    • +199
    ./lams/gradebook/dao/hibernate/GradebookDAO.java
    • -143
    • +0
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -154
    • +0
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -114
    • +0
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -138
    • +0
    ./lams/gradebook/dto/GradeBookGridRowDTO.java
  1. … 32 more files in changeset.
LDEV-2205 Didnt commit all the required files for the group admin view

    • -17
    • +17
    ./lams/usermanagement/Organisation.java
  1. … 5 more files in changeset.
LDEV-2205 Adding in course-level admin to enable/disable gradebook for a course

    • -1
    • +43
    ./lams/usermanagement/Organisation.java
  1. … 7 more files in changeset.
LDEV-2204 Adding learner views for gradebook

    • -0
    • +8
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -14
    • +19
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -0
    • +4
    ./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

    • -0
    • +2
    ./lams/gradebook/dao/IGradeBookDAO.java
    • -28
    • +12
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -22
    • +31
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -32
    • +17
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -1
    • +5
    ./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

    • -4
    • +4
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -4
    • +4
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -1
    • +24
    ./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

    • -0
    • +2
    ./lams/gradebook/dao/IGradeBookDAO.java
    • -0
    • +6
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -0
    • +6
    ./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
    • -353
    • +380
    ./lams/lesson/LearnerProgress.java
    • -1
    • +1
    ./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

    • -67
    • +11
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -45
    • +10
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -61
    • +5
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -1
    • +45
    ./lams/gradebook/dto/GradeBookGridRowDTO.java
    • -0
    • +44
    ./lams/gradebook/dto/comparators/GBRowNameComparator.java
    • -0
    • +47
    ./lams/gradebook/dto/comparators/GBTimeTakenComparator.java
  1. … 2 more files in changeset.
LDEV-2187 - Adding in time columns for gradebook

    • -0
    • +2
    ./lams/gradebook/dao/IGradeBookDAO.java
    • -27
    • +8
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -0
    • +28
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -1
    • +23
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -0
    • +29
    ./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

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

and also, added tooltips to monitor view

    • -3
    • +40
    ./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.

LDEV-2190 - Adding course-level view to gradebook

    • -0
    • +2
    ./lams/gradebook/dao/IGradeBookDAO.java
    • -80
    • +72
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -0
    • +147
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -47
    • +45
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -3
    • +1
    ./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.