Activity lams/

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

- -1
- +1
/lams_central/web/gradebook/gradeBookCourseMonitor.jsp
- History
- Source
- Diff
/lams_central/.../gradeBookCourseMonitor.jsp
- -4
- +4
/lams_central/web/gradebook/gradeBookMonitor.jsp
- History
- Source
- Diff
/lams_central/web/.../gradeBookMonitor.jsp

10:27 am

lfoxton

More
MAIN:lfoxton:20090402022755
changed 19 files
MAIN

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

- -14
- +15
/lams_central/src/java/org/lamsfoundation/lams/gradebook/service/GradeBookService.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookService.java
- -5
- +164
/lams_central/src/java/org/lamsfoundation/lams/gradebook/util/GradeBookUtil.java
- History
- Source
- Diff
/lams_central/src/.../util/GradeBookUtil.java
- -170
- +243
/lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookAction.java
- -21
- +13
/lams_central/web/gradebook/gradeBookCourseMonitor.jsp
- History
- Source
- Diff
/lams_central/.../gradeBookCourseMonitor.jsp
- -13
- +15
/lams_central/web/gradebook/gradeBookMonitor.jsp
- History
- Source
- Diff
/lams_central/web/.../gradeBookMonitor.jsp
- -2
- +1
/lams_common/src/java/org/lamsfoundation/lams/gradebook/GradeBookUserActivity.java
- History
- Source
- Diff
/lams_common/.../GradeBookUserActivity.java
- -68
- +12
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
- History
- Source
- Diff
/lams_common/.../GBActivityGridRowDTO.java
- -46
- +11
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GBLessonGridRowDTO.java
- -62
- +6
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GBUserGridRowDTO.java
- -2
- +46
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GradeBookGridRowDTO.java
- -0
- +49
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBIDComparator.java
- History
- Source
/lams_common/src/.../GBIDComparator.java
- -49
- +0
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBLessonIDComparator.java
- History
- Source
- Diff
/lams_common/.../GBLessonIDComparator.java
- -47
- +0
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBLessonMarkComparator.java
- History
- Source
- Diff
/lams_common/.../GBLessonMarkComparator.java
- -45
- +0
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBLessonNameComparator.java
- History
- Source
- Diff
/lams_common/.../GBLessonNameComparator.java
- -0
- +47
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBMarkComparator.java
- History
- Source
/lams_common/src/.../GBMarkComparator.java
… 4 more files in changeset.

9:42 am

paulg

More
MAIN:paulg:20090402014204
changed 3 files
MAIN

LDEV-2197 Presence Chat

- Added a scrollbar to Presence user listings

- Changed css

- Scrolling better, still a bit iffy

- -4
- +8
/lams_central/web/includes/javascript/jquery-ui/ui/ui.tabs.scrollable.js
- History
- Source
- Diff
/lams_central/web/.../ui.tabs.scrollable.js
- -1
- +8
/lams_learning/web/includes/presence.css
- History
- Source
- Diff
/lams_learning/web/includes/presence.css
- -5
- +5
/lams_learning/web/includes/presenceChat.jsp
- History
- Source
- Diff
/lams_learning/web/.../presenceChat.jsp

9:34 am

lfoxton

More
MAIN:lfoxton:20090402013425
changed 2 files
MAIN

LDEV-2173 Moving jquery library so jqGrid can keep using 1.2.6 as the new 1.3.2 breaks the search function

- -1
- +1
/lams_central/web/gradebook/jqGridIncludes.jsp
- History
- Source
- Diff
/lams_central/web/.../jqGridIncludes.jsp
- -0
- +11
/lams_central/web/includes/javascript/jqgrid/js/jquery-1.2.6.pack.js
- History
- Source
/lams_central/web/.../js/jquery-1.2.6.pack.js

8:30 am

mseaton

More
MAIN:mseaton:20090402003030
updated 3 files
MAIN

