lams / lams_common / src / java

org

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 17 Apr 2009
4:21 pm

paulg

Merging latest changes from HEAD to 2.3 branch

See MAIN:paulg:20090417074901 for details

Also, Video Recorder tool project was replaced completely given that it didn't exist in the 2.3 branch yet

Options
    • -2
    • +2
    ./lamsfoundation/lams/presence/dao/IPresenceChatMessageDAO.java
    • -10
    • +9
    ./lamsfoundation/lams/presence/dao/hibernate/PresenceChatMessageDAO.java
    • -1
    • +5
    ./lamsfoundation/lams/presence/model/PresenceChatMessage.java
    • -3
    • +3
    ./lamsfoundation/lams/presence/service/IPresenceChatLoggerService.java
    • -3
    • +3
    ./lamsfoundation/lams/presence/service/PresenceChatLoggerService.java
    • -0
    • +50
    ./lamsfoundation/lams/util/Base64StringToImageUtil.java
  7. … 236 more files in changeset.
3:22 pm

lfoxton

LDEV-2207 Adding in mark release functionality for gradebook

Options
    • -3
    • +2
    ./lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +2
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
    • -1
    • +16
    ./lamsfoundation/lams/lesson/Lesson.java
  4. … 7 more files in changeset.
3:06 pm

paulg

file Base64StringToImageUtil.java was added on branch lams2_3 on 2009-04-17 08:21:20 +0000

Options
    • -0
    • +0
    ./lamsfoundation/lams/util/Base64StringToImageUtil.java
3:06 pm

paulg

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

Options
    • -2
    • +2
    ./lamsfoundation/lams/presence/dao/IPresenceChatMessageDAO.java
    • -10
    • +9
    ./lamsfoundation/lams/presence/dao/hibernate/PresenceChatMessageDAO.java
    • -1
    • +5
    ./lamsfoundation/lams/presence/model/PresenceChatMessage.java
    • -3
    • +3
    ./lamsfoundation/lams/presence/service/IPresenceChatLoggerService.java
    • -3
    • +3
    ./lamsfoundation/lams/presence/service/PresenceChatLoggerService.java
    • -0
    • +50
    ./lamsfoundation/lams/util/Base64StringToImageUtil.java
  7. … 50 more files in changeset.
Thursday 16 Apr 2009
3:00 pm

dcarlier

LDEV-2191 Can now remove staff/learners from a started lesson

Options
    • -3
    • +33
    ./lamsfoundation/lams/lesson/LessonClass.java
    • -2
    • +24
    ./lamsfoundation/lams/lesson/service/ILessonService.java
    • -1
    • +38
    ./lamsfoundation/lams/lesson/service/LessonService.java
  4. … 5 more files in changeset.
2:46 pm

lfoxton

file GroupUser.java was initially added on branch lams2_3.

Options
    • -0
    • +0
    ./lamsfoundation/lams/learningdesign/GroupUser.java
2:46 pm

lfoxton

LDEV-2213 Adding grouping functionalitly to gradebook

Had to create another hibernate mapping for the lams_user_group table so I could create a hql query that fetch the average marks and times taken just for a group

Options
    • -1
    • +2
    ./lamsfoundation/lams/commonContext.xml
    • -1
    • +5
    ./lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
    • -3
    • +54
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
    • -0
    • +68
    ./lamsfoundation/lams/learningdesign/GroupUser.java
  5. … 12 more files in changeset.
2:42 pm

dcarlier

LDEV-2191 Can now remove staff/learners from a started lesson

Options
    • -3
    • +33
    ./lamsfoundation/lams/lesson/LessonClass.java
    • -2
    • +24
    ./lamsfoundation/lams/lesson/service/ILessonService.java
    • -1
    • +38
    ./lamsfoundation/lams/lesson/service/LessonService.java
  4. … 5 more files in changeset.
Wednesday 15 Apr 2009
11:21 am

mseaton

LDEV-2227 Fixed validation message for floating activities.

Options
    • -4
    • +6
    ./lamsfoundation/lams/learningdesign/service/LearningDesignValidator.java
Tuesday 14 Apr 2009
2:49 pm

lfoxton

LDEV-2173 Adding gradebook create table scripts to the dbupdates scripts for .23

Options
    • -0
    • +29
    ./lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
2:48 pm

lfoxton

LDEV-2173 Adding gradebook create table scripts to the dbupdates scripts for .23

Options
    • -1
    • +0
    ./lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
