Activity lams-github/

6:03 am

Andrey Balan

More
447eb31
changed 12 files

LDEV-3444 Adding a "general" burning question

- -0
- +1
/lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_scratchie/.../ApplicationResources_en_AU.properties
- -0
- +2
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
/lams_tool_scratchie/.../ScratchieConstants.java
- -0
- +2
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java
- History
- Source
- Diff
/lams_tool_scratchie/.../ScratchieBurningQuestionDAO.java
- -2
- +18
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
- History
- Source
- Diff
/lams_tool_scratchie/.../ScratchieBurningQuestionDAOHibernate.java
- -0
- +1
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20150206.sql
- History
- Source
- Diff
/lams_tool_scratchie/.../patch20150206.sql
- -0
- +13
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.java
- History
- Source
- Diff
/lams_tool_scratchie/.../ScratchieBurningQuestion.java
- -1
- +1
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
- History
- Source
- Diff
/lams_tool_scratchie/.../IScratchieService.java
- -5
- +30
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
/lams_tool_scratchie/.../ScratchieServiceImpl.java
- -25
- +42
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
/lams_tool_scratchie/.../LearningAction.java
- -1
- +6
/lams_tool_scratchie/web/pages/learning/burningQuestions.jsp
- History
- Source
- Diff
/lams_tool_scratchie/.../burningQuestions.jsp
- -0
- +18
/lams_tool_scratchie/web/pages/learning/results.jsp
- History
- Source
- Diff
/lams_tool_scratchie/web/.../results.jsp
- -0
- +5
/lams_tool_scratchie/web/pages/monitoring/summary.jsp
- History
- Source
- Diff
/lams_tool_scratchie/web/.../summary.jsp

11:31 pm

erniegx <ernieg@gmail.com>

More
96e32f7
changed 3 files
v4.7, v4.8

LDEV-3432: Change case for the table name back to lowercase as this is how it is now already.

- -2
- +2
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20150217.sql
- History
- Source
- Diff
/lams_tool_images/src/.../patch20150217.sql
- -2
- +2
/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20150217.sql
- History
- Source
- Diff
/lams_tool_imscc/src/.../patch20150217.sql
- -2
- +2
/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20150217.sql
- History
- Source
- Diff
/lams_tool_task/src/.../patch20150217.sql

11:17 pm

erniegx <ernieg@gmail.com>

More
3ee072d
changed 3 files

LDEV-3432: Change case for the table name back to lowercase as this is how it is now already.

- -2
- +2
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20150217.sql
- History
- Source
- Diff
/lams_tool_images/src/.../patch20150217.sql
- -2
- +2
/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20150217.sql
- History
- Source
- Diff
/lams_tool_imscc/src/.../patch20150217.sql
- -2
- +2
/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20150217.sql
- History
- Source
- Diff
/lams_tool_task/src/.../patch20150217.sql

6:51 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
d1d67f1
changed 2 files

LDEV-3443: Paging the messages on the detailed messages screen. Removed some debugging, fixed the detection of the max number of posts and fixed export portfolio.

- -1
- +10
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumService.java
- -7
- +2
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_forum/src/.../LearningAction.java

9:02 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
34ebd94
changed 6 files

LDEV-3443: Paging the messages on the forum's detailed messages screen. The database patch involves running stored procedures so the autopatch libray in lams_build needs to be updated.

- -2
- +2
/lams_build/3rdParty.userlibraries
- History
- Source
- Diff
/lams_build/3rdParty.userlibraries
- binary
/lams_build/lib/autopatch/autopatch-1.4.2-lams.jar
- History
- Source
/lams_build/lib/.../autopatch-1.4.2-lams.jar
- binary
/lams_build/lib/autopatch/discovery-1.0.5-lams.jar
- History
- Source
/lams_build/lib/.../discovery-1.0.5-lams.jar
- binary
/lams_build/lib/autopatch/tk-autopatch-1.2.0-b2-cvs.jar
- History
- Source
- Diff
/lams_build/.../tk-autopatch-1.2.0-b2-cvs.jar
- binary
/lams_build/lib/autopatch/tk-discovery-1.0.0.jar
- History
- Source
- Diff
/lams_build/lib/.../tk-discovery-1.0.0.jar
- -2
- +2
/lams_build/liblist.txt
- History
- Source
- Diff
/lams_build/liblist.txt