LDEV-2115 Hide form controls (footer) on pie chart (activity) and learner mode but display for class mode and completion rate chart.

- binary
/lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml
- History
- Source
- Diff
/lams_flash/src/central/.../views/Chart.mxml
- binary
/lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/MainUI.mxml
- History
- Source
- Diff
/lams_flash/src/central/.../views/MainUI.mxml
- binary
/lams_monitoring/web/TimeChart.swf
- History
- Source
- Diff
/lams_monitoring/web/TimeChart.swf

7:49 am

lfoxton

More
MAIN:lfoxton:20090401234903
changed 10 files
MAIN

LDEV-2187 - Adding in time columns for gradebook

- -14
- +34
/lams_central/src/java/org/lamsfoundation/lams/gradebook/service/GradeBookService.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookService.java
- -3
- +4
/lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookAction.java
- -1
- +3
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradeBookDAO.java
- History
- Source
- Diff
/lams_common/src/.../dao/IGradeBookDAO.java
- -10
- +45
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradeBookDAO.java
- History
- Source
- Diff
/lams_common/src/.../GradeBookDAO.java
- -28
- +9
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
- History
- Source
- Diff
/lams_common/.../GBActivityGridRowDTO.java
- -1
- +29
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GBLessonGridRowDTO.java
- -2
- +24
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GBUserGridRowDTO.java
- -1
- +30
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GradeBookGridRowDTO.java
- -0
- +49
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBLessonIDComparator.java
- History
- Source
/lams_common/src/.../GBLessonIDComparator.java
- -4
- +6
/lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
- History
- Source
- Diff
/lams_learning/src/.../ProgressEngine.java

9:05 pm

Andrey Balan

More
MAIN:andreyb:20090401130512
changed 7 files
MAIN

LDEV-2195 No content editing after first learner used accessed activity

* also defineLater fixed

- -2
- +2
/lams_tool_assessment/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_assessment/.../ApplicationResources.properties
- -2
- +2
/lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_assessment/.../ApplicationResources_en_AU.properties
- -2
- +2
/lams_tool_assessment/conf/language/rams/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_assessment/.../ApplicationResources.properties
- -2
- +2
/lams_tool_assessment/conf/language/rams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_assessment/.../ApplicationResources_en_AU.properties
- -3
- +5
/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
- History
- Source
- Diff
/lams_tool_assessment/.../AuthoringAction.java
- -7
- +7
/lams_tool_assessment/web/pages/authoring/definelater.jsp
- History
- Source
- Diff
/lams_tool_assessment/web/.../definelater.jsp
- -11
- +13
/lams_tool_assessment/web/pages/monitoring/editactivity.jsp
- History
- Source
- Diff
/lams_tool_assessment/.../editactivity.jsp

8:14 pm

Andrey Balan

More
MAIN:andreyb:20090401121409
changed 3 files
MAIN

LDEV-2192 Spreadsheet now works in Greek (and other not major languages)

- -1
- +3
/lams_tool_spreadsheet/web/includes/javascript/simple_spreadsheet/spreadsheet_offline.html
- History
- Source
- Diff
/lams_tool_spreadsheet/.../spreadsheet_offline.html
- -0
- +93
/lams_tool_spreadsheet/web/includes/javascript/simple_spreadsheet/translations/pt.js
- History
- Source
/lams_tool_spreadsheet/web/.../translations/pt.js
- -93
- +0
/lams_tool_spreadsheet/web/includes/javascript/simple_spreadsheet/translations/ptBR.js
- History
- Source
- Diff
/lams_tool_spreadsheet/web/.../ptBR.js

8:07 pm

Andrey Balan

More
MAIN:andreyb:20090401120711
changed 23 files
MAIN

LDEV-2104 Implement Assessment Tool

some small fixes:

* changed the grid theme to blue

* move the numbers to the top of the column rather than sitting in

the middle.... also put them in bold

* Summary and Report by question headings

