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
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
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/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
    ./src/java/org/lamsfoundation/lams/learning/export/ExportPortfolioConstants.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
    • -2
    • +10
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
    • -14
    • +9
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
  6. … 1 more file in changeset.
Monday 28 May 2007
2:33 pm

mseaton

fixes from todays test session: learner progress to scroll to current act when initially loaded + fix double var use in learner tab and container depths

Options
    • binary
    ./web/lams_learner.swf
  2. … 4 more files in changeset.
Friday 25 May 2007
2:06 pm

Ernie Ghiglione

Updating Greek

Options
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 6 more files in changeset.
Wednesday 23 May 2007
8:04 am

fmalikoff

Debug statement no longer needed.

Options
    • -5
    • +1
    ./src/java/org/lamsfoundation/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
    ./src/java/org/lamsfoundation/lams/learning/export/ExportPortfolioConstants.java
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -6
    • +1
    ./src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -61
    • +0
    ./web/exportPortfolio/notSupported.jsp
Friday 18 May 2007
3:58 pm

Ernie Ghiglione

Updating Greek and Norwegian

Options
    • -3
    • +5
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -9
    • +11
    ./conf/language/lams/ApplicationResources_no_NO.properties
  3. … 4 more files in changeset.
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
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -4
    • +50
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -2
    • +9
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
    • -10
    • +14
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -4
    • +20
    ./web/close.jsp
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
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -10
    • +7
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -2
    • +9
    ./src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java
    • -16
    • +23
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -16
    • +29
    ./test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
    • -2
    • +3
    ./test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java
    • -0
    • +2
    ./web/optionsActivity.jsp
  10. … 4 more files in changeset.
Tuesday 15 May 2007
3:07 pm

fmalikoff

LDEV-1222: Notebook window wasn't popping up in a new window

Options
    • -1
    • +1
    ./web/exportPortfolio/main.jsp
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
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
Wednesday 09 May 2007
4:20 pm

mseaton

merged SWF files (recompiled) from editonfly branch to HEAD

Options
    • binary
    ./web/lams_learner.swf
8:51 am

fmalikoff

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

Options
    • -0
    • +3
    ./conf/xdoclet/struts-actions.xml
    • -1
    • +2
    ./conf/xdoclet/struts-forms.xml
    • -32
    • +111
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -14
    • +17
    ./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -46
    • +82
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -3
    • +15
    ./src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -9
    • +11
    ./src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -26
    • +27
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -24
    • +45
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -8
    • +17
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -5
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java
    • -77
    • +48
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
  16. … 145 more files in changeset.
Tuesday 08 May 2007
10:48 am

Ernie Ghiglione

Updating English

Options
    • -2
    • +4
    ./conf/language/rams/ApplicationResources.properties
    • -2
    • +4
    ./conf/language/rams/ApplicationResources_en_AU.properties
  3. … 6 more files in changeset.
10:32 am

Ernie Ghiglione

Updating English

Options
    • -3
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 6 more files in changeset.
9:11 am

Ernie Ghiglione

Changes in lesson/workflow, lams/rams, student/participant, etc

Options
    • -3
    • +3
    ./conf/language/rams/ApplicationResources.properties
    • -3
    • +3
    ./conf/language/rams/ApplicationResources_en_AU.properties
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
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
3:40 pm

fmalikoff

LDEV-1210: Actual notebook entry not appearing - just said "txtEntry" previously. Problem due to jsp syntax.

Options
    • -1
    • +1
    ./web/exportPortfolio/notebook.jsp
Sunday 29 Apr 2007
6:54 pm

fmalikoff

Removing LAMS from titles

Options
    • -0
    • +1
    ./web/WEB-INF/web.xml
    • -28
    • +19
    ./web/WEB-INF/struts/tiles-defs.xml
    • -4
    • +1
    ./web/layout/gateLayout.jsp
    • -4
    • +1
    ./web/layout/groupWaitLayout.jsp
    • -2
    • +3
    ./web/layout/layout.jsp
Friday 27 Apr 2007
10:14 am

jliew

LDEV-1155 name export portfolios according to lesson name

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learning/export/ExportPortfolioConstants.java
    • -2
    • +12
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
8:40 am

fmalikoff

Updated the FCKEditor tag to remove hardcoded "lams" from path.

Options
    • -0
    • +30
    ./web/WEB-INF/lams.tld
    • binary
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +1
    ./web/WEB-INF/tags/FCKEditor.tag
    • -99
    • +99
    ./web/WEB-INF/tags/Tab.tag
    • -52
    • +52
    ./web/WEB-INF/tags/TabBody.tag
    • -69
    • +69
    ./web/WEB-INF/tags/Tabs.tag
  7. … 50 more files in changeset.
8:21 am

fmalikoff

Updating entries - still a few references to "LAMS" left.

Options
    • -2
    • +2
    ./conf/language/rams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/rams/ApplicationResources_en_AU.properties
  3. … 4 more files in changeset.
Tuesday 24 Apr 2007
7:37 am

fmalikoff

No longer required - language files now split into LAMS and RAMS. These files missed being deleted in cvs when the files were moved.

Options
    • -78
    • +0
    ./conf/language/ApplicationResources.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_ar_JO.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_da_DK.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_el_GR.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_fr_FR.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_ko_KR.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_no_NO.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_pl_PL.properties
    • -78
    • +0
    ./conf/language/ApplicationResources_pt_BR.properties
    • -50
    • +0
    ./conf/language/ApplicationResources_zh_CN.properties
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
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -7
    • +9
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -5
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -5
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -66
    • +22
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -6
    • +8
    ./src/java/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
    ./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