Activity lams/

2:15 pm

fmalikoff

More
MAIN:fmalikoff:20060802061537
changed 20 files
MAIN

Adding support for LAMS 1.0.2 import. Includes a table to map the old tool types to our new tool signatures. Can import a sequence with tool tasks, no grouping and no data.

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -5
- +8
/lams_central/conf/language/ApplicationResources.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources.properties
- -24
- +82
/lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java
- History
- Source
- Diff
/lams_central/.../ImportToolContentAction.java
- -2
- +3
/lams_central/web/toolcontent/import.jsp
- History
- Source
- Diff
/lams_central/web/toolcontent/import.jsp
- -0
- +71
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolImportSupport.hbm.xml
- History
- Source
/lams_common/conf/.../ToolImportSupport.hbm.xml
- -5
- +45
/lams_common/db/model/lams_11.clay
- History
- Source
- Diff
/lams_common/db/model/lams_11.clay
- -1
- +10
/lams_common/db/sql/create_lams_11_tables.sql
- History
- Source
- Diff
/lams_common/db/.../create_lams_11_tables.sql
- -2
- +23
/lams_common/db/sql/insert_types_data.sql
- History
- Source
- Diff
/lams_common/db/sql/insert_types_data.sql
- -0
- +3
/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
/lams_common/src/.../lams/commonContext.xml
- -0
- +3
/lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
- History
- Source
- Diff
/lams_common/.../toolApplicationContext.xml
- -2
- +3
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
- History
- Source
- Diff
/lams_common/src/.../Activity.java
- -15
- +42
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
- History
- Source
- Diff
/lams_common/.../ExportToolContentService.java
- -0
- +10
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java
- History
- Source
- Diff
/lams_common/.../IExportToolContentService.java
- -2
- +3
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java
- History
- Source
- Diff
/lams_common/.../ILearningDesignService.java
- -0
- +1503
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LD102Importer.java
- History
- Source
/lams_common/src/.../service/LD102Importer.java
… 5 more files in changeset.

11:55 am

steven

More
MAIN:steven:20060802035533
changed 1 file
MAIN

Add refresh button.

- -1
- +14
/lams_tool_forum/web/jsps/learning/viewtopic.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../viewtopic.jsp

11:30 am

steven

More
MAIN:steven:20060802033043
changed 1 file
MAIN

Change default title and instruction.

- -2
- +2
/lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql
- History
- Source
- Diff
/lams_tool_sbmt/.../create_lams_tool_sbmt.sql

11:26 am

asukkar

More
MAIN:asukkar:20060802032654
changed 2 files
MAIN

Renamed variable for consistency.

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -1
- +1
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../NotebookEntry.hbm.xml

10:46 am

steven

More
MAIN:steven:20060802024617
changed 1 file
MAIN

Fix bug LDEV-475 :Forum replay topic number does not clear when saving read-only copy

- -3
- +9
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumService.java

10:44 am

asukkar

More
MAIN:asukkar:20060802024416
changed 2 files
MAIN

Renamed variable for consistency.

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java
- History
- Source
- Diff
/lams_common/src/.../model/NotebookEntry.java

10:34 am

asukkar

More
MAIN:asukkar:20060802023417
changed 3 files
MAIN

Renamed variable for consistency.

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -3
- +3
/lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java
- History
- Source
- Diff
/lams_common/src/.../model/NotebookEntry.java
- -2
- +2
/lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java
- History
- Source
- Diff
/lams_common/src/.../CoreNotebookService.java

10:26 am

asukkar

More
MAIN:asukkar:20060802022649
changed 4 files
MAIN

Renamed variable for consistency.

- -1
- +1
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../NotebookEntry.hbm.xml
- -1
- +1
/lams_common/db/sql/create_notebook_tables.sql
- History
- Source
- Diff
/lams_common/.../create_notebook_tables.sql
- -1
- +1
/lams_common/db/sql/notebook_table-schema.sql
- History
- Source
- Diff
/lams_common/db/.../notebook_table-schema.sql
- -4
- +4
/lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java
- History
- Source
- Diff
/lams_common/src/.../model/NotebookEntry.java

10:02 am

steven

More
MAIN:steven:20060802020235
changed 2 files
MAIN