- -2
- +2
/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentBundler.java
- History
- Source
- Diff
/lams_tool_assessment/.../AssessmentBundler.java
- -63
- +53
/lams_tool_assessment/web/includes/css/jqGrid.grid.css
- History
- Source
- Diff
/lams_tool_assessment/web/.../jqGrid.grid.css
- binary
/lams_tool_assessment/web/includes/images/jqGrid.basic.theme/down.gif
- History
- Source
- Diff
/lams_tool_assessment/web/.../down.gif
- binary
/lams_tool_assessment/web/includes/images/jqGrid.basic.theme/first.gif
- History
- Source
- Diff
/lams_tool_assessment/web/.../first.gif
- binary
/lams_tool_assessment/web/includes/images/jqGrid.basic.theme/grid-blue-ft.gif
- History
- Source
- Diff
/lams_tool_assessment/.../grid-blue-ft.gif
- binary
/lams_tool_assessment/web/includes/images/jqGrid.basic.theme/grid-blue-hd.gif
- History
- Source
- Diff
/lams_tool_assessment/.../grid-blue-hd.gif
- binary
/lams_tool_assessment/web/includes/images/jqGrid.basic.theme/headerbg.gif
- History
- Source
- Diff
/lams_tool_assessment/web/.../headerbg.gif
- binary
/lams_tool_assessment/web/includes/images/jqGrid.basic.theme/headerleft.gif
- History
- Source
- Diff
/lams_tool_assessment/web/.../headerleft.gif
- binary
/lams_tool_assessment/web/includes/images/jqGrid.basic.theme/headerright.gif
- History
- Source
- Diff
/lams_tool_assessment/web/.../headerright.gif
- binary
/lams_tool_assessment/web/includes/images/jqGrid.basic.theme/ico-close.gif
- History
- Source
- Diff
/lams_tool_assessment/web/.../ico-close.gif
- binary
/lams_tool_assessment/web/includes/images/jqGrid.basic.theme/last.gif
- History
- Source
- Diff
/lams_tool_assessment/web/.../last.gif
- binary
/lams_tool_assessment/web/includes/images/jqGrid.basic.theme/leaf.gif
- History
- Source
- Diff
/lams_tool_assessment/web/.../leaf.gif
- binary
/lams_tool_assessment/web/includes/images/jqGrid.basic.theme/next.gif
- History
- Source
- Diff
/lams_tool_assessment/web/.../next.gif
- binary
/lams_tool_assessment/web/includes/images/jqGrid.basic.theme/off-first.gif
- History
- Source
- Diff
/lams_tool_assessment/web/.../off-first.gif
- binary
/lams_tool_assessment/web/includes/images/jqGrid.basic.theme/off-last.gif
- History
- Source
- Diff
/lams_tool_assessment/web/.../off-last.gif
… 8 more files in changeset.

1:46 pm

lfoxton

More
MAIN:lfoxton:20090401054628
added 4 files
MAIN

LDEV-2173 Adding gradebook images

- binary
/lams_central/web/images/cog.png
- History
- Source
/lams_central/web/images/cog.png
- binary
/lams_central/web/images/find.png
- History
- Source
/lams_central/web/images/find.png
- binary
/lams_central/web/images/table_edit.png
- History
- Source
/lams_central/web/images/table_edit.png
- binary
/lams_central/web/images/tick.png
- History
- Source
/lams_central/web/images/tick.png

11:05 am

lfoxton

More
MAIN:lfoxton:20090401030520
changed 2 files
MAIN

Fixing up unmerged gradebook contexts

- -0
- +1
/lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml
- History
- Source
- Diff
/lams_common/src/.../lams/beanRefContext.xml
- -0
- +5
/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
/lams_common/src/.../lams/commonContext.xml

8:44 am

paulg

More
MAIN:paulg:20090401004411
changed 265 files
MAIN