8:37 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
72a3c5d
changed 20 files

LDEV-3443: Paging the messages on the detailed messages screen. Loads approx 50 messages at a time and autoloads when end of page is reached. Required adding a thread id to the message sequence table. The database patch involves running stored procedures so the autopatch libray in lams_build needs to be updated to match the forum changes.

- -2
- +2
/lams_tool_forum/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_forum/.../ApplicationResources.properties
- -1
- +2
/lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_forum/.../ApplicationResources_en_AU.properties
- -0
- +5
/lams_tool_forum/conf/xdoclet/struts-actions.xml
- History
- Source
- Diff
/lams_tool_forum/conf/.../struts-actions.xml
- -0
- +23
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20150224.sql
- History
- Source
/lams_tool_forum/src/.../patch20150224.sql
- -0
- +93
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20150225.sql
- History
- Source
/lams_tool_forum/src/.../patch20150225.sql
- -0
- +34
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20150226.sql
- History
- Source
/lams_tool_forum/src/.../patch20150226.sql
- -0
- +31
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20150227.sql
- History
- Source
/lams_tool_forum/src/.../patch20150227.sql
- -0
- +23
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20150228.sql
- History
- Source
/lams_tool_forum/src/.../patch20150228.sql
- -0
- +11
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeq.java
- History
- Source
- Diff
/lams_tool_forum/src/.../MessageSeq.java
- -3
- +55
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeqDao.java
- History
- Source
- Diff
/lams_tool_forum/src/.../MessageSeqDao.java
- -7
- +59
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumService.java
- -1
- +12
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../IForumService.java
- -0
- +5
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumConstants.java
- -5
- +13
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_forum/src/.../LearningAction.java
- -0
- +1
/lams_tool_forum/web/WEB-INF/tiles-defs.xml
- History
- Source
- Diff
/lams_tool_forum/web/.../tiles-defs.xml
… 5 more files in changeset.

8:14 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
738641b
changed 2 files
v4.7, v4.8

LDEV-3441: Cancel was broken - when the buttons were moved, the matching c:set wasn't moved with it.

- -4
- +4
/lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../topiceditform.jsp
- -4
- +4
/lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../topicreplyform.jsp

8:10 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
cbc0133
changed 2 files

LDEV-3441: Cancel was broken - when the buttons were moved, the matching c:set wasn't moved with it.

- -4
- +4
/lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../topiceditform.jsp
- -4
- +4
/lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../topicreplyform.jsp

10:02 pm

erniegx <ernieg@gmail.com>

More
628d0cc
changed 15 files

LDEV-3434: Adding a whole bunch of learner tests and general refactoring

