lams-github

lams_learning

Clone Tools

Stats

Commits this week: 1
Total Committers: 28
Last Commit:
Commits this week: 1

Lines of code count not available

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 30 May 2006
3:24 pm

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
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -15
    • +20
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -11
    • +32
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -9
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -6
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -61
    • +40
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -167
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/util/LessonLearnerDataManager.java
    • -11
    • +2
    ./test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
    • -24
    • +0
    ./test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java
    • -16
    • +0
    ./test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
  11. … 1 more file in changeset.
Thursday 25 May 2006
9:07 am

fmalikoff

Temporary indexContent page that points to Flash movies, set up for individual courses/classes rather than the old old organisation model. Done to allow Flash work to be done, while the admin work is in progress.

Options
    • -2
    • +2
    ./web/controlFrame.jsp
    • -3
    • +0
    ./web/dummyControlFrame.jsp
    • -0
    • +48
    ./web/dummymain.jsp
    • -1
    • +1
    ./web/main.jsp
  5. … 17 more files in changeset.
Wednesday 17 May 2006
3:25 pm

fmalikoff

Implementing the gate screens for learner.

Options
    • -0
    • +10
    ./conf/language/ApplicationResources.properties
    • -1
    • +11
    ./conf/xdoclet/struts-forms.xml
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -12
    • +121
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -2
    • +24
    ./web/WEB-INF/struts/struts-config.xml
    • -5
    • +16
    ./web/WEB-INF/struts/tiles-defs.xml
    • -0
    • +14
    ./web/gate/gateNext.jsp
    • -47
    • +0
    ./web/gate/gateWaiting.jsp
    • -0
    • +33
    ./web/gate/permissionGateContent.jsp
    • -0
    • +39
    ./web/gate/scheduleGateContent.jsp
    • -0
    • +46
    ./web/gate/synchGateContent.jsp
    • -53
    • +8
    ./web/layout/activityLayout.jsp
    • -0
    • +52
    ./web/layout/gateLayout.jsp
Wednesday 10 May 2006
1:30 pm

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
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -7
    • +8
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -16
    • +11
    ./src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
    • -11
    • +8
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -11
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
  7. … 9 more files in changeset.
Wednesday 03 May 2006
1:39 pm

fmalikoff

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

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -15
    • +63
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -30
    • +94
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
    • -8
    • +13
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -10
    • +26
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
    • -4
    • +4
    ./test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
  11. … 1 more file in changeset.
1:37 pm

fmalikoff

Changed to UTF-8 encoding

Options
    • -2
    • +2
    ./web/layout/activityLayout.jsp
    • -2
    • +2
    ./web/layout/layout.jsp
Tuesday 02 May 2006
2:15 pm

fmalikoff

Removing the unneeded swfs.

Options
    • -15
    • +40
    ./web/controlFrame.jsp
1:42 pm

fmalikoff

Added the core lams tag files.

Options
    • -0
    • +6
    ./build.xml
    • -22
    • +247
    ./web/WEB-INF/lams.tld
    • -1
    • +1
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +58
    ./web/WEB-INF/tags/HTMLEditor.tag
    • -0
    • +64
    ./web/WEB-INF/tags/SetEditor.tag
    • -0
    • +79
    ./web/WEB-INF/tags/Tab.tag
    • -0
    • +62
    ./web/WEB-INF/tags/TabBody.tag
    • -0
    • +72
    ./web/WEB-INF/tags/Tabs.tag
    • -0
    • +56
    ./web/WEB-INF/tags/headItems.tag
1:42 pm

fmalikoff

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
    • -0
    • +1
    ./web/loadToolActivity.jsp
1:41 pm

fmalikoff

Removing the unneeded swfs.

Options
    • binary
    ./web/LearnerLeftUI.swf
    • binary
    ./web/LearnerTopUI.swf
    • -75
    • +0
    ./web/controlBottomFrame.jsp
    • -55
    • +0
    ./web/controlTopFrame.jsp
    • -84
    • +0
    ./web/dummyControlBottomFrame.jsp
    • -14
    • +48
    ./web/dummyControlFrame.jsp
