lams / lams_learning / src / java / org

lamsfoundation

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 18
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 10,126
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
Saturday 01 Jul 2006
2:49 pm

fmalikoff

Converted to the learner content styles

Options
    • -1
    • +7
    ./lams/learning/web/action/GroupingAction.java
  2. … 25 more files in changeset.
Friday 30 Jun 2006
5:44 am

fmalikoff

Updating export portfolio for the new stylesheets. New sheets applied and some extra data added to the page (such as learner name). Doesn't look right yet as the images aren't available and the css references have had to be hardcoded and this should be done via the css tag.

Options
    • -1
    • +32
    ./lams/learning/export/Portfolio.java
    • -2
    • +3
    ./lams/learning/export/service/ExportPortfolioService.java
    • -2
    • +8
    ./lams/learning/export/web/action/MainExportServlet.java
  4. … 3 more files in changeset.
Tuesday 27 Jun 2006
1:32 am

fmalikoff

Added user id as a parameter to the export portfolio url for learner. This allows the teacher to download the portfolio for a particular user.

Options
    • -5
    • +20
    ./lams/learning/export/web/action/MainExportServlet.java
Friday 23 Jun 2006
9:57 am

fmalikoff

Fixing null ptr exception - previous activity is sometimes null when doing a subactivity within an optional activity.

Options
    • -2
    • +2
    ./lams/learning/web/util/ActivityMapping.java
9:54 am

fmalikoff

Optional activity wasn't showing title and description - values were missing from the form.

Options
    • -1
    • +3
    ./lams/learning/web/action/DisplayOptionsActivityAction.java
Wednesday 21 Jun 2006
2:02 pm

fmalikoff

Implementing gate and grouping screens for export portfolio.

Options
    • -36
    • +38
    ./lams/learning/export/service/ExportPortfolioService.java
    • -22
    • +51
    ./lams/learning/export/service/PortfolioBuilder.java
    • -7
    • +51
    ./lams/learning/web/action/GroupingAction.java
    • -0
    • +74
    ./lams/learning/web/action/GroupingExportPortfolioServlet.java
    • -2
    • +2
    ./lams/learning/web/util/ActivityMapping.java
  6. … 38 more files in changeset.
Monday 19 Jun 2006
5:34 am

fmalikoff

Adding lessonID to the activity form, so that the passon.swf can have it separately and make it part of the connection name.

Changed form.activityId to form.activityID for consistency.

Options
    • -7
    • +8
    ./lams/learning/web/action/ActivityAction.java
    • -2
    • +2
    ./lams/learning/web/action/DisplayOptionsActivityAction.java
    • -2
    • +2
    ./lams/learning/web/action/DisplayParallelActivityAction.java
    • -2
    • +2
    ./lams/learning/web/action/LoadToolActivityAction.java
    • -6
    • +17
    ./lams/learning/web/form/ActivityForm.java
  6. … 1 more file in changeset.
Sunday 18 Jun 2006
8:51 pm

fyang

remove userDAO reference , use baseDAO instead

Options
    • -2
    • +2
    ./lams/learning/service/LearnerService.java
    • -2
    • +2
    ./lams/learning/web/util/LearningWebUtil.java
8:05 pm

fyang

remove userDAO reference , use baseDAO instead

Options
    • -1
    • +1
    ./lams/learning/learningApplicationContext.xml
    • -14
    • +8
    ./lams/learning/export/service/ExportPortfolioService.java
8:01 pm

fyang

update user related method calls only

Options
    • -4
    • +4
    ./lams/learning/service/LearnerService.java
    • -2
    • +2
    ./lams/learning/web/action/LearnerAction.java
3:06 pm

fmalikoff

Removing learnerProgress from the user's shared session. This should allow preview and learner to run without interfering with each other.

