Activity lams-github/

1:30 pm

mseaton

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

updated getOrganisationsByUserRole to take list of roles as request parameter

- -3
- +6
/lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceAction.java
- History
- Source
- Diff
/lams_central/src/.../WorkspaceAction.java

1:27 pm

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.

- -2
- +8
/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
/lams_learning/src/.../LearnerService.java
- -5
- +48
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
- History
- Source
- Diff
/lams_learning/.../DisplayActivityAction.java
- -1
- +1
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
- History
- Source
- Diff
/lams_learning/.../DummyLearnerAction.java
- -4
- +1
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
- History
- Source
- Diff
/lams_learning/src/.../GroupingAction.java
- -9
- +1
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
- History
- Source
- Diff
/lams_learning/src/.../LearnerAction.java
- -15
- +13
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java
- History
- Source
- Diff
/lams_learning/src/.../form/ActivityForm.java
- -19
- +42
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
- History
- Source
- Diff
/lams_learning/src/.../LearningWebUtil.java
- -3
- +0
/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java
- History
- Source
- Diff
/lams_learning/test/.../TestGateAction.java
- -3
- +0
/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
- History
- Source
- Diff
/lams_learning/.../TestGroupingAction.java
- -5
- +0
/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java
- History
- Source
- Diff
/lams_learning/.../TestLearnerAction.java

12:07 pm

steven

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

Monitoring works .

- -1
- +1
/lams_tool_larsrc/conf/xdoclet/struts-actions.xml
- History
- Source
- Diff
/lams_tool_larsrc/conf/.../struts-actions.xml
- -0
- +1
/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
- History
- Source
- Diff
/lams_tool_larsrc/.../ResourceItemVisitDAOHibernate.java
- -0
- +25
/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_larsrc/.../MonitoringAction.java
- -3
- +4
/lams_tool_larsrc/web/pages/monitoring/statistic.jsp
- History
- Source
- Diff
/lams_tool_larsrc/web/.../statistic.jsp
- -6
- +7
/lams_tool_larsrc/web/pages/monitoring/summary.jsp
- History
- Source
- Diff
/lams_tool_larsrc/web/.../summary.jsp
- -2
- +2
/lams_tool_larsrc/web/pages/monitoring/userlist.jsp
- History
- Source
- Diff
/lams_tool_larsrc/web/.../userlist.jsp

11:41 am

psharma

More
70220eb
updated 1 file
v4.7, v4.8

added LessonTabView movieclip and components in library

- binary
/lams_central/src/flash/lams_monitoring_v1.fla
- History
- Source
- Diff
/lams_central/src/.../lams_monitoring_v1.fla

11:38 am

psharma

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

change in updateSequence Method to hide sequence ID in Data grid

- -2
- +3
/lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/LessonView.as
- History
- Source
- Diff
/lams_central/src/flash/.../ls/LessonView.as

11:36 am

psharma

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

changed the property name from _learningSequences to _lessonSequences and changed a method name from getLearningSequences to getLessonSequences

- -4
- +6
/lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/LessonModel.as
- History
- Source
- Diff
/lams_central/src/flash/.../ls/LessonModel.as

11:34 am

psharma

More
347def5
changed 1 file
v4.7, v4.8

on cell press event storing Sequence in MonitorModel

- -4
- +7
/lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/LessonController.as
- History
- Source
- Diff
/lams_central/src/.../ls/LessonController.as

11:33 am

psharma

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

added a change eventListener for Tab change on monitorView

- -2
- +14
/lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as
- History
- Source
- Diff
/lams_central/src/.../mv/MonitorController.as

11:31 am

psharma

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

added default controller method and added case of SEQUENCE on update method

- -5
- +34
/lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as
- History
- Source
- Diff
/lams_central/src/flash/.../mv/MonitorView.as

11:30 am

psharma

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

changes in setSequence method to pass tabID with notifyer

- -1
- +2
/lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
- History
- Source
- Diff
/lams_central/src/.../mv/MonitorModel.as

11:28 am

psharma

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

added observer for LessonTabView event

- -1
- +19
/lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as
- History
- Source
- Diff
/lams_central/src/flash/.../mv/Monitor.as

11:28 am

psharma

More
cdfcef7
added 1 file
v4.7, v4.8

added LessonTabView Class to the tabviews package

- -0
- +198
/lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
- History
- Source
/lams_central/src/.../tabviews/LessonTabView.as

10:23 am

steven

More
13f904e
changed 9 files
v4.7, v4.8

Monitoring working basicly.

- -8
- +8
/lams_tool_larsrc/conf/xdoclet/struts-actions.xml
- History
- Source
- Diff
/lams_tool_larsrc/conf/.../struts-actions.xml
- -1
- +1
/lams_tool_larsrc/db/sql/tool_insert.sql
- History
- Source
- Diff
/lams_tool_larsrc/db/sql/tool_insert.sql
- -25
- +29
/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
- History
- Source
- Diff
/lams_tool_larsrc/.../ResourceItemVisitDAOHibernate.java
- -1
- +0
/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_larsrc/.../MonitoringAction.java
- -1
- +0
/lams_tool_larsrc/web/common/fckeditorheader.jsp
- History
- Source
- Diff
/lams_tool_larsrc/web/.../fckeditorheader.jsp
- -0
- +3
/lams_tool_larsrc/web/common/header.jsp
- History
- Source
- Diff
/lams_tool_larsrc/web/common/header.jsp
- -1
- +20
/lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
- History
- Source
- Diff
/lams_tool_larsrc/web/.../monitoring.jsp
- -1
- +71
/lams_tool_larsrc/web/pages/monitoring/statistic.jsp
- History
- Source
- Diff
/lams_tool_larsrc/web/.../statistic.jsp
- -25
- +27
/lams_tool_larsrc/web/pages/monitoring/summary.jsp
- History
- Source
- Diff
/lams_tool_larsrc/web/.../summary.jsp

9:49 am

fmalikoff

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

Load the user object whenever the learner progress object is loaded. The learning progress object is cached in the user's session, so it needs to be "complete" or you will get a lazy initialisation error later e.g. when the client requests the progress data.