• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merging lams_gradebook changes with head

LDEV-2213

LDEV-2214

LDEV-2212

LDEV-2207

    • -0
    • +68
    ./lams/learningdesign/GroupUser.java
LDEV-2206 Creating a flag for output definitions to set the default gradebook mark for a tool

    • -256
    • +355
    ./lams/tool/OutputFactory.java
    • -1
    • +17
    ./lams/tool/ToolOutputDefinition.java
  1. … 1 more file in changeset.
Fixing up code format of ToolOutputDefinition.java

    • -130
    • +140
    ./lams/tool/ToolOutputDefinition.java
Fixing little bug released by null "marksreleased" flag in

LDEV-2207 Adding in mark release functionality for gradebook

  1. … 2 more files in changeset.
LDEV-2027 LDEV-2235 Separated notes into a lesson segmented list. Unknown heading label for empty ' ' external signatures.

    • -0
    • +10
    ./lams/notebook/model/NotebookEntry.java
    • -0
    • +34
    ./lams/notebook/service/CoreNotebookService.java
  1. … 4 more files in changeset.
Merging gradebook lams-common changes with head

LDEV-2213

LDEV-2214

LDEV-2212

LDEV-2207

    • -1
    • +5
    ./lams/gradebook/dao/IGradebookDAO.java
  1. … 3 more files in changeset.
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

    • -1
    • +5
    ./lams/presence/model/PresenceChatMessage.java
    • -0
    • +50
    ./lams/util/Base64StringToImageUtil.java
  1. … 236 more files in changeset.
LDEV-2207 Adding in mark release functionality for gradebook

  1. … 7 more files in changeset.
file Base64StringToImageUtil.java was added on branch lams2_3 on 2009-04-17 08:21:20 +0000

    • -0
    • +0
    ./lams/util/Base64StringToImageUtil.java
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

    • -1
    • +5
    ./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

    • -2
    • +24
    ./lams/lesson/service/ILessonService.java
    • -1
    • +38
    ./lams/lesson/service/LessonService.java
  1. … 5 more files in changeset.
file GroupUser.java was initially added on branch lams2_3.

    • -0
    • +0
    ./lams/learningdesign/GroupUser.java
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

    • -1
    • +5
    ./lams/gradebook/dao/IGradebookDAO.java
    • -0
    • +68
    ./lams/learningdesign/GroupUser.java
  1. … 12 more files in changeset.
LDEV-2191 Can now remove staff/learners from a started lesson

    • -2
    • +24
    ./lams/lesson/service/ILessonService.java
    • -1
    • +38
    ./lams/lesson/service/LessonService.java
  1. … 5 more files in changeset.
LDEV-2227 Fixed validation message for floating activities.

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

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

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.

    • -30
    • +40
    ./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. … 125 more files in changeset.
LDEV-2205 Didnt commit all the required files for the group admin view

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

    • -2
    • +44
    ./lams/usermanagement/Organisation.java
  1. … 7 more files in changeset.
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.