Add tooltip for instruction icon.

- -1
- +3
/lams_tool_larsrc/conf/language/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_larsrc/.../ApplicationResources.properties
- -3
- +3
/lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp
- History
- Source
- Diff
/lams_tool_larsrc/web/.../instructions.jsp

9:42 am

fyang

More
MAIN:fyang:20060802014246
changed 1 file
MAIN

only check one checkbox since httpunit doesn't allow setting multiple values for one checkbox group at one time

- -1
- +1
/TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
- History
- Source
- Diff
/TestHarness4LAMS2/src/.../MockLearner.java

9:35 am

Ernie Ghiglione

More
MAIN:ernieg:20060802013509
changed 1 file
MAIN

Set up log.properties to be always on DEBUG mode

- -1
- +1
/TestHarness4LAMS2/log.properties
- History
- Source
- Diff
/TestHarness4LAMS2/log.properties

9:08 am

steven

More
MAIN:steven:20060802010846
changed 6 files
MAIN

Add Ajax for statistic page. and some bug fix.

- -1
- +1
/lams_tool_sbmt/conf/language/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_sbmt/.../ApplicationResources.properties
- -77
- +132
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_sbmt/src/.../MonitoringAction.java
- -0
- +5
/lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
/lams_tool_sbmt/web/.../struts-config.xml
- -8
- +42
/lams_tool_sbmt/web/monitoring/monitoring.jsp
- History
- Source
- Diff
/lams_tool_sbmt/web/.../monitoring.jsp
- -36
- +4
/lams_tool_sbmt/web/monitoring/parts/statistic.jsp
- History
- Source
- Diff
/lams_tool_sbmt/web/.../parts/statistic.jsp
- -0
- +37
/lams_tool_sbmt/web/monitoring/parts/statisticpart.jsp
- History
- Source
/lams_tool_sbmt/web/.../parts/statisticpart.jsp

7:35 am

fyang

More
MAIN:fyang:20060801233542
changed 2 files
MAIN

fix a potential bug

- -1
- +1
/TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestSuite.java
- History
- Source
- Diff
/TestHarness4LAMS2/src/.../TestSuite.java
- -2
- +9
/TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MonitorTest.java
- History
- Source
- Diff
/TestHarness4LAMS2/src/.../MonitorTest.java

7:24 am

jliew

More
MAIN:jliew:20060801232438
changed 2 files
MAIN

LDEV-491 fix only 1 role being added

- -3
- +4
/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java
- History
- Source
- Diff
/lams_admin/.../UserOrgRoleSaveAction.java
- -1
- +2
/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java
- History
- Source
- Diff
/lams_admin/src/.../web/UserSaveAction.java

3:32 pm

jliew

More
MAIN:jliew:20060801073232
changed 3 files
MAIN

add javascript to check all/none checkboxes

- -1
- +2
/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleAction.java
- History
- Source
- Diff
/lams_admin/src/.../UserOrgRoleAction.java
- -1
- +9
/lams_admin/web/userorg.jsp
- History
- Source
- Diff
/lams_admin/web/userorg.jsp
- -7
- +24
/lams_admin/web/userorgrole.jsp
- History
- Source
- Diff
/lams_admin/web/userorgrole.jsp

3:31 pm

jliew

More
MAIN:jliew:20060801073115
changed 1 file
MAIN

only add user to org once roles are saved;

fixed bug where a hibernate cascade error occurred if user tried to remove themself from an organisation

- -4
- +5
/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java
- History
- Source
- Diff
/lams_admin/src/.../UserOrgSaveAction.java

3:30 pm

jliew

More
MAIN:jliew:20060801073032
changed 1 file
MAIN

only add user to org once roles are saved

- -5
- +8
/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java
- History
- Source
- Diff
/lams_admin/.../UserOrgRoleSaveAction.java

3:28 pm

jliew

More
MAIN:jliew:20060801072841
changed 2 files
MAIN

list users according to login

- -2
- +3
/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java
- History
- Source
- Diff
/lams_admin/src/.../web/UserManageAction.java
- -2
- +4
/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java
- History
- Source
- Diff
/lams_admin/src/.../web/UserOrgAction.java

3:26 pm

jliew

More
MAIN:jliew:20060801072628
changed 2 files
MAIN

