Activity lams-github/lams_monitoring/src/java/org

9:25 am

fmalikoff

More
58daf95
changed 5 files
v4.7, v4.8

LDEV-67: Run sequences were not going in the correct workspace folder. Now when the lesson starts, the learning design is placed in the default runtime sequence folder. If such a folder does not exist, the learning design is placed in the original folder. Also changed lams.jar to add a default runtime sequence folder to the workspace object.

Also cleaned up MonitoringService - removed a few member variables and methods that are no longer used, and removed the matching entries from the context file.

- -1
- +0
./lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
- History
- Source
- Diff
./lamsfoundation/.../monitoringApplicationContext.xml
- -2
- +1
./lamsfoundation/lams/monitoring/service/IMonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../IMonitoringService.java
- -26
- +18
./lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringService.java
- -1
- +3
./lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../DummyMonitoringAction.java
… 1 more file in changeset.

7:21 pm

fmalikoff

More
56e8c3e
changed 2 files
v4.7, v4.8

Modified the dummy monitoring screen to support the new Activity.getAuthoringActivityDTOSet() method.

- -4
- +11
./lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../DummyMonitoringAction.java
… 1 more file in changeset.

10:07 am

fmalikoff

More
402ad79
changed 3 files
v4.7, v4.8

Fixed display of the parallel activities on the dummy monitoring screen. Previously it was using the activities from in the learning design and the parallel activity was a CGLIB entry, which didn't give access to the activities method. Added a new session parameter, activities, which contains a set of AuthoringActivityDTO objects and these are used in the place of the learning design.

- -2
- +28
./lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../DummyMonitoringAction.java
… 2 more files in changeset.

7:53 pm

fmalikoff

More
65b1fec
changed 2 files
v4.7, v4.8

The rule to work out whether to pre-initialise the tool session was wrong. Was initialising for grouped activities, we want to initialise the non-grouped activities.

- -1
- +1
./lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringService.java
… 1 more file in changeset.

2:08 pm

fmalikoff

More
0518a39
changed 7 files
v4.7, v4.8

Added archive a lesson feature

- -0
- +1
./lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
- History
- Source
- Diff
./lamsfoundation/.../monitoringApplicationContext.xml
- -0
- +7
./lamsfoundation/lams/monitoring/service/IMonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../IMonitoringService.java
- -1
- +19
./lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringService.java
- -1
- +30
./lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../DummyMonitoringAction.java
- -8
- +37
./lamsfoundation/lams/monitoring/web/MonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringAction.java
… 2 more files in changeset.

1:11 pm

fmalikoff

More
04ddbcc
changed 15 files
v4.7, v4.8

Regigged the dummy monitoring screen. Made the layout more compact, moved the learner functionality to the learner screens.

Fixed a transaction bug with startLesson - the method was not named consistently in the applicationContext file, so the method was not part of a proper transaction. As such, the db changes done by the method were lost. This resulted in the lesson staying in the created state, never going onto the started state. Made the naming consistent and it now goes into the started state as expected.

- -1
- +5
./lamsfoundation/lams/monitoring/service/IMonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../IMonitoringService.java
- -2
- +22
./lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringService.java
- -0
- +11
./lamsfoundation/lams/monitoring/web/DummyForm.java
- History
- Source
- Diff
./lamsfoundation/lams/.../web/DummyForm.java
- -21
- +99
./lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../DummyMonitoringAction.java
- -1
- +1
./lamsfoundation/lams/monitoring/web/MonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringAction.java
… 10 more files in changeset.

7:09 am

fmalikoff

More
e99f20a
changed 1 file
v4.7, v4.8

Fixed the url processing to remove the escaping from & in wddx'd urls

- -2
- +3
./lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../DummyMonitoringAction.java

1:29 pm

fmalikoff

More
bf77e0e
changed 16 files
v4.7, v4.8

