lams / lams_monitoring / src / java

org

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 17
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 9,883
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 04 Jul 2007
10:15 am

fmalikoff

Branching: Teacher chosen branch screen basically working. Still a bit of clean up on the messages to go.

Options
    • -14
    • +24
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -11
    • +89
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -70
    • +23
    ./lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
    • -4
    • +4
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
  5. … 10 more files in changeset.
5:31 am

fmalikoff

Further work on the teacher chosen branching screen. This included ensuring that the tool sessions aren't created for the activities within a branch when a lesson is created (as the users aren't known in advance) and also ensuring that there is always a grouping object attached to a branching activity during a lesson so that the grouping logic doesn't have to create it.

Options
    • -0
    • +72
    ./lamsfoundation/lams/monitoring/BranchDTO.java
    • -0
    • +86
    ./lamsfoundation/lams/monitoring/BranchingDTO.java
    • -2
    • +3
    ./lamsfoundation/lams/monitoring/ContributeActivityDTO.java
    • -12
    • +36
    ./lamsfoundation/lams/monitoring/ContributeDTOFactory.java
    • -5
    • +3
    ./lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java
    • -14
    • +36
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -126
    • +131
    ./lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
Tuesday 03 Jul 2007
4:07 am

fmalikoff

Branching: Create the Teacher Chosen branching screen, based on the existing Chosen Grouping screen. Not working yet but the changes have required changing the LessonService (in lams.jar) to take Grouping as a parameter, rather than GroupingActivity, so checking in Monitoring changes to match.

Options
    • -9
    • +31
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -38
    • +95
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +392
    ./lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
    • -5
    • +5
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
  5. … 2 more files in changeset.
Tuesday 29 May 2007
6:40 am

fmalikoff

LDEV-1237: Permission gate couldn't be opened if the class export portfolio had been done, as the export set the readonly flag to true and the readonly flag wasn't being reset. Now all fields are reset before the gate screen is displayed.

Options
    • -1
    • +8
    ./lamsfoundation/lams/monitoring/web/GateAction.java
Wednesday 09 May 2007
3:01 am

fmalikoff

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

Options
    • -0
    • +1
    ./lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/web/GateAction.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/InitializeLessonServlet.java
  4. … 72 more files in changeset.
2:51 am

fmalikoff

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

Options
    • -1
    • +21
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -64
    • +74
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  3. … 158 more files in changeset.
Thursday 19 Apr 2007
3:07 am

fmalikoff

Split the scheduling of gates into a separate public method, so I can schedule gates from live edit.

Options
    • -0
    • +1
    ./lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -1
    • +21
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -63
    • +72
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  4. … 1 more file in changeset.
Tuesday 10 Apr 2007
7:03 am

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
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 14 more files in changeset.
Monday 26 Mar 2007
7:57 am

fmalikoff

Merging 2.0.2 changes from the HEAD

Options
    • -1
    • +2
    ./lamsfoundation/lams/monitoring/MonitoringConstants.java
    • -2
    • +15
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -1
    • +47
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/InitializeLessonServlet.java
    • -9
    • +7
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  6. … 14 more files in changeset.
Thursday 15 Mar 2007
6:13 am

mseaton

2.0.2 Fix - LDEV-1166 Used servlet and wddx packet to perform initialize lesson call in replacement of struts action call (url). Removes utf8 encoding problem.

Fixed wizard preloader movie - adjusted position of lams logo

Options
    • -1
    • +2
    ./lamsfoundation/lams/monitoring/MonitoringConstants.java
    • -2
    • +15
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -1
    • +47
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +116
    ./lamsfoundation/lams/monitoring/web/InitializeLessonServlet.java
    • -9
    • +7
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  6. … 11 more files in changeset.
Monday 12 Mar 2007
6:37 am

fmalikoff

Merging 2.0.1 changes from the HEAD

Options
    • -9
    • +16
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -23
    • +41
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -13
    • +19
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  4. … 66 more files in changeset.
Friday 02 Mar 2007
1:00 am

fmalikoff

Removing temporary hack from previous version - have worked out how to delete the tool sessions in authoring for edit on fly, so can go back to preparing the tool sessions as normal.

Options
    • -2
    • +1
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
12:59 am

fmalikoff

Got the basic gate window working in monitoring - needed for the class wide export portfolio.

Options
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/web/GateAction.java
Thursday 01 Mar 2007
9:45 pm

