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
Thursday 12 Jul 2007
8:59 am

fmalikoff

Refactoring code so that all screens can update the progress bar.

Options
    • -97
    • +1
    ./lams/learning/web/action/ActivityAction.java
    • -4
    • +6
    ./lams/learning/web/action/BranchingActivityAction.java
    • -4
    • +3
    ./lams/learning/web/action/ChooseActivityAction.java
    • -7
    • +3
    ./lams/learning/web/action/CompleteActivityAction.java
    • -3
    • +3
    ./lams/learning/web/action/DisplayActivityAction.java
    • -2
    • +2
    ./lams/learning/web/action/DisplayOptionsActivityAction.java
    • -4
    • +6
    ./lams/learning/web/action/DisplayParallelActivityAction.java
    • -3
    • +5
    ./lams/learning/web/action/DisplayToolActivityAction.java
    • -11
    • +13
    ./lams/learning/web/action/GateAction.java
    • -5
    • +4
    ./lams/learning/web/action/GroupingAction.java
    • -3
    • +4
    ./lams/learning/web/action/LessonCompleteActivityAction.java
    • -2
    • +2
    ./lams/learning/web/action/LoadToolActivityAction.java
    • -12
    • +2
    ./lams/learning/web/action/SequenceActivityAction.java
    • -4
    • +9
    ./lams/learning/web/util/ActivityMappingStrategy.java
    • -1
    • +105
    ./lams/learning/web/util/LearningWebUtil.java
  16. … 4 more files in changeset.
Wednesday 04 Jul 2007
11:33 am

fmalikoff

Branching: Branching activities always have a grouping during a lesson, as this is set up at lesson creation time. But they might not have any groups!

Options
    • -2
    • +2
    ./lams/learning/service/LearnerService.java
Tuesday 03 Jul 2007
10:05 am

fmalikoff

Branching: moved the types to the BranchingActivity so they can be accessed from learner and monitor.

Options
    • -8
    • +4
    ./lams/learning/web/action/BranchingActivityAction.java
Friday 29 Jun 2007
3:28 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -2
    • +3
    ./lams/learning/web/action/SequenceActivityAction.java
  2. … 2 more files in changeset.
1:35 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -2
    • +2
    ./lams/learning/web/action/SequenceActivityAction.java
Thursday 28 Jun 2007
2:49 pm

fmalikoff

Stop it deploying the classes directory under WEB-INF - this can give us class conflicts as the code ends up in two places.

Options
    • -20
    • +18
    ./lams/learning/learningApplicationContext.xml
    • -37
    • +24
    ./lams/learning/progress/ProgressEngine.java
    • -1
    • +18
    ./lams/learning/service/ICoreLearnerService.java
    • -19
    • +122
    ./lams/learning/service/LearnerService.java
    • -9
    • +1
    ./lams/learning/web/action/ActivityAction.java
    • -52
    • +72
    ./lams/learning/web/action/BranchingActivityAction.java
    • -2
    • +2
    ./lams/learning/web/action/ChooseActivityAction.java
    • -2
    • +2
    ./lams/learning/web/action/CompleteActivityAction.java
    • -2
    • +2
    ./lams/learning/web/action/DisplayOptionsActivityAction.java
    • -2
    • +2
    ./lams/learning/web/action/DisplayToolActivityAction.java
    • -10
    • +2
    ./lams/learning/web/action/GateAction.java
    • -11
    • +4
    ./lams/learning/web/action/GroupingAction.java
    • -3
    • +3
    ./lams/learning/web/action/LoadToolActivityAction.java
    • -0
    • +113
    ./lams/learning/web/action/SequenceActivityAction.java
    • -3
    • +7
    ./lams/learning/web/util/ActivityMappingStrategy.java
  16. … 11 more files in changeset.
Tuesday 12 Jun 2007
7:42 am

fmalikoff

LDEV-1134: Dummying up a branching page for the progress engine. Had missed the entry for the abstract branching class in the Hibernate file when I switched from 1 branching class to 3.

Options
    • -3
    • +4
    ./lams/learning/progress/ProgressEngine.java
    • -0
    • +121
    ./lams/learning/web/action/BranchingActivityAction.java
    • -1
    • +5
    ./lams/learning/web/util/ActivityMappingStrategy.java
  4. … 4 more files in changeset.
