Activity lams-github/

10:35 am

lfoxton

More
3986cea
changed 11 files
v4.7, v4.8

LDEV-2204 Adding learner views for gradebook

- -43
- +51
/lams_central/src/java/org/lamsfoundation/lams/gradebook/service/GradeBookService.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookService.java
- -0
- +1
/lams_central/src/java/org/lamsfoundation/lams/gradebook/util/GradeBookConstants.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookConstants.java
- -1
- +3
/lams_central/src/java/org/lamsfoundation/lams/gradebook/util/GradeBookUtil.java
- History
- Source
- Diff
/lams_central/src/.../util/GradeBookUtil.java
- -4
- +15
/lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookAction.java
- -1
- +1
/lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookLearningAction.java
- History
- Source
- Diff
/lams_central/.../GradeBookLearningAction.java
- -8
- +14
/lams_central/web/gradebook/gradeBookCourseLearner.jsp
- History
- Source
- Diff
/lams_central/.../gradeBookCourseLearner.jsp
- -2
- +1
/lams_central/web/gradebook/gradeBookCourseMonitor.jsp
- History
- Source
- Diff
/lams_central/.../gradeBookCourseMonitor.jsp
- -0
- +8
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
- History
- Source
- Diff
/lams_common/.../GBActivityGridRowDTO.java
- -14
- +19
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GBLessonGridRowDTO.java
- -0
- +4
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GradeBookGridRowDTO.java
- -1
- +2
/lams_common/src/java/org/lamsfoundation/lams/gradebook/util/GBGridView.java
- History
- Source
- Diff
/lams_common/src/.../util/GBGridView.java

8:09 am

lfoxton

More
50f28bb
changed 17 files
v4.7, v4.8

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

- -33
- +43
/lams_central/src/java/org/lamsfoundation/lams/gradebook/service/GradeBookService.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookService.java
- -1
- +2
/lams_central/src/java/org/lamsfoundation/lams/gradebook/service/IGradeBookService.java
- History
- Source
- Diff
/lams_central/src/.../IGradeBookService.java
- -3
- +6
/lams_central/src/java/org/lamsfoundation/lams/gradebook/util/GradeBookConstants.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookConstants.java
- -2
- +20
/lams_central/src/java/org/lamsfoundation/lams/gradebook/util/GradeBookUtil.java
- History
- Source
- Diff
/lams_central/src/.../util/GradeBookUtil.java
- -14
- +9
/lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookAction.java
- -0
- +159
/lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookLearningAction.java
- History
- Source
/lams_central/src/.../GradeBookLearningAction.java
- -5
- +5
/lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookMonitoringAction.java
- History
- Source
- Diff
/lams_central/.../GradeBookMonitoringAction.java
- -0
- +144
/lams_central/web/gradebook/gradeBookCourseLearner.jsp
- History
- Source
/lams_central/web/.../gradeBookCourseLearner.jsp
- -8
- +7
/lams_central/web/gradebook/gradeBookCourseMonitor.jsp
- History
- Source
- Diff
/lams_central/.../gradeBookCourseMonitor.jsp
- -8
- +8
/lams_central/web/gradebook/gradeBookMonitor.jsp
- History
- Source
- Diff
/lams_central/web/.../gradeBookMonitor.jsp
- -0
- +2
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradeBookDAO.java
- History
- Source
- Diff
/lams_common/src/.../dao/IGradeBookDAO.java
- -4
- +21
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradeBookDAO.java
- History
- Source
- Diff
/lams_common/src/.../GradeBookDAO.java
- -28
- +12
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
- History
- Source
- Diff
/lams_common/.../GBActivityGridRowDTO.java
- -22
- +31
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GBLessonGridRowDTO.java
- -32
- +17
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GBUserGridRowDTO.java
- -1
- +5
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GradeBookGridRowDTO.java
- -0
- +31
/lams_common/src/java/org/lamsfoundation/lams/gradebook/util/GBGridView.java
- History
- Source
/lams_common/src/java/.../util/GBGridView.java

1:09 am

Marcin Cieslak

More
d2057fd
changed 58 files
v4.7, v4.8

LDEV-2080: For all remaining tools - changed the way Hibernate properties are declared. Even for tools that did not need it the file was changed, so usage is the same everywhere.