fmalikoff

Temporary fix for deleting activity and their matching tool sessions - just don't create the tool sessions in the first place.

Options
    • -2
    • +3
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
Tuesday 27 Feb 2007
12:12 am

fmalikoff

LDEV-1153: Creator of a lesson is no longer automatically added to the lesson as a learner - they are now only made a learner if they are on the list of learners.

Options
    • -2
    • +1
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
Wednesday 07 Feb 2007
3: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
    • -4
    • +4
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 1 more file in changeset.
Tuesday 06 Feb 2007
6:33 am

fmalikoff

Added some extra privilege checks on various monitoring url calls.

Options
    • -9
    • +16
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -18
    • +37
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -12
    • +13
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  4. … 1 more file in changeset.
1:32 am

fmalikoff

LDEV-1097: The url for the learner progress screen was wrong. The learner progress url shouldn't use the current user's id, it should use the id in the request.

Options
    • -4
    • +9
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
Tuesday 19 Dec 2006
5:29 am

mseaton

changes for adding removal option to monitor

Options
    • -1
    • +4
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 8 more files in changeset.
Wednesday 29 Nov 2006
5:02 am

fmalikoff

LDEV-1042: Allow users to be added to staff group and learner group in a lesson class after the lesson has started. Code has been written for both the LAMS monitoring interface + integration. Neither set of code is tested yet - need the clients to test it.

Options
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -27
    • +30
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  3. … 6 more files in changeset.
Thursday 16 Nov 2006
2:09 am

fmalikoff

Adding a flag to control whether or not the export portfolio button appears on the learner client. Flash sets the flag through either the initializeLesson call or through the learnerExportPortfolioAvailable method.

Options
    • -1
    • +2
    ./lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -3
    • +16
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -18
    • +42
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -2
    • +31
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
Thursday 09 Nov 2006
8:44 am

mseaton

improved handling in lesson status changes - updated revert method to handle multiple activate conditions

Options
    • -4
    • +24
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
Wednesday 25 Oct 2006
5:48 am

mseaton

userID fix for action calls

Options
    • -6
    • +6
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  2. … 1 more file in changeset.
Tuesday 24 Oct 2006
2:01 am

fmalikoff

Put stuff in the request, rather than the session, if at all possible

Options
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
Tuesday 10 Oct 2006
7:17 am

mseaton

getting user ID from session not request

Options
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/web/CreateLessonServlet.java
    • -16
    • +17
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  3. … 2 more files in changeset.
Tuesday 19 Sep 2006
6:55 am

mseaton

i18n for start and schedule date strings

Options
    • -3
    • +4
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -8
    • +21
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  4. … 6 more files in changeset.
Sunday 17 Sep 2006
8:19 am

fmalikoff

Updated address of FSF in copyright statement

Options
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/ContributeActivityDTO.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/ContributeDTOFactory.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/MonitoringConstants.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/URLFactory.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/quartz/job/CloseScheduleGateJob.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/quartz/job/FinishScheduleLessonJob.java
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/quartz/job/MonitoringJob.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/quartz/job/OpenScheduleGateJob.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/quartz/job/StartScheduleLessonJob.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/service/MonitoringServiceException.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/service/MonitoringServiceProxy.java
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/web/CreateLessonServlet.java
  16. … 781 more files in changeset.
Wednesday 13 Sep 2006
7:42 am

fmalikoff

Removed the dummy monitoring page.

Improved the behaviour of scheduled lessons.

* If a lesson is already scheduled and we get another request to schedule it, the second request is ignored. This stops a double submission throwing an exception (quartz would end up with non-unique job names).

* If a lesson is already started and schedule is called on the lesson, an exception is thrown.

* If a lesson is already started as start is called again, then the second start is ignored. This will occur if a lesson is scheduled, then a user goes into monitoring and starts the lesson straight away. The quartz job isn't remove so some time later start will be called again.

Options
    • -20
    • +1
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -18
    • +22
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
7:39 am

fmalikoff

Removed the dummy monitoring page.

Options
    • -156
    • +0
    ./lamsfoundation/lams/monitoring/web/DummyForm.java
    • -361
    • +0
    ./lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java
  3. … 8 more files in changeset.
Thursday 07 Sep 2006
7:24 am

mseaton

use flash user dto instead of normal user dto (serialization issue)

Options
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java