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
Thursday 15 Jun 2006
7:13 am

fmalikoff

Preview changes: (1) when define later activity occurs don't tell the tool that it is define later but display a special screen before going to the next tool (2) for chosen grouping, schedule and permission gates show the normal page with an extra preview message then override the normal process and continue.

Also part A of a change to the Flash call to get the learner progress - it should take the lesson id not the progress id.

Options
    • -5
    • +21
    ./conf/language/ApplicationResources.properties
    • -0
    • +2
    ./conf/xdoclet/struts-forms.xml
    • -7
    • +13
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -17
    • +42
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -10
    • +22
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
    • -4
    • +17
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -3
    • +17
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -3
    • +9
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -4
    • +4
    ./test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
    • -1
    • +1
    ./web/optionsActivity.jsp
    • -0
    • +43
    ./web/previewDefineLater.jsp
    • -0
    • +7
    ./web/WEB-INF/struts/struts-config.xml
    • -11
    • +20
    ./web/gate/gateNext.jsp
    • -1
    • +1
    ./web/grouping/show.jsp
    • -3
    • +15
    ./web/grouping/wait.jsp
Wednesday 14 Jun 2006
12:46 pm

mseaton

get dictionary using country locale if user has property value

Options
    • -1
    • +1
    ./web/controlFrame.jsp
    • binary
    ./web/lams_learner.swf
  3. … 4 more files in changeset.
9:57 am

mseaton

gate fix

Options
    • binary
    ./web/lams_learner.swf
Tuesday 13 Jun 2006
2:52 pm

mseaton

deleted the connection after sending

Options
    • binary
    ./web/passon.swf
2:27 pm

mseaton

added export button

Options
    • binary
    ./web/lams_learner.swf
  2. … 4 more files in changeset.
2:07 pm

mseaton

fixed the parallel activity problem (LDEV 274)

Options
    • binary
    ./web/lams_learner.swf
11:19 am

mseaton

fixed resume button and url called after joining lesson

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

mseaton

used generate ID tag in passon tag to retrieve id from shared session

Options
    • -3
    • +0
    ./web/controlFrame.jsp
    • -1
    • +1
    ./web/lessonComplete.jsp
    • -5
    • +1
    ./web/loadToolActivity.jsp
    • -1
    • +1
    ./web/optionsActivity.jsp
    • binary
    ./web/WEB-INF/tags/Passon.tag
  6. … 1 more file in changeset.
Sunday 11 Jun 2006
3:59 pm

mseaton

added uniqueID param, and redirect for attaching id to request for can be retrieve in jsp

Options
    • binary
    ./web/WEB-INF/tags/Passon.tag
3:57 pm

mseaton

added uniqueID param to custom tag Passon

Options
    • -1
    • +1
    ./web/lessonComplete.jsp
    • -2
    • +8
    ./web/loadToolActivity.jsp
    • -1
    • +1
    ./web/optionsActivity.jsp
3:56 pm

mseaton

updated swf - uniqueID checked for match

Options
    • binary
    ./web/lams_learner.swf
10:48 am

fmalikoff

Call passon to update the progress bar on tool pages, optional activities and the completed screen.

Should also cope with the user partially doing an optional activity, continuing on in the design, then coming back later to the optional activity to do more, and then going back to where they were up to in the sequence before jumping back.

Options
    • -9
    • +9
    ./conf/language/ApplicationResources.properties
    • -3
    • +0
    ./conf/xdoclet/struts-actions.xml
    • -29
    • +57
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -6
    • +70
    ./src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -3
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -58
    • +8
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
    • -0
    • +69
    ./src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
    • -49
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
    • -1
    • +5
    ./web/lessonComplete.jsp
  16. … 4 more files in changeset.
Friday 09 Jun 2006
4:26 pm

mseaton

passon custom tag

Options
    • binary
    ./web/lams_learner.swf
    • -29
    • +2
    ./web/loadToolActivity.jsp
    • binary
    ./web/passon.swf
    • -0
    • +4
    ./web/WEB-INF/lams.tld
    • binary
    ./web/WEB-INF/tags/Passon.tag
  6. … 3 more files in changeset.
12:44 pm

mseaton

unique id used by learner and passon swf to enable direct (unique) connection