2:46 pm

lfoxton

LDEV-2173 Adding gradebook create table scripts to the dbupdates scripts for .23

Options
    • -0
    • +34
    ./lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
Saturday 11 Apr 2009
1:24 am

jliew

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

Options
    • -30
    • +40
    ./lamsfoundation/lams/usermanagement/service/LdapService.java
Friday 10 Apr 2009
10:42 pm

jliew

LDEV-2159 fix missing apostrophe introduced in earlier commit; remove some string concatenators that became unnecessary after auto-formatting

Options
    • -22
    • +22
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
10:24 pm

jliew

LDEV-2123 escape search strings used in admin

Options
    • -2
    • +6
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
9:28 pm

jliew

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

Options
    • -6
    • +33
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
  2. … 1 more file in changeset.
Thursday 09 Apr 2009
12:55 pm

lfoxton

LDEV-2173 - Putting most of gradebook into its own project for easier maintainence

Database persistence beans and DAO are staying in lams_common

Options
    • -1
    • +0
    ./lamsfoundation/lams/beanRefContext.xml
    • -4
    • +4
    ./lamsfoundation/lams/commonContext.xml
    • -108
    • +0
    ./lamsfoundation/lams/gradebook/GradeBookUserActivity.java
    • -107
    • +0
    ./lamsfoundation/lams/gradebook/GradeBookUserLesson.java
    • -0
    • +108
    ./lamsfoundation/lams/gradebook/GradebookUserActivity.java
    • -0
    • +107
    ./lamsfoundation/lams/gradebook/GradebookUserLesson.java
    • -51
    • +0
    ./lamsfoundation/lams/gradebook/dao/IGradeBookDAO.java
    • -0
    • +51
    ./lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
    • -199
    • +0
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradeBookDAO.java
    • -0
    • +199
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
    • -143
    • +0
    ./lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -154
    • +0
    ./lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -114
    • +0
    ./lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -138
    • +0
    ./lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
    • -47
    • +0
    ./lamsfoundation/lams/gradebook/dto/comparators/GBAverageMarkComparator.java
  16. … 125 more files in changeset.
8:08 am

lfoxton

LDEV-2205 Didnt commit all the required files for the group admin view

Options
    • -18
    • +18
    ./lamsfoundation/lams/usermanagement/Organisation.java
  2. … 5 more files in changeset.
Tuesday 07 Apr 2009
1:23 pm

lfoxton

LDEV-2205 Adding in course-level admin to enable/disable gradebook for a course

Options
    • -0
    • +4
    ./lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +44
    ./lamsfoundation/lams/usermanagement/Organisation.java
  3. … 7 more files in changeset.
10:35 am

lfoxton

LDEV-2204 Adding learner views for gradebook

Options
    • -1
    • +9
    ./lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -15
    • +20
    ./lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -1
    • +5
    ./lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
    • -2
    • +3
    ./lamsfoundation/lams/gradebook/util/GBGridView.java
  5. … 7 more files in changeset.
8:09 am

lfoxton

LDEV-2173 Using an enum type to identify the view for gradebook so it is more re-usable

Options
    • -1
    • +3
    ./lamsfoundation/lams/gradebook/dao/IGradeBookDAO.java
    • -5
    • +22
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradeBookDAO.java
    • -29
    • +13
    ./lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -23
    • +32
    ./lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -33
    • +18
    ./lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -2
    • +6
    ./lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
    • -0
    • +31
    ./lamsfoundation/lams/gradebook/util/GBGridView.java
  8. … 10 more files in changeset.
Monday 06 Apr 2009
2:14 pm

mseaton

LDEV-2187 LDEV-2115 Updated DTO to include new start time for completed activity (record).

Options
    • -26
    • +8
    ./lamsfoundation/lams/lesson/LearnerProgress.java
    • -1
    • +11
    ./lamsfoundation/lams/lesson/dto/CompletedActivityDTO.java
2:14 pm

lfoxton

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

Options
    • -5
    • +5
    ./lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -5
    • +5
    ./lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -2
    • +25
    ./lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
    • -0
    • +47
    ./lamsfoundation/lams/gradebook/dto/comparators/GBAverageMarkComparator.java
    • -0
    • +47
    ./lamsfoundation/lams/gradebook/dto/comparators/GBAverageTimeTakenComparator.java
  6. … 5 more files in changeset.
Friday 03 Apr 2009
2:08 pm