implement Comparable for User, sort according to login name

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -2
- +7
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
- History
- Source
- Diff
/lams_common/src/.../usermanagement/User.java

3:10 pm

steven

More
MAIN:steven:20060801071012
changed 27 files
MAIN

Big refactor for monitoring page. Also following LDV-424

- -2
- +2
/lams_tool_sbmt/conf/language/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_sbmt/.../ApplicationResources.properties
- -1
- +7
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
- History
- Source
- Diff
/lams_tool_sbmt/.../submitFilesApplicationContext.xml
- -32
- +10
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java
- History
- Source
- Diff
/lams_tool_sbmt/src/.../FileDetailsDTO.java
- -6
- +6
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmitFilesService.java
- -276
- +217
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_sbmt/src/.../MonitoringAction.java
- -1
- +4
/lams_tool_sbmt/web/WEB-INF/lams.tld
- History
- Source
- Diff
/lams_tool_sbmt/web/WEB-INF/lams.tld
- -32
- +7
/lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
/lams_tool_sbmt/web/.../struts-config.xml
- -0
- +55
/lams_tool_sbmt/web/WEB-INF/tags/DefineLater.tag
- History
- Source
/lams_tool_sbmt/web/.../tags/DefineLater.tag
- binary
/lams_tool_sbmt/web/images/indicator.gif
- History
- Source
/lams_tool_sbmt/web/images/indicator.gif
- -64
- +0
/lams_tool_sbmt/web/monitoring/alluserlist.jsp
- History
- Source
- Diff
/lams_tool_sbmt/web/.../alluserlist.jsp
- -78
- +0
/lams_tool_sbmt/web/monitoring/instructions.jsp
- History
- Source
- Diff
/lams_tool_sbmt/web/.../instructions.jsp
- -21
- +0
/lams_tool_sbmt/web/monitoring/marking.jsp
- History
- Source
- Diff
/lams_tool_sbmt/web/.../marking.jsp
- -43
- +8
/lams_tool_sbmt/web/monitoring/monitoring.jsp
- History
- Source
- Diff
/lams_tool_sbmt/web/.../monitoring.jsp
- -47
- +0
/lams_tool_sbmt/web/monitoring/showactivity.jsp
- History
- Source
- Diff
/lams_tool_sbmt/web/.../showactivity.jsp
- -37
- +0
/lams_tool_sbmt/web/monitoring/statistic.jsp
- History
- Source
- Diff
/lams_tool_sbmt/web/.../statistic.jsp
… 12 more files in changeset.

12:16 pm

mseaton

More
MAIN:mseaton:20060801041652
updated 1 file
MAIN

send wddx null in packet for parentUIID and parentActivityID fields if null

- binary
/lams_central/src/flash/org/lamsfoundation/lams/authoring/Activity.as
- History
- Source
- Diff
/lams_central/src/.../authoring/Activity.as

12:13 pm

asukkar

More
MAIN:asukkar:20060801041358
updated 1 file
MAIN

lams.jar rebuild due to changes in lams_common notebook

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar

12:10 pm

asukkar

More
MAIN:asukkar:20060801041034
changed 3 files
MAIN

Added new field create_date and update_date

- -0
- +16
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../NotebookEntry.hbm.xml
- -1
- +1
/lams_common/db/sql/create_notebook_tables.sql
- History
- Source
- Diff
/lams_common/.../create_notebook_tables.sql
- -1
- +1
/lams_common/db/sql/notebook_table-schema.sql
- History
- Source
- Diff
/lams_common/db/.../notebook_table-schema.sql

12:05 pm

fyang

More
MAIN:fyang:20060801040521
changed 1 file
MAIN

Hide options

"Course Administrators can add new users"

"Course Administrators can browse all users in the system"

"Course Administrators can change status of course"

when creating classes.

- -0
- +2
/lams_admin/web/organisation.jsp
- History
- Source
- Diff
/lams_admin/web/organisation.jsp

11:50 am

asukkar

More
MAIN:asukkar:20060801035000
changed 4 files
MAIN

Added extended interface for CoreNotebookService. Interface extends the ICoreNotebookService and adds getEntry(userID) and getEntry(userID, lessonID).

Implemented interface methods.