Activity lams-github/

8:28 pm

ozgurd

More
59fe1db
changed 12 files
v4.7, v4.8

*** empty log message ***

- -0
- +10
/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml
- History
- Source
- Diff
/lams_tool_lamc/conf/.../McUsrAttempt.hbm.xml
- -0
- +1
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McAppConstants.java
- -0
- +13
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../mc/McUsrAttempt.java
- -0
- +11
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../IMcUsrAttemptDAO.java
- -0
- +15
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McUsrAttemptDAO.java
- -0
- +2
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../IMcService.java
- -1
- +16
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../McServicePOJO.java
- -0
- +22
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../web/LearningUtil.java
- -1
- +9
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../web/McAction.java
- -2
- +2
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
- History
- Source
- Diff
/lams_tool_lamc/.../McLearningStarterAction.java
- -2
- +4
/lams_tool_lamc/web/RedoQuestions.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/RedoQuestions.jsp
- -130
- +0
/lams_tool_lamc/web/SequentialAnswersContent.jsp
- History
- Source
- Diff
/lams_tool_lamc/.../SequentialAnswersContent.jsp

2:56 pm

Modified the ToolDownload to pick up the name of the tool content handler bean from the servlet definition, rather than hardcoding a standard name. This is needed as we can't have duplicated bean names across projects - the beans overwrite each other when loaded in lams_learning and lams_monitoring.

- binary
/lams_build/lib/lams/lams-contentrepository.jar
- History
- Source
- Diff
/lams_build/.../lams-contentrepository.jar
- -6
- +1
/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java
- History
- Source
- Diff
/lams_contentrepository/.../IToolContentHandler.java
- -14
- +32
/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolDownload.java
- History
- Source
- Diff
/lams_contentrepository/.../ToolDownload.java
- -1
- +1
/lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/client/TestToolContentHandlerImpl.java
- History
- Source
- Diff
/lams_contentrepository/.../TestToolContentHandlerImpl.java
- -1
- +1
/lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/testApplicationContext.xml
- History
- Source
- Diff
/lams_contentrepository/.../testApplicationContext.xml

2:03 pm

fmalikoff

More
7aa4fea
changed 2 files
v4.7, v4.8

Reverted back to copy that matches the current implementation of leaveToolSession from lams.jar

- -2
- +2
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../IQaService.java
- -9
- +18
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaServicePOJO.java

1:24 pm

mtruong

More
30cff71
changed 1 file
v4.7, v4.8

modifications done on groupings stuff. added method parseGroupings and changed it so that the groupings object is not created when parsing the grouping activities. Instead it will be created when processing the groupings array. removed some use of instanceOf as it wasnt working.

Calculate first activity for a learning design now works properly.

- -26
- +100
/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
- History
- Source
- Diff
/lams_central/src/.../ObjectExtractor.java

1:22 pm

mtruong

More
013f31f
changed 1 file
v4.7, v4.8

updated some values

- -4
- +4
/lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
- History
- Source
- Diff
/lams_common/src/java/.../wddx/WDDXTAGS.java

1:21 pm

mtruong

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

removed AuthoringToolDTO

- -12
- +3
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
- History
- Source
- Diff
/lams_common/src/.../LibraryActivityDTO.java

1:21 pm

mtruong

More
8400ef0
changed 1 file
v4.7, v4.8

modified the if statement in getGroupingByUUID so that it will return the first element in the list, only if the size of the list is greater than 0 without this, an exception is thrown

- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java
- History
- Source
- Diff
/lams_common/src/.../GroupingDAO.java

1:19 pm

mtruong

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

added property groupingTypeId changed the getGroupingTypeId to return the groupingTypeId instead of using the "instanceOf" checks added method isRandomGrouping() , isChosenGrouping() and isClassGrouping()

- -2
- +26
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
- History
- Source
- Diff
/lams_common/src/.../Grouping.java

1:18 pm

mtruong

More
533fe9a
changed 1 file
v4.7, v4.8

added the property groupingTypeId, which previously wasnt there. when retrieving Grouping objects, the groupingTypeId was null regardless of what value was stored on database. Works okay now.

- -1
- +5
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../Grouping.hbm.xml

12:52 pm

fmalikoff

More
89ae2d0
changed 6 files
v4.7, v4.8

Instructions files now appear in the instructions page on the monitoring screen. The attachment entries were not being copied when the tool content was duplicated.

- -3
- +13
/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.java
- History
- Source
- Diff
/lams_tool_nb/.../NoticeboardAttachment.java
- -0
- +19
/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java
- History
- Source
- Diff
/lams_tool_nb/src/.../NoticeboardContent.java
- -9
- +6
/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbWebUtil.java
- History
- Source
- Diff
/lams_tool_nb/src/.../util/NbWebUtil.java
- -2
- +2
/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java
- History
- Source
- Diff
/lams_tool_nb/src/.../NbAuthoringAction.java
- -1
- +1
/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java
- History
- Source
- Diff
/lams_tool_nb/.../NbAuthoringStarterAction.java
- -2
- +1
/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java
- History
- Source
- Diff
/lams_tool_nb/src/.../NbMonitoringAction.java

11:09 am

fmalikoff

More
698a7ad
changed 1 file
v4.7, v4.8

The default content id was hardcoded, so it wasn't linking to the default content properly. Replaced hardcoded value with the tag value used by the tool deploy utility.