- 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
- +96
/lams_central/src/java/org/lamsfoundation/lams/webservice/PresenceChatLoggerServlet.java
- History
- Source
/lams_central/.../PresenceChatLoggerServlet.java
- -2
- +2
/lams_central/web/learner.jsp
- History
- Source
- Diff
/lams_central/web/learner.jsp
- -7
- +15
/lams_central/web/includes/javascript/jquery-latest.pack.js
- History
- Source
- Diff
/lams_central/web/.../jquery-latest.pack.js
- -0
- +412
/lams_central/web/includes/javascript/jquery-ui/themes/base/jquery-ui.css
- History
- Source
/lams_central/web/includes/.../base/jquery-ui.css
- -0
- +9
/lams_central/web/includes/javascript/jquery-ui/themes/base/ui.accordion.css
- History
- Source
/lams_central/web/.../base/ui.accordion.css
- -0
- +2
/lams_central/web/includes/javascript/jquery-ui/themes/base/ui.all.css
- History
- Source
/lams_central/web/includes/.../base/ui.all.css
- -0
- +9
/lams_central/web/includes/javascript/jquery-ui/themes/base/ui.base.css
- History
- Source
/lams_central/web/includes/.../base/ui.base.css
- -0
- +37
/lams_central/web/includes/javascript/jquery-ui/themes/base/ui.core.css
- History
- Source
/lams_central/web/includes/.../base/ui.core.css
- -0
- +62
/lams_central/web/includes/javascript/jquery-ui/themes/base/ui.datepicker.css
- History
- Source
/lams_central/web/.../base/ui.datepicker.css
- -0
- +13
/lams_central/web/includes/javascript/jquery-ui/themes/base/ui.dialog.css
- History
- Source
/lams_central/web/includes/.../base/ui.dialog.css
- -0
- +4
/lams_central/web/includes/javascript/jquery-ui/themes/base/ui.progressbar.css
- History
- Source
/lams_central/web/.../base/ui.progressbar.css
- -0
- +13
/lams_central/web/includes/javascript/jquery-ui/themes/base/ui.resizable.css
- History
- Source
/lams_central/web/.../base/ui.resizable.css
- -0
- +17
/lams_central/web/includes/javascript/jquery-ui/themes/base/ui.slider.css
- History
- Source
/lams_central/web/includes/.../base/ui.slider.css
- -0
- +11
/lams_central/web/includes/javascript/jquery-ui/themes/base/ui.tabs.css
- History
- Source
/lams_central/web/includes/.../base/ui.tabs.css
- -0
- +243
/lams_central/web/includes/javascript/jquery-ui/themes/base/ui.theme.css
- History
- Source
/lams_central/web/includes/.../base/ui.theme.css
… 250 more files in changeset.

8:21 am

lfoxton

More
MAIN:lfoxton:20090401002126
changed 8 files
MAIN

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

- -10
- +11
/lams_central/web/gradebook/gradeBookCourseMonitor.jsp
- History
- Source
- Diff
/lams_central/.../gradeBookCourseMonitor.jsp
- -131
- +1
/lams_central/web/gradebook/gradeBookMonitor.jsp
- History
- Source
- Diff
/lams_central/web/.../gradeBookMonitor.jsp
- -0
- +144
/lams_central/web/gradebook/jqGridIncludes.jsp
- History
- Source
/lams_central/web/gradebook/jqGridIncludes.jsp
- -3
- +3
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
- History
- Source
- Diff
/lams_common/.../GBActivityGridRowDTO.java
- -3
- +3
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GBLessonGridRowDTO.java
- -2
- +2
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
- History
- Source
- Diff
/lams_common/src/.../GBUserGridRowDTO.java
- -51
- +0
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/ActivityComparator.java
- History
- Source
- Diff
/lams_common/src/.../ActivityComparator.java
- -65
- +104
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
- History
- Source
- Diff
/lams_common/src/.../Activity.java

7:53 am

lfoxton

More
MAIN:lfoxton:20090331235342
changed 5 files
MAIN

LDEV-2187 Adding time column to activities