Options
    • -13
    • +27
    ./lams/learning/service/ILearnerService.java
    • -43
    • +56
    ./lams/learning/service/LearnerService.java
    • -29
    • +10
    ./lams/learning/web/action/ActivityAction.java
    • -5
    • +6
    ./lams/learning/web/action/ChooseActivityAction.java
    • -9
    • +7
    ./lams/learning/web/action/CompleteActivityAction.java
    • -8
    • +22
    ./lams/learning/web/action/DisplayActivityAction.java
    • -4
    • +5
    ./lams/learning/web/action/DisplayOptionsActivityAction.java
    • -3
    • +5
    ./lams/learning/web/action/DisplayToolActivityAction.java
    • -1
    • +1
    ./lams/learning/web/action/DummyLearnerAction.java
    • -43
    • +15
    ./lams/learning/web/action/GateAction.java
    • -12
    • +5
    ./lams/learning/web/action/GroupingAction.java
    • -9
    • +5
    ./lams/learning/web/action/LearnerAction.java
    • -3
    • +5
    ./lams/learning/web/action/LoadToolActivityAction.java
    • -5
    • +11
    ./lams/learning/web/util/ActivityMapping.java
    • -81
    • +54
    ./lams/learning/web/util/LearningWebUtil.java
  16. … 11 more files in changeset.
6:55 am

fmalikoff

Changed export portfolio to

* reduce the number of error messages

* move the html out of the I18N file and into jsps

* use the learning design processor so that the activities are processed (and hence displayed) in the correct order.

Options
    • -2
    • +3
    ./lams/learning/learningApplicationContext.xml
    • -0
    • +129
    ./lams/learning/export/ActivityPortfolio.java
    • -13
    • +4
    ./lams/learning/export/ExportPortfolioConstants.java
    • -12
    • +38
    ./lams/learning/export/Portfolio.java
    • -117
    • +0
    ./lams/learning/export/ToolPortfolio.java
    • -428
    • +133
    ./lams/learning/export/service/ExportPortfolioService.java
    • -64
    • +5
    ./lams/learning/export/service/IExportPortfolioService.java
    • -0
    • +206
    ./lams/learning/export/service/PortfolioBuilder.java
    • -2
    • +3
    ./lams/learning/export/web/action/ExportDownloadServlet.java
    • -95
    • +0
    ./lams/learning/export/web/action/ExportNotSupportedServlet.java
    • -162
    • +12
    ./lams/learning/export/web/action/MainExportServlet.java
    • -2
    • +2
    ./lams/learning/web/action/LearnerAction.java
  13. … 6 more files in changeset.
Friday 16 Jun 2006
3:34 am

mseaton

appended lessonID to progressSummary query string

Options
    • -2
    • +14
    ./lams/learning/web/action/ActivityAction.java
Thursday 15 Jun 2006
3:07 am

fmalikoff

Added the define later special screen code to the wrong Action class.

Options
    • -21
    • +9
    ./lams/learning/web/action/DisplayToolActivityAction.java
    • -3
    • +19
    ./lams/learning/web/action/LoadToolActivityAction.java
  3. … 2 more files in changeset.
1:13 am

fmalikoff

Preview changes: (1) when define later activity occurs don't tell the tool that it is define later but display a special screen before going to the next tool (2) for chosen grouping, schedule and permission gates show the normal page with an extra preview message then override the normal process and continue.

Also part A of a change to the Flash call to get the learner progress - it should take the lesson id not the progress id.

Options
    • -7
    • +13
    ./lams/learning/service/ILearnerService.java
    • -17
    • +42
    ./lams/learning/service/LearnerService.java
    • -10
    • +22
    ./lams/learning/web/action/DisplayToolActivityAction.java
    • -4
    • +17
    ./lams/learning/web/action/GateAction.java
    • -3
    • +17
    ./lams/learning/web/action/GroupingAction.java
    • -3
    • +9
    ./lams/learning/web/action/LearnerAction.java
  7. … 9 more files in changeset.
Sunday 11 Jun 2006
4:48 am

fmalikoff

Call passon to update the progress bar on tool pages, optional activities and the completed screen.

Should also cope with the user partially doing an optional activity, continuing on in the design, then coming back later to the optional activity to do more, and then going back to where they were up to in the sequence before jumping back.