Tuesday 29 May 2007
7:13 pm

fmalikoff

LDEV-1241: Problem with progess engine getting stuck when a user is in a parallel activity within an optional activity required a change to the LearnerProgress.setProgressState() method call. Learner classes changed to match.

Options
    • -4
    • +9
    ./lams/learning/progress/ProgressEngine.java
    • -4
    • +4
    ./lams/learning/service/LearnerService.java
2:17 pm

jliew

LDEV-1155 revert to storing temp portfolio on server as a constant 'export.zip'; URLEncoded the portfolio name when it is passed as a URL parameter (for i18n purposes); strip out punctuation chars from the export portfolio filename that is downloaded by users.

Options
    • -1
    • +2
    ./lams/learning/export/ExportPortfolioConstants.java
    • -2
    • +3
    ./lams/learning/export/service/ExportPortfolioService.java
    • -2
    • +2
    ./lams/learning/export/service/IExportPortfolioService.java
    • -2
    • +10
    ./lams/learning/export/web/action/ExportDownloadServlet.java
    • -14
    • +9
    ./lams/learning/export/web/action/MainExportServlet.java
  6. … 1 more file in changeset.
Wednesday 23 May 2007
8:04 am

fmalikoff

Debug statement no longer needed.

Options
    • -5
    • +1
    ./lams/learning/export/web/action/CSSBundler.java
Tuesday 22 May 2007
2:06 pm

fmalikoff

LDEV-1225: While testing, found that the notSupported.jsp doesn't work properly. This page only appeared when the system tools (gates and grouping) don't work in export portfolio properly, so its not worth trying to fix it. Now if they don't work there is an entry in the main page but no "no supported" page.

Options
    • -2
    • +1
    ./lams/learning/export/ExportPortfolioConstants.java
    • -2
    • +4
    ./lams/learning/export/service/ExportPortfolioService.java
    • -6
    • +1
    ./lams/learning/export/service/PortfolioBuilder.java
  4. … 1 more file in changeset.
Friday 18 May 2007
3:19 pm

fmalikoff

LDEV-1182 & LDEV-1126: Fixing up behaviour of the close.jsp - which is called when the user completes an activity that was already finished. There were problems with the parallel activities when one was finished and the user clicked resume (or restarted learner) and with force complete. Now instead of just showing the "close" message, it detects that it is not in the popup window and instead of trying to close it now forwards to the next appropriate screen.

Options
    • -3
    • +10
    ./lams/learning/web/action/DisplayActivityAction.java
    • -7
    • +7
    ./lams/learning/web/action/LearnerAction.java
    • -4
    • +50
    ./lams/learning/web/util/ActivityMapping.java
    • -2
    • +9
    ./lams/learning/web/util/ActivityMappingStrategy.java
    • -10
    • +14
    ./lams/learning/web/util/LearningWebUtil.java
  6. … 1 more file in changeset.
Wednesday 16 May 2007
7:39 am

fmalikoff

LDEV-1051 and LDEV-1198: Fixed the break out of frames logic for parallels at the end of a design and inside an optional activity.

Options
    • -8
    • +21
    ./lams/learning/progress/ProgressEngine.java
    • -2
    • +4
    ./lams/learning/service/ICoreLearnerService.java
    • -10
    • +7
    ./lams/learning/service/LearnerService.java
    • -1
    • +2
    ./lams/learning/web/action/DisplayOptionsActivityAction.java
    • -2
    • +9
    ./lams/learning/web/form/OptionsActivityForm.java
    • -16
    • +23
    ./lams/learning/web/util/ActivityMapping.java
  7. … 7 more files in changeset.
Monday 14 May 2007
11:04 am

jliew

LDEV-1155 filename parameter in response parameter needs to be enclosed by quotes otherwise firefox truncates the filename when it encounters the first space

Options
    • -7
    • +3
    ./lams/learning/export/web/action/ExportDownloadServlet.java
Wednesday 09 May 2007
8:51 am

fmalikoff

Merging RAMS and Edit On Fly changes from branch to the head.

