lams / lams_learning / src / java

org

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 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
    ./lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -53
    • +56
    ./lamsfoundation/lams/learning/service/LearnerService.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/web/action/GateAction.java
    • -40
    • +19
    ./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
    ./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
    ./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
    ./lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -11
    • +2
    ./lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -10
    • +2
    ./lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -5
    • +0
    ./lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -10
    • +1
    ./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
    ./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
    ./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
    ./lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -1
    • +6
    ./lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -1
    • +11
    ./lamsfoundation/lams/learning/web/form/ActivityForm.java
    • -7
    • +16
    ./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
    ./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
    ./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
    ./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
    ./lamsfoundation/lams/learning/web/action/NotebookAction.java
  2. … 13 more files in changeset.
7:24 am

fmalikoff

Added "copy-tags" to the build to make it easier to update the tags.

Updated the jsp pages to support stripes and the separate learner stylesheet.

Options
    • -7
    • +15
    ./lamsfoundation/lams/learning/export/web/action/CSSBundler.java
  2. … 270 more files in changeset.
Thursday 28 Sep 2006
4:04 pm

mseaton

notebook view all page (popup jsp) + add notebook entry or journal (not quite ready) (popup jsp)

Options
    • -0
    • +164
    ./lamsfoundation/lams/learning/web/action/NotebookAction.java
  2. … 15 more files in changeset.
Wednesday 27 Sep 2006
12:24 pm

mseaton

updated notebook export (export portfolio) - private/teacher viewable (public) flag + handling for teacher's exporting a learner's portfolio (only see teacher viewable notes i.e journals)

Options
    • -1
    • +17
    ./lamsfoundation/lams/learning/export/NotebookPortfolio.java
    • -9
    • +13
    ./lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -2
    • +4
    ./lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
    • -10
    • +30
    ./lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -7
    • +14
    ./lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
  6. … 9 more files in changeset.
Tuesday 26 Sep 2006
2:30 pm

mseaton

gets the correct notebook entries for the lesson

Options
    • -8
    • +10
    ./lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
1:53 pm

mseaton

export portfolio - add notebook entries (learner)

Options
    • -0
    • +1
    ./lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +3
    ./lamsfoundation/lams/learning/export/ExportPortfolioConstants.java
    • -0
    • +102
    ./lamsfoundation/lams/learning/export/NotebookPortfolio.java
    • -2
    • +29
    ./lamsfoundation/lams/learning/export/Portfolio.java
    • -6
    • +86
    ./lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -1
    • +3
    ./lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
    • -2
    • +57
    ./lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -1
    • +5
    ./lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
  9. … 5 more files in changeset.
1:08 pm

fmalikoff

Don't allow a user to join a lesson that hasn't been started.

Options
    • -7
    • +20
    ./lamsfoundation/lams/learning/service/LearnerService.java
Sunday 17 Sep 2006
2:09 pm

fmalikoff

Updated address of FSF in copyright statement

Options
    • -2
    • +2
    ./lamsfoundation/lams/learning/export/ActivityPortfolio.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/export/ExportPortfolioConstants.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/export/ExportPortfolioException.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/export/Portfolio.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/export/service/ExportPortfolioServiceProxy.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/export/web/action/CSSBundler.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/progress/ProgressException.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/service/ILearnerService.java
  16. … 571 more files in changeset.
Friday 15 Sep 2006
9:24 am

mseaton

learner fixes for exiting lesson

Options
    • -2
    • +2
    ./lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -3
    • +7
    ./lamsfoundation/lams/learning/service/LearnerService.java
    • -3
    • +4
    ./lamsfoundation/lams/learning/web/action/LearnerAction.java
Wednesday 13 Sep 2006
3:11 pm

mseaton

exit button fix for learner

Options
    • -4
    • +4
    ./lamsfoundation/lams/learning/service/LearnerService.java
    • -6
    • +6
    ./lamsfoundation/lams/learning/web/action/LearnerAction.java
  3. … 2 more files in changeset.
Tuesday 12 Sep 2006
3:03 pm

fmalikoff

Removed calls managing the learner in lesson cache - it isn't being used currently and the implementation didn't clear out users who closed their browsers without doing a proper exit.

Options
    • -3
    • +1
    ./lamsfoundation/lams/learning/service/LearnerService.java
  2. … 4 more files in changeset.
Friday 11 Aug 2006
10:03 am

mseaton