Options
    • -29
    • +57
    ./lams/learning/progress/ProgressEngine.java
    • -6
    • +70
    ./lams/learning/web/action/ActivityAction.java
    • -3
    • +7
    ./lams/learning/web/action/ChooseActivityAction.java
    • -1
    • +5
    ./lams/learning/web/action/CompleteActivityAction.java
    • -58
    • +8
    ./lams/learning/web/action/DisplayActivityAction.java
    • -1
    • +4
    ./lams/learning/web/action/DisplayOptionsActivityAction.java
    • -1
    • +3
    ./lams/learning/web/action/DisplayParallelActivityAction.java
    • -1
    • +3
    ./lams/learning/web/action/DisplayToolActivityAction.java
    • -0
    • +69
    ./lams/learning/web/action/LessonCompleteActivityAction.java
    • -2
    • +5
    ./lams/learning/web/action/LoadToolActivityAction.java
    • -49
    • +2
    ./lams/learning/web/util/ActivityMapping.java
    • -2
    • +2
    ./lams/learning/web/util/ActivityMappingStrategy.java
  13. … 7 more files in changeset.
Friday 09 Jun 2006
2:00 am

fmalikoff

Changing getLearnerActivityURL so that it returns a suitable url for the optional activity page.

All urls returned in this packet are now full urls, which requires a change on the client end.

Options
    • -2
    • +2
    ./lams/learning/web/action/DisplayOptionsActivityAction.java
    • -3
    • +2
    ./lams/learning/web/action/DisplayParallelActivityAction.java
    • -18
    • +11
    ./lams/learning/web/util/ActivityMapping.java
    • -3
    • +2
    ./lams/learning/web/util/ActivityMappingStrategy.java
    • -2
    • +2
    ./lams/learning/web/util/ParallelActivityMappingStrategy.java
Thursday 08 Jun 2006
3:03 am

fmalikoff

Modify progress engine to call the preview urls for tools when the lesson is a preview lesson.

Options
    • -3
    • +2
    ./lams/learning/web/action/DisplayToolActivityAction.java
    • -2
    • +2
    ./lams/learning/web/action/LearnerAction.java
    • -4
    • +3
    ./lams/learning/web/action/LoadToolActivityAction.java
    • -6
    • +9
    ./lams/learning/web/util/ActivityMapping.java
Tuesday 06 Jun 2006
4:35 am

fmalikoff

Added support for chosen grouping.

Options
    • -1
    • +2
    ./lams/learning/web/action/DummyLearnerAction.java
    • -2
    • +3
    ./lams/learning/web/action/GroupingAction.java
    • -3
    • +3
    ./lams/learning/web/action/LearnerAction.java
    • -5
    • +5
    ./lams/learning/web/util/ActivityMapping.java
    • -9
    • +7
    ./lams/learning/web/util/LearningWebUtil.java
  6. … 6 more files in changeset.
Friday 02 Jun 2006
9:56 am

fmalikoff

Clean up grouping code so that the shared code is in lams.jar, and making it so that learner can't trigger the chosen grouping. I18N the grouping screen and added a wait page for the chosen grouping.

Options
    • -22
    • +6
    ./lams/learning/service/ILearnerService.java
    • -46
    • +25
    ./lams/learning/service/LearnerService.java
    • -1
    • +25
    ./lams/learning/service/LearnerServiceException.java
    • -17
    • +23
    ./lams/learning/web/action/GroupingAction.java
  5. … 7 more files in changeset.
12:58 am

fmalikoff

Random grouping now working. Changed to make learner service changes to stop a hibernate lazy initialisation exception when grouping has just been run. Also reduced the amount of data needed to be cached in the session - only the lesson id is needed not the complete lesson.