Options
    • -32
    • +111
    ./lams/learning/progress/ProgressEngine.java
    • -14
    • +17
    ./lams/learning/service/ICoreLearnerService.java
    • -46
    • +82
    ./lams/learning/service/LearnerService.java
    • -3
    • +15
    ./lams/learning/web/action/ActivityAction.java
    • -9
    • +11
    ./lams/learning/web/action/ChooseActivityAction.java
    • -26
    • +27
    ./lams/learning/web/action/CompleteActivityAction.java
    • -3
    • +6
    ./lams/learning/web/action/DisplayActivityAction.java
    • -1
    • +2
    ./lams/learning/web/action/DisplayOptionsActivityAction.java
    • -24
    • +45
    ./lams/learning/web/action/GateAction.java
    • -8
    • +17
    ./lams/learning/web/action/GroupingAction.java
    • -5
    • +1
    ./lams/learning/web/action/LearnerAction.java
    • -1
    • +11
    ./lams/learning/web/form/ActivityForm.java
    • -77
    • +48
    ./lams/learning/web/util/ActivityMapping.java
    • -2
    • +28
    ./lams/learning/web/util/ActivityMappingStrategy.java
    • -3
    • +38
    ./lams/learning/web/util/LearningWebUtil.java
  16. … 145 more files in changeset.
Friday 04 May 2007
3:48 pm

fmalikoff

LDEV-1210: While fixing the notebook text entry, I cleaned up processNotes to reduce processing - there was processing there that had no effect!

Options
    • -21
    • +13
    ./lams/learning/export/service/ExportPortfolioService.java
Friday 27 Apr 2007
10:14 am

jliew

LDEV-1155 name export portfolios according to lesson name

Options
    • -3
    • +3
    ./lams/learning/export/ExportPortfolioConstants.java
    • -2
    • +12
    ./lams/learning/export/web/action/ExportDownloadServlet.java
    • -3
    • +5
    ./lams/learning/export/web/action/MainExportServlet.java
Wednesday 11 Apr 2007
3:05 pm

fmalikoff

Converted the CompleteActivity logic to use a forward, rather than a redirect, to make it more efficient.

Options
    • -6
    • +8
    ./lams/learning/progress/ProgressEngine.java
    • -7
    • +9
    ./lams/learning/web/action/CompleteActivityAction.java
    • -3
    • +6
    ./lams/learning/web/action/DisplayActivityAction.java
    • -5
    • +3
    ./lams/learning/web/action/GateAction.java
    • -5
    • +3
    ./lams/learning/web/action/GroupingAction.java
    • -66
    • +22
    ./lams/learning/web/util/ActivityMapping.java
    • -6
    • +8
    ./lams/learning/web/util/LearningWebUtil.java
7:32 am

fmalikoff

Refactoring the "complete activity" logic so that tools, gates and grouping screens all complete in the same way. Without this change, when the gates and grouping screens were opened in popup window (after completion), it tried to go to the next activity rather than closing the window.

Options
    • -22
    • +11
    ./lams/learning/web/action/CompleteActivityAction.java
    • -25
    • +20
    ./lams/learning/web/action/GateAction.java
    • -8
    • +9
    ./lams/learning/web/action/GroupingAction.java
    • -3
    • +36
    ./lams/learning/web/util/LearningWebUtil.java
Tuesday 10 Apr 2007
1:03 pm

fmalikoff

Breaking the completeToolSession functionality into two parts. Now the tool session is completed but it forwards to another call to complete the activity and calculate the next activity. This is to reduce the chances of collisions when live edit is being started, in a clustering environment. See the live edit wiki page for more details.

Options
    • -5
    • +17
    ./lams/learning/progress/ProgressEngine.java
    • -14
    • +17
    ./lams/learning/service/ICoreLearnerService.java
    • -41
    • +36
    ./lams/learning/service/LearnerService.java
    • -3
    • +9
    ./lams/learning/web/action/ActivityAction.java
    • -20
    • +27
    ./lams/learning/web/action/CompleteActivityAction.java
    • -4
    • +19
    ./lams/learning/web/action/GateAction.java
    • -5
    • +16
    ./lams/learning/web/action/GroupingAction.java
    • -2
    • +1
    ./lams/learning/web/action/LearnerAction.java
    • -6
    • +17
    ./lams/learning/web/util/ActivityMapping.java
    • -1
    • +9
    ./lams/learning/web/util/ActivityMappingStrategy.java
  11. … 5 more files in changeset.
Friday 30 Mar 2007
1:02 pm

fmalikoff

More handling for "null" current/next activity - needed for the stop gates being removed.