and also, added tooltips to monitor view

- -11
- +42
/lams_central/src/java/org/lamsfoundation/lams/gradebook/service/GradeBookService.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookService.java
- -2
- +2
/lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java
- History
- Source
- Diff
/lams_central/src/.../GradeBookAction.java
- -71
- +186
/lams_central/web/gradebook/gradeBookMonitor.jsp
- History
- Source
- Diff
/lams_central/web/.../gradeBookMonitor.jsp
- -4
- +41
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
- History
- Source
- Diff
/lams_common/.../GBActivityGridRowDTO.java
- -0
- +51
/lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/ActivityComparator.java
- History
- Source
/lams_common/src/.../ActivityComparator.java

10:15 pm

Marcin Cieslak

More
MAIN:marcin:20090331141516
changed 1 file
MAIN

LDEV-2041: Changed the character set name to "UTF8", which is the proper canonical name for java.io classes, instead of "UTF-8".

- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
- History
- Source
- Diff
/lams_common/src/java/.../util/FileUtil.java

1:19 pm

mseaton

More
MAIN:mseaton:20090331051931
changed 20 files
MAIN

LDEV-2115 Updated timeChart to use new dictionary registry service (bindable) and global fault handler.

- binary
/lams_flash/src/central/flex/CloudWizard/.actionScriptProperties
- History
- Source
/lams_flash/src/.../.actionScriptProperties
- binary
/lams_flash/src/central/flex/CloudWizard/.flexProperties
- History
- Source
/lams_flash/src/.../CloudWizard/.flexProperties
- -0
- +30
/lams_flash/src/central/flex/CloudWizard/.project
- History
- Source
/lams_flash/src/central/.../CloudWizard/.project
- binary
/lams_flash/src/central/flex/CloudWizard/src/assets/images/ajax-loader-big.swf
- History
- Source
- Diff
/lams_flash/src/.../ajax-loader-big.swf
- binary
/lams_flash/src/central/flex/TimeChart/.actionScriptProperties
- History
- Source
/lams_flash/src/.../.actionScriptProperties
- binary
/lams_flash/src/central/flex/TimeChart/.flexProperties
- History
- Source
/lams_flash/src/.../TimeChart/.flexProperties
- -0
- +30
/lams_flash/src/central/flex/TimeChart/.project
- History
- Source
/lams_flash/src/central/.../TimeChart/.project
- -0
- +3
/lams_flash/src/central/flex/TimeChart/.settings/org.eclipse.core.resources.prefs
- History
- Source
/lams_flash/.../org.eclipse.core.resources.prefs
- binary
/lams_flash/src/central/flex/TimeChart/src/TimeChart.mxml
- History
- Source
- Diff
/lams_flash/src/.../src/TimeChart.mxml
- binary
/lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/ChartManager.as
- History
- Source
- Diff
/lams_flash/src/.../business/ChartManager.as
- binary
/lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/ChartErrorEvent.as
- History
- Source
/lams_flash/src/.../events/ChartErrorEvent.as
- binary
/lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/ChartEvent.as
- History
- Source
- Diff
/lams_flash/src/.../events/ChartEvent.as
- binary
/lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/DictionaryEvent.as
- History
- Source
- Diff
/lams_flash/src/.../events/DictionaryEvent.as
- binary
/lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/maps/MainEventMap.mxml
- History
- Source
- Diff
/lams_flash/src/.../maps/MainEventMap.mxml
- binary
/lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/maps/ModelMap.mxml
- History
- Source
- Diff
/lams_flash/src/.../maps/ModelMap.mxml
… 5 more files in changeset.

12:39 pm

dcarlier

More
MAIN:dcarlier:20090331043935
changed 5 files
MAIN

LDEV-2140 Made it so that tool activities outputs are retrieved once on single click the first time they are clicked, instead of when they are dropped from the toolkit. Also got it working so that when you open an existing design with outputs, it selects the correct one in the gradebook output combo box.