- -0
- +49
/lams_tests/tests/org/lamsfoundation/lams/learner/util/LearnerConstants.java
- History
- Source
/lams_tests/tests/.../util/LearnerConstants.java
- -1
- +12
/lams_tests/tests/org/lamsfoundation/lams/pages/IndexPage.java
- History
- Source
- Diff
/lams_tests/tests/.../pages/IndexPage.java
- -3
- +21
/lams_tests/tests/org/lamsfoundation/lams/pages/author/FLAPage.java
- History
- Source
- Diff
/lams_tests/tests/org/.../author/FLAPage.java
- -0
- +32
/lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/AddLessonPage.java
- History
- Source
- Diff
/lams_tests/tests/.../AddLessonPage.java
- -0
- +423
/lams_tests/tests/org/lamsfoundation/lams/pages/tool/forum/author/AdvancedTab.java
- History
- Source
/lams_tests/tests/org/.../author/AdvancedTab.java
- -0
- +162
/lams_tests/tests/org/lamsfoundation/lams/pages/tool/forum/author/AuthorPage.java
- History
- Source
/lams_tests/tests/org/.../author/AuthorPage.java
- -0
- +164
/lams_tests/tests/org/lamsfoundation/lams/pages/tool/forum/author/BasicTab.java
- History
- Source
/lams_tests/tests/org/.../author/BasicTab.java
- -0
- +186
/lams_tests/tests/org/lamsfoundation/lams/pages/tool/forum/learner/MessageForm.java
- History
- Source
/lams_tests/tests/org/.../learner/MessageForm.java
- -0
- +58
/lams_tests/tests/org/lamsfoundation/lams/pages/tool/forum/learner/ReflectionPage.java
- History
- Source
/lams_tests/tests/.../learner/ReflectionPage.java
- -0
- +282
/lams_tests/tests/org/lamsfoundation/lams/pages/tool/forum/learner/TopicIndexPage.java
- History
- Source
/lams_tests/tests/.../learner/TopicIndexPage.java
- -0
- +261
/lams_tests/tests/org/lamsfoundation/lams/pages/tool/forum/learner/TopicViewPage.java
- History
- Source
/lams_tests/tests/.../learner/TopicViewPage.java
- -1
- +5
/lams_tests/tests/org/lamsfoundation/lams/pages/tool/forum/util/ForumConstants.java
- History
- Source
- Diff
/lams_tests/tests/.../ForumConstants.java
- -0
- +101
/lams_tests/tests/org/lamsfoundation/lams/pages/util/LamsPageUtil.java
- History
- Source
/lams_tests/tests/org/.../util/LamsPageUtil.java
- -34
- +1281
/lams_tests/tests/org/lamsfoundation/lams/tool/forum/AuthorTests.java
- History
- Source
- Diff
/lams_tests/tests/.../forum/AuthorTests.java
- -1
- +69
/lams_tests/tests/org/lamsfoundation/lams/util/LamsUtil.java
- History
- Source
- Diff
/lams_tests/tests/org/.../util/LamsUtil.java

10:57 pm

Marcin Cieslak

More
2017b27
changed 1 file
v4.7, v4.8

LDEV-3439: Add a parameter so CKEditor knows what frame to resize after initialising.

- -1
- +2
/lams_tool_daco/web/pages/authoring/parts/addimage.jsp
- History
- Source
- Diff
/lams_tool_daco/web/.../parts/addimage.jsp

10:56 pm

Marcin Cieslak

More
1115327
changed 1 file

LDEV-3439: Add a parameter so CKEditor knows what frame to resize after initialising.

- -1
- +2
/lams_tool_daco/web/pages/authoring/parts/addimage.jsp
- History
- Source
- Diff
/lams_tool_daco/web/.../parts/addimage.jsp

1:58 am

erniegx <ernieg@gmail.com>

More
be8d120
changed 3 files

LDEV-3442: including personal details when calling get_progress

- -3
- +11
/moodle/mod/lamslesson/lib.php
- History
- Source
- Diff
/moodle/mod/lamslesson/lib.php
- -1
- +1
/moodle/mod/lamslesson/version.php
- History
- Source
- Diff
/moodle/mod/lamslesson/version.php
- -1
- +1
/moodle/mod/lamslesson/view.php
- History
- Source
- Diff
/moodle/mod/lamslesson/view.php

1:58 am

erniegx <ernieg@gmail.com>

More
a6c7cca
changed 3 files
v4.7, v4.8

LDEV-3442: including personal details when calling get_progress

- -3
- +11
/moodle/mod/lamslesson/lib.php
- History
- Source
- Diff
/moodle/mod/lamslesson/lib.php
- -1
- +1
/moodle/mod/lamslesson/version.php
- History
- Source
- Diff
/moodle/mod/lamslesson/version.php
- -1
- +1
/moodle/mod/lamslesson/view.php
- History
- Source
- Diff
/moodle/mod/lamslesson/view.php

11:12 pm

Marcin Cieslak

More
2c4a869
changed 9 files
v4.7, v4.8

LDEV-3428: Do not create default conditions when Tool output definitions are fetched. They only get created when Tool defaut content is cloned.

Fix class cast exeption when changing grade of first activity in sequence.

Fix lesson mark calculation exception.

Pass IDs to service methods instead of DB objects.