1:27 pm

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
    • -2
    • +8
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -5
    • +48
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
    • -4
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -9
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -15
    • +13
    ./src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java
    • -19
    • +42
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -3
    • +0
    ./test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java
    • -3
    • +0
    ./test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
    • -5
    • +0
    ./test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java
Friday 28 Apr 2006
8:51 am

mseaton

adjusted xdoclet for exit

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
8:50 am

mseaton

now opens exit screen from exitLesson server response

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

mseaton

added exit action path

Options
    • -1
    • +3
    ./conf/xdoclet/struts-actions.xml
    • -1
    • +13
    ./web/WEB-INF/struts/struts-config.xml
Thursday 27 Apr 2006
3:36 pm

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
    • -2
    • +10
    ./conf/language/ApplicationResources.properties
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -1
    • +54
    ./src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
    • -98
    • +137
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -0
    • +4
    ./web/WEB-INF/struts/tiles-defs.xml
    • -1
    • +1
    ./web/dummyControlBottomFrame.jsp
    • -0
    • +34
    ./web/exit.jsp
    • -2
    • +3
    ./web/welcome.jsp
3:15 pm

mseaton

Added resume/exit header buttons + LAMS logo + retrieve progress data when joining lesson/sequence

Options
    • binary
    ./web/lams_learner.swf
Wednesday 26 Apr 2006
3:37 pm

mseaton

Updated SWF targeting content frame when joining lesson

Options
    • binary
    ./web/lams_learner.swf
2:54 pm

mseaton

new Learner SWF (under development)

Options
    • binary
    ./web/lams_learner.swf
2:52 pm

mseaton

changed SWF url

Options
    • -1
    • +1
    ./web/controlBottomFrame.jsp
Monday 24 Apr 2006
12:26 pm

fmalikoff

Added real learner page back in (with a link from the dummy page) so that mitch can set up the Flash movie. Also set the charset/encoding for these pages to UTF-8

Options
    • -3
    • +7
    ./conf/language/ApplicationResources.properties
    • -5
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
    • -2
    • +2
    ./web/WEB-INF/struts/struts-config.xml
    • -62
    • +37
    ./web/controlBottomFrame.jsp
    • -5
    • +4
    ./web/controlFrame.jsp
    • -2
    • +2
    ./web/controlTopFrame.jsp
    • -0
    • +84
    ./web/dummyControlBottomFrame.jsp
    • -0
    • +50
    ./web/dummyControlFrame.jsp
    • -0
    • +2
    ./web/exportWaitingPage.jsp
    • -1
    • +1
    ./web/lessonComplete.jsp
    • -1
    • +1
    ./web/loadToolActivity.jsp
    • -2
    • +2
    ./web/login.jsp
    • -4
    • +4
    ./web/main.jsp
    • -1
    • +1
    ./web/optionsActivity.jsp
    • -1
    • +1
    ./web/parallelActivity.jsp
    • -1
    • +1
    ./web/partialCompleted.jsp
    • -1
    • +2
    ./web/requestURL.jsp
Friday 21 Apr 2006
4:15 pm

fmalikoff

Fixed the export portfolio - when the resource files were renamed I missed a hardcoded entry in the constants.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/export/ExportPortfolioConstants.java
Friday 14 Apr 2006
2:42 pm

fmalikoff

Tool deployment utility has been changed to update the context path and class path when the tool is deployed. Conf versions of web-settings and manifest files modified to suit and the main tool context application file moved so that only the tool's have a context file classpath of /org/lamsfoundation/lams/tool.

Options
    • -1
    • +1
    ./conf/war/META-INF/MANIFEST.MF
    • -9
    • +2
    ./conf/xdoclet/web-settings.xml
    • -1
    • +1
    ./test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
    • -1
    • +1
    ./test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
    • -1
    • +1
    ./test/java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java
    • -1
    • +1
    ./test/web/WEB-INF/web.xml
    • -8
    • +2
    ./web/WEB-INF/web.xml
  8. … 3 more files in changeset.
Wednesday 12 Apr 2006
7:58 am

fmalikoff

Added the vote tool to the build

Options
    • -1
    • +1
    ./conf/war/META-INF/MANIFEST.MF
    • -0
    • +1
    ./conf/xdoclet/web-settings.xml
  3. … 5 more files in changeset.