Options
    • -2
    • +2
    ./lams/learning/export/service/ExportPortfolioService.java
    • -7
    • +10
    ./lams/learning/progress/ProgressEngine.java
    • -9
    • +9
    ./lams/learning/service/ILearnerService.java
    • -24
    • +17
    ./lams/learning/service/LearnerService.java
    • -3
    • +3
    ./lams/learning/web/action/ChooseActivityAction.java
    • -3
    • +3
    ./lams/learning/web/action/CompleteActivityAction.java
    • -2
    • +2
    ./lams/learning/web/action/DummyLearnerAction.java
    • -3
    • +3
    ./lams/learning/web/action/GroupingAction.java
    • -3
    • +3
    ./lams/learning/web/action/LearnerAction.java
    • -23
    • +18
    ./lams/learning/web/util/LearningWebUtil.java
  11. … 2 more files in changeset.
Thursday 01 Jun 2006
6:47 am

fmalikoff

Removed the original SessionBean from the system. If needed again, the shared session bean developed by Dapeng can be used.

Fixed various issues with Optional Activities and Parallel activites. Should be able to run through a sequence with them okay now.

Options
    • -0
    • +1
    ./lams/learning/learningApplicationContext.xml
    • -4
    • +10
    ./lams/learning/progress/ProgressEngine.java
    • -23
    • +25
    ./lams/learning/service/LearnerService.java
    • -35
    • +3
    ./lams/learning/web/action/ActivityAction.java
    • -12
    • +1
    ./lams/learning/web/action/CompleteActivityAction.java
    • -2
    • +1
    ./lams/learning/web/action/DisplayActivityAction.java
    • -7
    • +5
    ./lams/learning/web/action/DisplayOptionsActivityAction.java
    • -2
    • +1
    ./lams/learning/web/action/LearnerAction.java
    • -70
    • +0
    ./lams/learning/web/bean/SessionBean.java
    • -3
    • +3
    ./lams/learning/web/util/ActivityMapping.java
  11. … 1 more file in changeset.
Wednesday 31 May 2006
2:37 pm

fmalikoff

Changed calls to update lesson to use the lessonId rather than the lesson. Change allowed us to reduce the amount cached in the context. This fixed various issues with Optional and Parallel activities.

Options
    • -0
    • +1
    ./lams/learning/learningApplicationContext.xml
    • -3
    • +2
    ./lams/learning/export/service/ExportPortfolioService.java
    • -14
    • +24
    ./lams/learning/service/ILearnerService.java
    • -23
    • +34
    ./lams/learning/service/LearnerService.java
    • -15
    • +5
    ./lams/learning/web/action/ChooseActivityAction.java
    • -11
    • +7
    ./lams/learning/web/action/CompleteActivityAction.java
    • -4
    • +7
    ./lams/learning/web/action/DisplayOptionsActivityAction.java
    • -10
    • +6
    ./lams/learning/web/action/DummyLearnerAction.java
    • -5
    • +8
    ./lams/learning/web/action/GateAction.java
    • -11
    • +4
    ./lams/learning/web/action/GroupingAction.java
    • -6
    • +7
    ./lams/learning/web/action/LearnerAction.java
    • -47
    • +5
    ./lams/learning/web/util/LearningWebUtil.java
  13. … 3 more files in changeset.
Tuesday 30 May 2006
9:22 am

fmalikoff

Replaced getActiveLessons with getLesson, to suit the change from listing all the lessons in the learner client to just working with a single lesson.

Also moved the logic to cache the lesson learners into the lams.jar (in the LessonService).

Options
    • -0
    • +1
    ./lams/learning/learningApplicationContext.xml
    • -16
    • +21
    ./lams/learning/service/ILearnerService.java
    • -12
    • +33
    ./lams/learning/service/LearnerService.java
    • -10
    • +4
    ./lams/learning/web/action/GateAction.java
    • -7
    • +3
    ./lams/learning/web/action/GroupingAction.java
    • -62
    • +41
    ./lams/learning/web/action/LearnerAction.java
    • -167
    • +0
    ./lams/learning/web/util/LessonLearnerDataManager.java
  8. … 4 more files in changeset.
Wednesday 17 May 2006
9:25 am

fmalikoff

Implementing the gate screens for learner.