Options
    • -3
    • +8
    ./web/controlFrame.jsp
    • binary
    ./web/lams_learner.swf
    • -1
    • +1
    ./web/loadToolActivity.jsp
    • binary
    ./web/passon.swf
12:41 pm

mseaton

added generateID tag

Options
    • -11
    • +30
    ./web/WEB-INF/lams.tld
    • binary
    ./web/WEB-INF/tags/AuthoringButton.tag
  3. … 1 more file in changeset.
8:44 am

mseaton

added passon swf to update progress bar dynamically

Options
    • -0
    • +31
    ./web/loadToolActivity.jsp
    • binary
    ./web/passon.swf
8:04 am

mseaton

use full path url for learner activity url

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

fmalikoff

Changing getLearnerActivityURL so that it returns a suitable url for the optional activity page.

All urls returned in this packet are now full urls, which requires a change on the client end.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java
    • -18
    • +11
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/ParallelActivityMappingStrategy.java
Thursday 08 Jun 2006
1:54 pm

mseaton

added double click functionality to complex activities

Options
    • binary
    ./web/lams_learner.swf
1:17 pm

fmalikoff

Converted parameters to use the common name defined in AttributeNames

Options
    • -5
    • +6
    ./test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java
    • -5
    • +6
    ./test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
    • -6
    • +6
    ./test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java
10:25 am

mseaton

updated swfs - using new common learner progress activity display code

Options
    • binary
    ./web/lams_learner.swf
  2. … 1 more file in changeset.
9:03 am

fmalikoff

Modify progress engine to call the preview urls for tools when the lesson is a preview lesson.

Options
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
    • -6
    • +9
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
Wednesday 07 Jun 2006
11:55 am

mseaton

fixed request params (for joinLesson etc)

Options
    • binary
    ./web/lams_learner.swf
Tuesday 06 Jun 2006
3:29 pm

mseaton

learner currently shows simple tool activitys (no runtime progress updates currently)

Options
    • binary
    ./web/lams_learner.swf
12:37 pm

fmalikoff

Bad definition for the group wait page.

Options
    • -0
    • +7
    ./web/WEB-INF/struts/tiles-defs.xml
10:35 am

fmalikoff

Added support for chosen grouping.

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -9
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -1
    • +1
    ./web/dummyControlFrame.jsp
    • -3
    • +3
    ./web/optionsActivity.jsp
    • -3
    • +0
    ./web/requestURL.jsp
    • -2
    • +7
    ./web/WEB-INF/struts/struts-config.xml
    • -3
    • +8
    ./web/WEB-INF/struts/tiles-defs.xml
    • -1
    • +1
    ./web/grouping/show.jsp
Monday 05 Jun 2006
4:40 pm

mseaton

updated SWF - all required startup requests using lessonID param, complete model creation.

Options
    • binary
    ./web/lams_learner.swf
4:40 pm

mseaton

removed frameset doctype, updated learner url

Options
    • -2
    • +1
    ./web/controlFrame.jsp
Friday 02 Jun 2006
3:56 pm

fmalikoff

Clean up grouping code so that the shared code is in lams.jar, and making it so that learner can't trigger the chosen grouping. I18N the grouping screen and added a wait page for the chosen grouping.

Options
    • -2
    • +7
    ./conf/language/ApplicationResources.properties
    • -22
    • +6
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -46
    • +25
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -1
    • +25
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerServiceException.java
    • -17
    • +23
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -2
    • +2
    ./test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
    • -1
    • +1
    ./web/controlFrame.jsp
    • -79
    • +0
    ./web/grouping/grouping.jsp
    • -0
    • +62
    ./web/grouping/show.jsp
    • -0
    • +46
    ./web/grouping/wait.jsp
    • -0
    • +46
    ./web/layout/groupWaitLayout.jsp
6:58 am

fmalikoff

Random grouping now working. Changed to make learner service changes to stop a hibernate lazy initialisation exception when grouping has just been run. Also reduced the amount of data needed to be cached in the session - only the lesson id is needed not the complete lesson.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -7
    • +10
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -9
    • +9
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -24
    • +17
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -23
    • +18
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -2
    • +2
    ./test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
    • -16
    • +16
    ./test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java