Also now check that any activity being commenced isn't a live edit + not read only activity. This will stop any user that evades the stop gates from making activities after the stop gate read only - they will not be able to do the next activity. Given that the learning design is already loaded into memory, it shouldn't add greatly to the progress engine steps (not compared to everything else!)

Options
    • -24
    • +73
    ./lams/learning/progress/ProgressEngine.java
    • -3
    • +3
    ./lams/learning/service/LearnerService.java
    • -12
    • +12
    ./lams/learning/web/util/ActivityMapping.java
    • -2
    • +20
    ./lams/learning/web/util/ActivityMappingStrategy.java
Wednesday 28 Mar 2007
2:41 pm

fmalikoff

Trying to make progress engine cope with "holes" in the progress ie if the user's current activity disappears (e.g. temporary system gate and live edit end)

Options
    • -9
    • +20
    ./lams/learning/progress/ProgressEngine.java
    • -20
    • +56
    ./lams/learning/service/LearnerService.java
    • -9
    • +11
    ./lams/learning/web/action/ChooseActivityAction.java
    • -16
    • +19
    ./lams/learning/web/action/CompleteActivityAction.java
    • -1
    • +2
    ./lams/learning/web/action/DisplayOptionsActivityAction.java
    • -21
    • +34
    ./lams/learning/web/action/GateAction.java
    • -4
    • +1
    ./lams/learning/web/action/LearnerAction.java
    • -2
    • +6
    ./lams/learning/web/util/ActivityMapping.java
  9. … 7 more files in changeset.
Tuesday 20 Mar 2007
3:05 pm

mseaton

updated hibernate config file for learning design table + fixed monitor locked view control + learner learning design update triggered by version value in passon swf

Options
    • -1
    • +7
    ./lams/learning/web/action/ActivityAction.java
    • -1
    • +11
    ./lams/learning/web/form/ActivityForm.java
  3. … 17 more files in changeset.
Monday 12 Mar 2007
1:37 pm

fmalikoff

Merging 2.0.1 changes from the HEAD

Options
    • -3
    • +7
    ./lams/learning/web/action/GroupingAction.java
  2. … 68 more files in changeset.
Friday 02 Mar 2007
5:33 am

fmalikoff

Got the basic gate window working in learner - system gate had the wrong type id and needed to inherit from PermissionGate to pick up the default screen.

Options
    • -2
    • +2
    ./lams/learning/web/action/GateAction.java
Tuesday 13 Feb 2007
3:11 pm

mseaton

fixed read only setting for optional activity children + further validation for trying to add transition to a read only activity

Options
    • -1
    • +6
    ./lams/learning/service/LearnerService.java
  2. … 3 more files in changeset.
1:43 pm

mseaton

Updated author validation on read-only activities and transitions in Edit-on-the-Fly mode. Read only field is set when activity is attempted (ProgressEngine).

Options
    • -2
    • +7
    ./lams/learning/progress/ProgressEngine.java
  2. … 8 more files in changeset.
Wednesday 07 Feb 2007
10:44 am

fmalikoff

LDEV-1097: Remove the finish button from the learner progress view of the grouping screen, plus updated some out of date method calls relating to force complete.

Options
    • -3
    • +7
    ./lams/learning/web/action/GroupingAction.java
  2. … 1 more file in changeset.
Thursday 01 Feb 2007
11:42 am

fmalikoff

LDEV-1131: If the user is using a custom stylesheet, export portfolio wasn't copying the images directory for the stylesheet. Changed the export so it now copies the theme's special images (using the new image_directory column in the theme) as well as the default images.

Options
    • -0
    • +1
    ./lams/learning/learningApplicationContext.xml
    • -2
    • +29
    ./lams/learning/export/service/ExportPortfolioService.java
    • -1
    • +8
    ./lams/learning/export/service/IExportPortfolioService.java
    • -37
    • +40
    ./lams/learning/export/web/action/CSSBundler.java
    • -2
    • +2
    ./lams/learning/export/web/action/MainExportServlet.java
  6. … 9 more files in changeset.
Monday 29 Jan 2007
12:08 pm

mseaton

moved joinLesson call to jsp ldev-1128

Options
    • -6
    • +65
    ./lams/learning/web/action/LearnerAction.java
  2. … 4 more files in changeset.