- -78
- +71
/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
- History
- Source
- Diff
/lams_gradebook/src/.../GradebookService.java
- -46
- +49
/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
- History
- Source
- Diff
/lams_gradebook/.../IGradebookService.java
- -13
- +6
/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
- History
- Source
- Diff
/lams_gradebook/src/.../GradebookAction.java
- -1
- +1
/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
- History
- Source
- Diff
/lams_gradebook/.../GradebookMonitoringAction.java
- -6
- +0
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java
- History
- Source
- Diff
/lams_tool_chat/.../ChatOutputFactory.java
- -16
- +7
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java
- History
- Source
- Diff
/lams_tool_forum/.../ForumOutputFactory.java
- -8
- +0
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaOutputFactory.java
- -6
- +0
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookOutputFactory.java
- History
- Source
- Diff
/lams_tool_notebook/.../NotebookOutputFactory.java
- -10
- +1
/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java
- History
- Source
- Diff
/lams_tool_survey/.../SurveyOutputFactory.java

11:00 pm

Marcin Cieslak

More
f83f367
changed 10 files

LDEV-3428: Do not create default conditions when Tool output definitions are fetched. They only get created when Tool defaut content is cloned.

Fix class cast exeption when changing grade of first activity in sequence.

Fix lesson mark calculation exception.

Pass IDs to service methods instead of DB objects.

- binary
/lams_build/lib/lams/lams-gradebook.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams-gradebook.jar
- -78
- +71
/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
- History
- Source
- Diff
/lams_gradebook/src/.../GradebookService.java
- -46
- +49
/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
- History
- Source
- Diff
/lams_gradebook/.../IGradebookService.java
- -13
- +6
/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
- History
- Source
- Diff
/lams_gradebook/src/.../GradebookAction.java
- -1
- +1
/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
- History
- Source
- Diff
/lams_gradebook/.../GradebookMonitoringAction.java
- -6
- +0
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java
- History
- Source
- Diff
/lams_tool_chat/.../ChatOutputFactory.java
- -16
- +7
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java
- History
- Source
- Diff
/lams_tool_forum/.../ForumOutputFactory.java
- -8
- +0
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaOutputFactory.java
- -6
- +0
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookOutputFactory.java
- History
- Source
- Diff
/lams_tool_notebook/.../NotebookOutputFactory.java
- -10
- +1
/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java
- History
- Source
- Diff
/lams_tool_survey/.../SurveyOutputFactory.java

7:25 pm

Marcin Cieslak

More
051f74d
changed 1 file
v4.7, v4.8

LDEV-3438: Fix an error when student is missing in Notebook after it was force completed.

- -7
- +9
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_notebook/.../LearningAction.java

7:21 pm

Marcin Cieslak

More
6ecb5ad
changed 1 file

LDEV-3438: Fix an error when student is missing in Notebook after it was force completed.

- -7
- +9
/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_notebook/.../LearningAction.java

6:33 pm

Marcin Cieslak

More
8b3a509
changed 3 files
v4.7, v4.8

LDEV-3432: Change case of tables in patches so they execute OK on Linux.

- -1
- +1
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20150217.sql
- History
- Source
- Diff
/lams_tool_images/src/.../patch20150217.sql
- -1
- +1
/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20150217.sql
- History
- Source
- Diff
/lams_tool_imscc/src/.../patch20150217.sql
- -1
- +1
/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20150217.sql
- History
- Source
- Diff
/lams_tool_task/src/.../patch20150217.sql

6:31 pm

Marcin Cieslak

More
8256cf2
changed 3 files

LDEV-3432: Change case of tables in patches so they execute OK on Linux.

- -1
- +1
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20150217.sql
- History
- Source
- Diff
/lams_tool_images/src/.../patch20150217.sql
- -1
- +1
/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20150217.sql
- History
- Source
- Diff
/lams_tool_imscc/src/.../patch20150217.sql
- -1
- +1
/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20150217.sql
- History
- Source
- Diff
/lams_tool_task/src/.../patch20150217.sql

9:57 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
25f67e4
changed 1 file
v4.7, v4.8

LDEV-3430 Deleting lesson was showing a "true" message and no refreshing. It now only shows a message if an error occurs during deletion and refreshes the page on a successful removal.

- -6
- +15
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
- History
- Source
- Diff
/lams_monitoring/.../MonitoringAction.java

9:19 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
0b3e2d2
changed 2 files

LDEV-3430 Deleting lesson was showing a "true" message and no refreshing. It now only shows a message if an error occurs during deletion and refreshes the page on a successful removal.