Updated web.xml to include the context files for all the "current" deployed tools. Added matching tool jars to classpath. Stopped deploying the classes to WEB-INF/classes Implemented more calls on the dummy monitoring page to access the learner pages.

- -15
- +3
./lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringService.java
- -4
- +4
./lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../DummyMonitoringAction.java
… 14 more files in changeset.

1:45 pm

fmalikoff

More
374085d
changed 4 files
v4.7, v4.8

Added monitoring calls to the dummy monitoring page.

- -2
- +19
./lamsfoundation/lams/monitoring/service/IMonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../IMonitoringService.java
- -4
- +95
./lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringService.java
- -11
- +58
./lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../DummyMonitoringAction.java
… 1 more file in changeset.

3:57 pm

fmalikoff

More
4ffb4f1
changed 13 files
v4.7, v4.8

Added a dummy monitoring page that will allow developers to access their tools via the normal learner url.

- -2
- +24
./lamsfoundation/lams/monitoring/service/IMonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../IMonitoringService.java
- -6
- +20
./lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringService.java
- -0
- +85
./lamsfoundation/lams/monitoring/web/DummyForm.java
- History
- Source
./lamsfoundation/lams/.../web/DummyForm.java
- -0
- +294
./lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java
- History
- Source
./lamsfoundation/.../DummyMonitoringAction.java
- -1
- +1
./lamsfoundation/lams/monitoring/web/MonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringAction.java
… 8 more files in changeset.

7:54 pm

fmalikoff

More
79c858a
changed 33 files
v4.7, v4.8

More changes to suit Hibernate 3

- -57
- +58
./lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringService.java
… 32 more files in changeset.

2:48 pm

fmalikoff

More
6e5832d
changed 60 files
v4.7, v4.8

Upgraded Hibernate to 3.0

- -1
- +4
./lamsfoundation/lams/monitoring/service/IMonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../IMonitoringService.java
- -4
- +6
./lamsfoundation/lams/monitoring/web/GateAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../web/GateAction.java
- -1
- +1
./lamsfoundation/lams/monitoring/web/MonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringAction.java
… 57 more files in changeset.

8:48 am

fmalikoff

More
6c44418
changed 8 files
v4.7, v4.8

Removed ISOLATION_READ_COMMITTED from the transactions as it is not supported by the JTA transaction manager. We will have to rely on the database settings.

- -5
- +5
./lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
- History
- Source
- Diff
./lamsfoundation/.../monitoringApplicationContext.xml
… 7 more files in changeset.

9:58 am

fmalikoff

More
f7b2dd6
changed 4 files
v4.7, v4.8

Updated to use the new tool exceptions

- -1
- +1
./lamsfoundation/lams/monitoring/service/IMonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../IMonitoringService.java
- -12
- +40
./lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringService.java
- -1
- +1
./lamsfoundation/lams/monitoring/web/MonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringAction.java
… 1 more file in changeset.

9:28 am

mtruong

More
2738efb
changed 1 file
v4.7, v4.8

in checkGateStatus() - if the gate is a schedule gate, teh wddx packet will also return the gate start times and gate end times

- -1
- +9
./lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringService.java

8:01 am

mtruong

More
e3bb7a2
changed 1 file
v4.7, v4.8

inside checkGateStatus, added additional fields activityTypeID, and changed field name from waitingLearners to learnersWaiting

- -8
- +3
./lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringService.java

12:08 pm

mtruong

More
3cb213c
changed 1 file
v4.7, v4.8

Struts dispatch actions for checkGateStatus and releaseGate, see Monitoring.doc under lams_documents for more info

- -0
- +25
./lamsfoundation/lams/monitoring/web/MonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringAction.java

12:08 pm

mtruong

More
4ad2124
changed 1 file
v4.7, v4.8

implemented checkGateStatus which returns a wddx packet with certain information, however may be changed later when requirements are more clear. releaseGate returns a boolean, true to acknowledge the gate is open and false if the gate isnt opened. helper method createGateStatusInfo used in checkGateStatus()