lfoxton

LDEV-2187 Put time taken for activities and lessons in gradebook.

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

Options
    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -1
    • +3
    ./lamsfoundation/lams/gradebook/dao/IGradeBookDAO.java
    • -2
    • +37
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradeBookDAO.java
    • -1
    • +7
    ./lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -1
    • +7
    ./lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
  6. … 3 more files in changeset.
12:42 pm

lfoxton

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

Options
    • -1
    • +5
    ./lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -0
    • +108
    ./lamsfoundation/lams/lesson/CompletedActivityProgress.java
    • -373
    • +400
    ./lamsfoundation/lams/lesson/LearnerProgress.java
    • -67
    • +58
    ./lamsfoundation/lams/lesson/dto/LearnerProgressCompletedDTO.java
    • -2
    • +2
    ./lamsfoundation/lams/lesson/service/LessonService.java
  6. … 6 more files in changeset.
Thursday 02 Apr 2009
10:27 am

lfoxton

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

Options
    • -2
    • +1
    ./lamsfoundation/lams/gradebook/GradeBookUserActivity.java
    • -68
    • +12
    ./lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -46
    • +11
    ./lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -62
    • +6
    ./lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -2
    • +46
    ./lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
    • -0
    • +49
    ./lamsfoundation/lams/gradebook/dto/comparators/GBIDComparator.java
    • -49
    • +0
    ./lamsfoundation/lams/gradebook/dto/comparators/GBLessonIDComparator.java
    • -47
    • +0
    ./lamsfoundation/lams/gradebook/dto/comparators/GBLessonMarkComparator.java
    • -45
    • +0
    ./lamsfoundation/lams/gradebook/dto/comparators/GBLessonNameComparator.java
    • -0
    • +47
    ./lamsfoundation/lams/gradebook/dto/comparators/GBMarkComparator.java
    • -0
    • +44
    ./lamsfoundation/lams/gradebook/dto/comparators/GBRowNameComparator.java
    • -0
    • +47
    ./lamsfoundation/lams/gradebook/dto/comparators/GBTimeTakenComparator.java
    • -53
    • +0
    ./lamsfoundation/lams/gradebook/dto/comparators/GBUserFullNameComparator.java
    • -47
    • +0
    ./lamsfoundation/lams/gradebook/dto/comparators/GBUserMarkComparator.java
  15. … 5 more files in changeset.
7:49 am

lfoxton

LDEV-2187 - Adding in time columns for gradebook

Options
    • -1
    • +3
    ./lamsfoundation/lams/gradebook/dao/IGradeBookDAO.java
    • -10
    • +45
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradeBookDAO.java
    • -28
    • +9
    ./lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -1
    • +29
    ./lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -2
    • +24
    ./lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -1
    • +30
    ./lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
    • -0
    • +49
    ./lamsfoundation/lams/gradebook/dto/comparators/GBLessonIDComparator.java
  8. … 3 more files in changeset.
Wednesday 01 Apr 2009
11:05 am

lfoxton

Fixing up unmerged gradebook contexts

Options
    • -0
    • +1
    ./lamsfoundation/lams/beanRefContext.xml
    • -0
    • +5
    ./lamsfoundation/lams/commonContext.xml
8:44 am

paulg

- 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

Options
    • -0
    • +14
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +42
    ./lamsfoundation/lams/presence/dao/IPresenceChatMessageDAO.java
    • -0
    • +68
    ./lamsfoundation/lams/presence/dao/hibernate/PresenceChatMessageDAO.java
    • -0
    • +112
    ./lamsfoundation/lams/presence/dto/PresenceChatMessageDTO.java
    • -0
    • +137
    ./lamsfoundation/lams/presence/model/PresenceChatMessage.java
    • -0
    • +48
    ./lamsfoundation/lams/presence/service/IPresenceChatLoggerService.java
    • -0
    • +84
    ./lamsfoundation/lams/presence/service/PresenceChatLoggerService.java
  8. … 258 more files in changeset.
8:21 am

lfoxton

LDEV-2173 Restructuring jqgrid javascript functions and jsps for re-use

Options
    • -3
    • +3
    ./lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -3
    • +3
    ./lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -2
    • +2
    ./lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -51
    • +0
    ./lamsfoundation/lams/gradebook/dto/comparators/ActivityComparator.java
    • -65
    • +104
    ./lamsfoundation/lams/learningdesign/Activity.java
  6. … 3 more files in changeset.