Monday 10 Apr 2006
7:09 pm

fmalikoff

Renaming applicationResources.properties to ApplicationResources.properties

Options
    • -0
    • +28
    ./conf/language/ApplicationResources.properties
    • -28
    • +0
    ./conf/language/LearningResources.properties
    • -1
    • +1
    ./conf/xdoclet/struts-message-resources.xml
    • -1
    • +1
    ./conf/xdoclet/web-settings.xml
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +1
    ./web/WEB-INF/web.xml
  7. … 26 more files in changeset.
Friday 07 Apr 2006
8:36 am

fmalikoff

Updated copyright statement - only support GPL v 2.0

Options
    • -23
    • +0
    ./build.xml
    • -19
    • +0
    ./conf/xdoclet/filter-mappings.xml
    • -21
    • +0
    ./conf/xdoclet/filters.xml
    • -21
    • +0
    ./conf/xdoclet/global-forwards.xml
    • -21
    • +0
    ./conf/xdoclet/servlet-mappings.xml
    • -21
    • +0
    ./conf/xdoclet/servlets.xml
    • -20
    • +0
    ./conf/xdoclet/struts-actions.xml
    • -20
    • +0
    ./conf/xdoclet/struts-forms.xml
    • -20
    • +0
    ./conf/xdoclet/struts-message-resources.xml
    • -20
    • +0
    ./conf/xdoclet/struts-plugins.xml
    • -20
    • +0
    ./conf/xdoclet/web-settings.xml
    • -140
    • +37
    ./test/web/WEB-INF/struts/struts-config.xml
    • -13
    • +13
    ./test/web/WEB-INF/struts/tiles-defs.xml
    • -213
    • +162
    ./test/web/WEB-INF/web.xml
    • -106
    • +2
    ./web/WEB-INF/struts/struts-config.xml
  16. … 25 more files in changeset.
Thursday 06 Apr 2006
7:08 am

fmalikoff

Updated copyright statement - only support GPL v 2.0

Options
    • -25
    • +23
    ./src/java/org/lamsfoundation/lams/learning/export/ExportPortfolioConstants.java
    • -25
    • +23
    ./src/java/org/lamsfoundation/lams/learning/export/ExportPortfolioException.java
    • -5
    • +23
    ./src/java/org/lamsfoundation/lams/learning/export/Portfolio.java
    • -25
    • +23
    ./src/java/org/lamsfoundation/lams/learning/export/ToolPortfolio.java
    • -26
    • +23
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -27
    • +23
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioServiceProxy.java
    • -25
    • +23
    ./src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
    • -27
    • +23
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
    • -5
    • +23
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ExportNotSupportedServlet.java
    • -25
    • +23
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
    • -19
    • +22
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -20
    • +23
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressException.java
    • -20
    • +23
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -6
    • +7
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -20
    • +23
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerServiceException.java
  16. … 52 more files in changeset.
Tuesday 04 Apr 2006
9:35 am

fmalikoff

Display the activity title and description int the portfolio, rather than tool details, as the activity fields may be edited by the user but the tool values are system values. Struts action for ExportAction not used.

Options
    • -106
    • +77
    ./web/WEB-INF/struts/struts-config.xml
9:33 am

fmalikoff

Display the activity title and description int the portfolio, rather than tool details, as the activity fields may be edited by the user but the tool values are system values. JSP not used.

Options
    • -37
    • +0
    ./web/exportPortfolio.jsp
    • -57
    • +0
    ./web/exportPortfolioPrintVersion.jsp
9:33 am

fmalikoff

Display the activity title and description int the portfolio, rather than tool details, as the activity fields may be edited by the user but the tool values are system values. This action class is not used.

Options
    • -113
    • +0
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ExportPortfolioAction.java
9:32 am

fmalikoff

Display the activity title and description int the portfolio, rather than tool details, as the activity fields may be edited by the user but the tool values are system values. Moved the ordered list tags into the Servlet code, so that the code could completely replace the ordered list section with something else, without touching the translations.

Options
    • -2
    • +4
    ./conf/language/LearningResources.properties
    • -4
    • +10
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java