lams

lams_learning

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 20
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 32,912
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 11 Apr 2007
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
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -25
    • +20
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -8
    • +9
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -3
    • +36
    ./src/java/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
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +17
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -14
    • +17
    ./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -41
    • +36
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -3
    • +9
    ./src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -20
    • +27
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -4
    • +19
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -5
    • +16
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -6
    • +17
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -1
    • +9
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
    • -5
    • +1
    ./web/progressBroken.jsp
  14. … 2 more files in changeset.
Tuesday 03 Apr 2007
1:08 pm

fmalikoff

Display an error message if the current activity for a user is null and it can't be recalculated without doing resume, or resume automatically if it was a system gate and the gate activity has been removed.

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    ./conf/xdoclet/struts-actions.xml
    • -1
    • +2
    ./conf/xdoclet/struts-forms.xml
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
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -12
    • +12
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -2
    • +20
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
Wednesday 28 Mar 2007
2:43 pm

fmalikoff

file progressBroken.jsp was initially added on branch editonfly_branching.

Options
    • -0
    • +0
    ./web/progressBroken.jsp
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
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -9
    • +20
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -20
    • +56
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -9
    • +11
    ./src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -16
    • +19
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -21
    • +34
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -4
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -2
    • +6
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -2
    • +2
    ./web/optionsActivity.jsp
    • -0
    • +37
    ./web/progressBroken.jsp
    • -19
    • +10
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +4
    ./web/WEB-INF/struts/tiles-defs.xml
    • -1
    • +1
    ./web/gate/gateNext.jsp
    • -1
    • +1
    ./web/layout/gateLayout.jsp
Tuesday 27 Mar 2007
12:29 pm

mseaton

update to learner for refresh progress bar

Options
    • binary
    ./web/lams_learner.swf
    • binary
    ./web/WEB-INF/tags/Passon.tag
  3. … 4 more files in changeset.
Wednesday 21 Mar 2007
9:01 am

mseaton

updated passon tag

Options
    • binary
    ./web/WEB-INF/tags/Passon.tag
  2. … 13 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
    ./src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java
    • binary
    ./web/lams_learner.swf
    • -1
    • +1
    ./web/loadToolActivity.jsp
    • binary
    ./web/passon.swf
  6. … 14 more files in changeset.
Monday 12 Mar 2007
1:37 pm

fmalikoff

Merging 2.0.1 changes from the HEAD

Options
    • -1
    • +0
    ./build.xml
    • -78
    • +0
    ./conf/language/ApplicationResources_cy_GB.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_de_DE.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_en_AU.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_es_ES.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_it_IT.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_mi_NZ.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_sv_SE.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_vi_VN.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_ar_JO.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_cy_GB.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_da_DK.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
  16. … 54 more files in changeset.
Thursday 08 Mar 2007
11:49 am

fmalikoff

LDEV-1161: First activity wasn't loading in Arabic. The change to add the lesson id to the welcome page (for the join) hadn't been made to the RTL version.

Options
    • -1
    • +1
    ./web/main.jsp
Tuesday 06 Mar 2007
8:41 am

mseaton

updated learner to handle new gate activity (system gate)

Options
    • binary
    ./web/lams_learner.swf
  2. … 1 more file in changeset.
Monday 05 Mar 2007
3:52 pm

fmalikoff

Removing unused libraries

Options
    • -1
    • +0
    ./build.xml
    • binary
    ./web/WEB-INF/lib/dom.jar
    • binary
    ./web/WEB-INF/lib/jaxen-full.jar
    • binary
    ./web/WEB-INF/lib/jaxp-api.jar
    • binary
    ./web/WEB-INF/lib/jdbc2_0-stdext.jar
    • binary
    ./web/WEB-INF/lib/sax.jar
    • binary
    ./web/WEB-INF/lib/saxpath.jar
    • binary
    ./web/WEB-INF/lib/xalan.jar
    • binary
    ./web/WEB-INF/lib/xercesImpl.jar
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
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
Friday 23 Feb 2007
11:22 am

Ernie Ghiglione

Updating English

Options
    • -15
    • +16
    ./conf/language/rams/ApplicationResources.properties
    • -0
    • +79
    ./conf/language/rams/ApplicationResources_en_AU.properties
Tuesday 20 Feb 2007
11:16 am

mseaton

lesson progress data fix

Options
    • binary
    ./web/lams_learner.swf
  2. … 1 more file in changeset.
Saturday 17 Feb 2007
8:02 pm

fmalikoff

Splitting LAMS language files into two sets - LAMS and RAMS

Options
    • -78
    • +0
    ./conf/language/ApplicationResources_cy_GB.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_de_DE.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_en_AU.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_es_ES.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_it_IT.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_mi_NZ.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_sv_SE.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_vi_VN.properties
    • -0
    • +78
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +78
    ./conf/language/lams/ApplicationResources_ar_JO.properties
    • -0
    • +78
    ./conf/language/lams/ApplicationResources_cy_GB.properties
    • -0
    • +78
    ./conf/language/lams/ApplicationResources_da_DK.properties
    • -0
    • +78
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -0
    • +78
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +78
    ./conf/language/lams/ApplicationResources_en_AU.properties
  16. … 420 more files in changeset.
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
    ./src/java/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
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
  2. … 8 more files in changeset.
Friday 09 Feb 2007
10:05 am

Ernie Ghiglione

Updating Welsh, Spanish

Options
    • -24
    • +24
    ./conf/language/ApplicationResources_cy_GB.properties
    • -4
    • +4
    ./conf/language/ApplicationResources_es_ES.properties
  3. … 12 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
    ./src/java/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
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -2
    • +29
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -1
    • +8
    ./src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
    • -37
    • +40
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
  6. … 9 more files in changeset.
Wednesday 31 Jan 2007
10:12 am

mseaton

merged changes to HEAD for ldev-1130

Options
    • binary
    ./web/lams_learner.swf
  2. … 4 more files in changeset.
Tuesday 30 Jan 2007
2:28 pm

mseaton

make learner logo load dynamically

Options
    • binary
    ./web/lams_learner.swf
  2. … 4 more files in changeset.
Monday 29 Jan 2007
12:08 pm

mseaton

moved joinLesson call to jsp ldev-1128

Options
    • -6
    • +65
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -0
    • +6
    ./web/controlFrame.jsp
    • binary
    ./web/lams_learner.swf
    • -1
    • +1
    ./web/main.jsp
    • -2
    • +13
    ./web/welcome.jsp
Sunday 28 Jan 2007
4:07 am

Ernie Ghiglione

Updating Portuguese

Options
    • -3
    • +3
    ./conf/language/ApplicationResources_pt_BR.properties
Tuesday 23 Jan 2007
1:38 pm

mseaton

fixed export button

Options
    • binary
    ./web/lams_learner.swf
Saturday 20 Jan 2007
9:36 am

Ernie Ghiglione

Adding Portuguese

Options
    • -0
    • +78
    ./conf/language/ApplicationResources_pt_BR.properties
  2. … 1 more file in changeset.
Friday 19 Jan 2007
11:59 am

fmalikoff

Updated to match previous changes to LearnerService.

Options
    • -9
    • +9
    ./test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
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
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java