lams / lams_learning / src

java

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
Wednesday 09 May 2007
8:51 am

fmalikoff

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

Options
    • -32
    • +111
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -14
    • +17
    ./org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -46
    • +82
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -3
    • +15
    ./org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -9
    • +11
    ./org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -26
    • +27
    ./org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -3
    • +6
    ./org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -1
    • +2
    ./org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -24
    • +45
    ./org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -8
    • +17
    ./org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -5
    • +1
    ./org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -1
    • +11
    ./org/lamsfoundation/lams/learning/web/form/ActivityForm.java
    • -77
    • +48
    ./org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -2
    • +28
    ./org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
    • -3
    • +38
    ./org/lamsfoundation/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
    ./org/lamsfoundation/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
    ./org/lamsfoundation/lams/learning/export/ExportPortfolioConstants.java
    • -2
    • +12
    ./org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
    • -3
    • +5
    ./org/lamsfoundation/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
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -7
    • +9
    ./org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -3
    • +6
    ./org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -5
    • +3
    ./org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -5
    • +3
    ./org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -66
    • +22
    ./org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -6
    • +8
    ./org/lamsfoundation/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
    ./org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -25
    • +20
    ./org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -8
    • +9
    ./org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -3
    • +36
    ./org/lamsfoundation/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
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -14
    • +17
    ./org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -41
    • +36
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -3
    • +9
    ./org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -20
    • +27
    ./org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -4
    • +19
    ./org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -5
    • +16
    ./org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -2
    • +1
    ./org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -6
    • +17
    ./org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -1
    • +9
    ./org/lamsfoundation/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
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -3
    • +3
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -12
    • +12
    ./org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -2
    • +20
    ./org/lamsfoundation/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
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -20
    • +56
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -9
    • +11
    ./org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -16
    • +19
    ./org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -1
    • +2
    ./org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -21
    • +34
    ./org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -4
    • +1
    ./org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -2
    • +6
    ./org/lamsfoundation/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
    ./org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -1
    • +11
    ./org/lamsfoundation/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
    ./org/lamsfoundation/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
    ./org/lamsfoundation/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
    ./org/lamsfoundation/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
    ./org/lamsfoundation/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
    ./org/lamsfoundation/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
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -2
    • +29
    ./org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -1
    • +8
    ./org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
    • -37
    • +40
    ./org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java
    • -2
    • +2
    ./org/lamsfoundation/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
    ./org/lamsfoundation/lams/learning/web/action/LearnerAction.java
  2. … 4 more files in changeset.
Friday 19 Jan 2007
11:59 am

fmalikoff

LDEV-1125: Getting a blank screen for the next activity if you force complete a user on a parallel activity. The code to calculate the next url was there but the calculated url wasn't being returned to the Action class.

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
Friday 01 Dec 2006
12:33 pm

fmalikoff

Learner stylesheet was always RTL - now detects whether it should be RTL or LTR and gets the right styleheet.

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java
Tuesday 21 Nov 2006
2:54 pm

mseaton

tools export page utf8 encoding + css bundler update to include rtl styles for rtl locale/lang

Options
    • -8
    • +17
    ./org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java
  2. … 5 more files in changeset.
Wednesday 08 Nov 2006
2:39 pm

fmalikoff

LDEV-988: Made the GroupingAction page handle both doing a grouping and going back to the screen later via the progress bar. To do this I had to make change performGrouping so it checks if the grouping has been done before trying to do it. Also changed the completeActivity to move the logic that closes the popup window to completeActivity rather than completeToolSession - now it is called for system tools like grouping as well as the normal tools.

Options
    • -3
    • +5
    ./org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -53
    • +56
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -2
    • +2
    ./org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -40
    • +19
    ./org/lamsfoundation/lams/learning/web/action/GroupingAction.java
Monday 06 Nov 2006
1:51 pm

mseaton

fixed learner - double click on grouping activity + fixed casting error

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
  2. … 2 more files in changeset.
Friday 03 Nov 2006
3:13 pm

fmalikoff

Avoiding a potential null ptr exception, although not sure why we ever end up with no forward!

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
Monday 30 Oct 2006
7:29 am

fmalikoff

Fixing the probem breaking out of a parallel activity within an optional activity. Rather than trying to fix it in the web layer, I've changed the progress engine so that as it processes up the hierarchy of complex activityes, it sets any completed complex activities to be the previous activity. Then the web layer works correctly.

Options
    • -2
    • +4
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -11
    • +2
    ./org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -10
    • +2
    ./org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -5
    • +0
    ./org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -10
    • +1
    ./org/lamsfoundation/lams/learning/web/form/ActivityForm.java
  6. … 1 more file in changeset.
Tuesday 24 Oct 2006
1:38 pm

fmalikoff

Fixed up code for css handling when using http save.

Options
    • -5
    • +9
    ./org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java
1:13 pm

mseaton

fixed for finishing optional act when inside parallel act frame

Options
    • -3
    • +11
    ./org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
  2. … 1 more file in changeset.
12:40 pm

mseaton

fixed escaping from parallel frames when running parallel act as an option in optional activity ldev-817

Options
    • -3
    • +12
    ./org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -1
    • +6
    ./org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -1
    • +11
    ./org/lamsfoundation/lams/learning/web/form/ActivityForm.java
    • -7
    • +16
    ./org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
  5. … 1 more file in changeset.
Thursday 19 Oct 2006
9:26 am

fmalikoff

No longer used - needed for initial development

Options
    • -163
    • +0
    ./org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
9:26 am

fmalikoff

Added comments on some potential synchronisation, to avoid issues when tools call completeToolSession twice in a short time.

Options
    • -8
    • +17
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
Wednesday 04 Oct 2006
3:56 pm

mseaton

journal entries page for teachers - accessible from Monitor (learners tab)

Options
    • -3
    • +72
    ./org/lamsfoundation/lams/learning/web/action/NotebookAction.java
  2. … 16 more files in changeset.
Friday 29 Sep 2006
2:23 pm

mseaton

my notes - add/edit/view notes/journal entries

Options
    • -7
    • +82
    ./org/lamsfoundation/lams/learning/web/action/NotebookAction.java
  2. … 13 more files in changeset.