- -1
- +1
/lams_common/build.xml
- History
- Source
- Diff
/lams_common/build.xml
- -0
- +50
/lams_common/conf/hibernate/mappings/hibernate.cfg.xml
- History
- Source
/lams_common/conf/.../mappings/hibernate.cfg.xml
- -7
- +0
/lams_common/conf/hibernate/mappings/hibernate.properties
- History
- Source
- Diff
/lams_common/conf/.../hibernate.properties
- -2
- +2
/lams_tool_assessment/build.xml
- History
- Source
- Diff
/lams_tool_assessment/build.xml
- -0
- +12
/lams_tool_assessment/conf/hibernate/mappings/hibernate.cfg.xml
- History
- Source
/lams_tool_assessment/conf/.../hibernate.cfg.xml
- -7
- +0
/lams_tool_assessment/conf/hibernate/mappings/hibernate.properties
- History
- Source
- Diff
/lams_tool_assessment/.../hibernate.properties
- -1
- +1
/lams_tool_chat/build.xml
- History
- Source
- Diff
/lams_tool_chat/build.xml
- -0
- +13
/lams_tool_chat/conf/hibernate/mappings/hibernate.cfg.xml
- History
- Source
/lams_tool_chat/conf/.../hibernate.cfg.xml
- -7
- +0
/lams_tool_chat/conf/hibernate/mappings/hibernate.properties
- History
- Source
- Diff
/lams_tool_chat/conf/.../hibernate.properties
- -2
- +2
/lams_tool_daco/build.xml
- History
- Source
- Diff
/lams_tool_daco/build.xml
- -0
- +12
/lams_tool_daco/conf/hibernate/mappings/hibernate.cfg.xml
- History
- Source
/lams_tool_daco/conf/.../hibernate.cfg.xml
- -5
- +0
/lams_tool_daco/conf/hibernate/mappings/hibernate.properties
- History
- Source
- Diff
/lams_tool_daco/conf/.../hibernate.properties
- -1
- +1
/lams_tool_dimdim/build.xml
- History
- Source
- Diff
/lams_tool_dimdim/build.xml
- -0
- +12
/lams_tool_dimdim/conf/hibernate/mappings/hibernate.cfg.xml
- History
- Source
/lams_tool_dimdim/conf/.../hibernate.cfg.xml
- -7
- +0
/lams_tool_dimdim/conf/hibernate/mappings/hibernate.properties
- History
- Source
- Diff
/lams_tool_dimdim/.../hibernate.properties
… 43 more files in changeset.

4:00 pm

mseaton

More
559d69e
changed 4 files
v4.7, v4.8

LDEV-2115 Fixed selected button for class load. Used new start time in duration calc instead of prev activity.

- -2
- +1
/lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/ChartManager.as
- History
- Source
- Diff
/lams_flash/src/.../business/ChartManager.as
- -0
- +2
/lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml
- History
- Source
- Diff
/lams_flash/src/central/.../views/Chart.mxml
- -5
- +8
/lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/vos/CompletedActivity.as
- History
- Source
- Diff
/lams_flash/src/.../vos/CompletedActivity.as
- binary
/lams_monitoring/web/TimeChart.swf
- History
- Source
- Diff
/lams_monitoring/web/TimeChart.swf

2:14 pm

mseaton

More
1759a00
changed 2 files
v4.7, v4.8

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

- -25
- +7
/lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java
- History
- Source
- Diff
/lams_common/src/.../LearnerProgress.java
- -1
- +11
/lams_common/src/java/org/lamsfoundation/lams/lesson/dto/CompletedActivityDTO.java
- History
- Source
- Diff
/lams_common/.../CompletedActivityDTO.java

2:14 pm

lfoxton

More
8397c77
changed 10 files
v4.7, v4.8

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_central/src/java/org/lamsfoundation/lams/gradebook/service/GradeBookService.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookService.java
- -0
- +2
/lams_central/src/java/org/lamsfoundation/lams/gradebook/util/GradeBookConstants.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookConstants.java
- -0
- +6
/lams_central/src/java/org/lamsfoundation/lams/gradebook/util/GradeBookUtil.java
- History
- Source
- Diff
/lams_central/src/.../util/GradeBookUtil.java
- -1
- +1
/lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookAction.java
- -1
- +1
/lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookMonitoringAction.java
- History
- Source
- Diff
/lams_central/.../GradeBookMonitoringAction.java
- -4
- +4
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
- History
- Source
- Diff
/lams_common/.../GBActivityGridRowDTO.java
- -4
- +4
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GBLessonGridRowDTO.java
- -1
- +24
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GradeBookGridRowDTO.java
- -0
- +47
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBAverageMarkComparator.java
- History
- Source
/lams_common/src/.../GBAverageMarkComparator.java
- -0
- +47
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBAverageTimeTakenComparator.java
- History
- Source
/lams_common/.../GBAverageTimeTakenComparator.java

1:32 pm

lfoxton

More
dcb89ef
changed 4 files
v4.7, v4.8

LDEV-2173 Putting contants into GradeBookConstants as they should be

- -8
- +52
/lams_central/src/java/org/lamsfoundation/lams/gradebook/util/GradeBookConstants.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookConstants.java
- -18
- +18
/lams_central/src/java/org/lamsfoundation/lams/gradebook/util/GradeBookUtil.java
- History
- Source
- Diff
/lams_central/src/.../util/GradeBookUtil.java
- -137
- +25
/lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookAction.java
- -12
- +12
/lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookMonitoringAction.java
- History
- Source
- Diff
/lams_central/.../GradeBookMonitoringAction.java

8:35 am

mseaton

More
3b82066
updated 2 files
v4.7, v4.8

LDEV-2115 LDEV-2184 Change theme color and panel colors to be consistent with colors found on index page (authoring button for example). Using toggle bar button for Time Chart.