Options
    • -4
    • +4
    ./lams/learning/service/ILearnerService.java
    • -4
    • +5
    ./lams/learning/service/LearnerService.java
    • -13
    • +122
    ./lams/learning/web/action/GateAction.java
  4. … 11 more files in changeset.
Wednesday 10 May 2006
7:29 am

fmalikoff

Moving gate and group url support to a lams_system_tool table - the first "inch" towards making these pluggable tools in a later version of LAMS.

Options
    • -1
    • +6
    ./lams/learning/web/action/DisplayActivityAction.java
    • -8
    • +9
    ./lams/learning/web/action/DisplayToolActivityAction.java
    • -2
    • +3
    ./lams/learning/web/action/LearnerAction.java
    • -17
    • +12
    ./lams/learning/web/action/LoadToolActivityAction.java
    • -12
    • +9
    ./lams/learning/web/util/ActivityMapping.java
    • -12
    • +3
    ./lams/learning/web/util/ActivityMappingStrategy.java
  7. … 9 more files in changeset.
Wednesday 03 May 2006
7:38 am

fmalikoff

Got the existing grouping and gate screens working from the learner interface. More work yet to be done on them.

Options
    • -1
    • +1
    ./lams/learning/learningApplicationContext.xml
    • -16
    • +64
    ./lams/learning/service/ILearnerService.java
    • -31
    • +95
    ./lams/learning/service/LearnerService.java
    • -1
    • +1
    ./lams/learning/web/action/DummyLearnerAction.java
    • -9
    • +14
    ./lams/learning/web/action/GateAction.java
    • -3
    • +3
    ./lams/learning/web/action/GroupingAction.java
    • -11
    • +27
    ./lams/learning/web/action/LearnerAction.java
    • -3
    • +3
    ./lams/learning/web/util/ActivityMapping.java
    • -4
    • +3
    ./lams/learning/web/util/ActivityMappingStrategy.java
  10. … 2 more files in changeset.
Tuesday 02 May 2006
7:27 am

fmalikoff

Worked on the learner progress. Was always going back to the first activity when we exited a lesson - the learner progress in the session was out of date (wasn't updated as the tool's called the complete tool method). The learner progress is now in the special LAMS session object and is updated when tool's call the complete method.

Also set up the string that will be used to inform Flash of the learner's progress. This string (attempted&=completed&=current) will be passed to Flash via passon.swf in the tool display jsp.

Options
    • -3
    • +9
    ./lams/learning/service/LearnerService.java
    • -6
    • +49
    ./lams/learning/web/action/DisplayActivityAction.java
    • -1
    • +1
    ./lams/learning/web/action/DummyLearnerAction.java
    • -5
    • +2
    ./lams/learning/web/action/GroupingAction.java
    • -10
    • +2
    ./lams/learning/web/action/LearnerAction.java
    • -16
    • +14
    ./lams/learning/web/form/ActivityForm.java
    • -20
    • +43
    ./lams/learning/web/util/LearningWebUtil.java
  8. … 3 more files in changeset.
Friday 28 Apr 2006
2:51 am

mseaton

adjusted xdoclet for exit

Options
    • -2
    • +2
    ./lams/learning/web/action/LearnerAction.java
Thursday 27 Apr 2006
9:36 am

fmalikoff

Added "exitted lesson" screen and I18N'd the text of the welcome screen.

Made the Action more robust with respect to exceptions - most exceptions are now caught and a proper error message is sent back to Flash (rather than nothing being returned).

Changed the LearnerActions to not forward to page when the wddx packet is returned. We now have a Flash interface so forwarding to a page (rather than letting Flash bring up the next bad) is now bad. Had to change the dummy learner screen to still forward temporarily otherwise the dummy screen won't display the tool pages.

Options
    • -1
    • +4
    ./lams/learning/service/ILearnerService.java
    • -2
    • +5
    ./lams/learning/service/LearnerService.java
    • -1
    • +54
    ./lams/learning/web/action/DummyLearnerAction.java
    • -101
    • +140
    ./lams/learning/web/action/LearnerAction.java
  5. … 5 more files in changeset.