close learner (tool activity) popup window on 'finish' click if tool session/activity completed LDEV-506

Options
    • -3
    • +10
    ./lamsfoundation/lams/learning/service/LearnerService.java
    • -1
    • +8
    ./lamsfoundation/lams/learning/web/util/ActivityMapping.java
  3. … 5 more files in changeset.
Tuesday 25 Jul 2006
2:01 pm

steven

Exception handler define for STRUTS.

Options
    • -105
    • +0
    ./lamsfoundation/lams/learning/util/CustomStrutsExceptionHandler.java
    • -4
    • +0
    ./lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
    • -5
    • +1
    ./lamsfoundation/lams/learning/web/action/GateAction.java
    • -5
    • +1
    ./lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -5
    • +1
    ./lamsfoundation/lams/learning/web/action/LearnerAction.java
  6. … 25 more files in changeset.
9:22 am

mseaton

added methods for moving from one activity to another in the sequence (i.e. skipping a number of activities) - used in preview mode of Learner

Options
    • -0
    • +1
    ./lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +10
    ./lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -1
    • +24
    ./lamsfoundation/lams/learning/service/LearnerService.java
    • -1
    • +84
    ./lamsfoundation/lams/learning/web/action/LearnerAction.java
Tuesday 18 Jul 2006
10:31 am

steven

Add audit service.

Options
    • -2
    • +23
    ./lamsfoundation/lams/learning/web/action/LearnerAction.java
  2. … 3 more files in changeset.
Friday 14 Jul 2006
6:33 am

fmalikoff

Added a new method forwardToLearnerActivityURL, that allow the server to go directly to a url, rather than sending the url to Flash which would then call the url (which is getLearnerActivityURL).

Options
    • -26
    • +69
    ./lamsfoundation/lams/learning/web/action/LearnerAction.java
Thursday 13 Jul 2006
8:07 am

fmalikoff

Improving the "waiting" page for export portfolio. Now styled correctly, updates every 10 secs to give the user feedback and has a close button once the generation is complete. Java code also contains some test code that can be used to test the timeout (commented out).

Options
    • -2
    • +17
    ./lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
  2. … 2 more files in changeset.
Wednesday 12 Jul 2006
12:47 pm

fmalikoff

Moving from a tool activity to a grouped tool activity was throwing an exception as the "create tool session" code (which calls the tool to create the tool session details) was being called within the tool context.

Moved the call to create the tool session into LoadToolActivityAction so that it will always be run within the lams-learning war context and hence all the tools' beans are available in the Spring context.

To try to stop this sort of problem occuring again (ie a tool calling code that relies on all tools' beans being in the context) the ILearnerService has been split into two interfaces. ILearnerService now only contains the one method that should be called by tools (to complete a tool session). All other calls are in ICoreLearnerService. Any of the core modules may use the ICoreLearnerService but only tools should use the ILearnerService.

Options
    • -4
    • +4
    ./lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -2
    • +1
    ./lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
    • -0
    • +245
    ./lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -203
    • +3
    ./lamsfoundation/lams/learning/service/ILearnerService.java
    • -62
    • +56
    ./lamsfoundation/lams/learning/service/LearnerService.java
    • -3
    • +3
    ./lamsfoundation/lams/learning/service/LearnerServiceProxy.java
    • -4
    • +4
    ./lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -3
    • +3
    ./lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -3
    • +3
    ./lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -3
    • +3
    ./lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -3
    • +3
    ./lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -3
    • +3
    ./lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
    • -3
    • +3
    ./lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
    • -3
    • +3
    ./lamsfoundation/lams/learning/web/action/GateAction.java
    • -6
    • +6
    ./lamsfoundation/lams/learning/web/action/GroupingAction.java
  16. … 10 more files in changeset.
Tuesday 11 Jul 2006
3:35 pm

fmalikoff

Learner Progress DTO changes made to so that Flash will know when a learner is finished.

* Current activity now set to null (and hence won't appear in packet) when the learner has completed the lesson.

* New field lessonComplete which is true when the learner has completed the lesson, false otherwise.

Options
    • -2
    • +4
    ./lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/web/util/ActivityMapping.java
  3. … 5 more files in changeset.
9:40 am

fmalikoff

Make it work offline.

Options
    • -1
    • +4
    ./lamsfoundation/lams/learning/web/action/GroupingAction.java
  2. … 1 more file in changeset.