Activity lams-github/lams_tool

8:47 pm

Marcin Cieslak

More
38497df
changed 46 files
v4.7, v4.8

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

- -0
- +6
./java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
- History
- Source
- Diff
./java/org/.../service/ScribeService.java
… 45 more files in changeset.

8:14 am

Andrey Balan

More
64ee697
changed 29 files
v4.7, v4.8

LDEV-4451 Implement ToolSessionManager.getConfidenceLevels() in all tools

This method allows Scratchie to query available confidence levels from

the tools that can provide it. Actually, only Assessment and MCQ will

implement it for real, all other tools will implements it as "return

null;".

- -0
- +6
./java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
- History
- Source
- Diff
./java/org/.../service/ScribeService.java
… 28 more files in changeset.

8:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
aa5568d
changed 36 files
v4.7, v4.8

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

- -0
- +12
./java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java
- History
- Source
- Diff
./java/org/.../dto/ScribeSessionDTO.java
… 35 more files in changeset.

8:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
83ca314
changed 36 files
v4.7, v4.8

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

- -0
- +12
./java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java
- History
- Source
- Diff
./java/org/.../dto/ScribeSessionDTO.java
… 35 more files in changeset.

12:28 am

Marcin Cieslak

More
9218936
changed 136 files
v4.7, v4.8

LDEV-4402 Substitute Gson and Apache JSON with Jackson

Jackson is a top JSON library shipped with WF10.

Apache JSON resides in an ancient library which we do not need for

anything else.

We use GSon only for serializing Java objects to JSON, which Jackson can

do too.

- -3
- +5
./java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java
- History
- Source
- Diff
./java/org/.../service/IScribeService.java
- -32
- +29
./java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
- History
- Source
- Diff
./java/org/.../service/ScribeService.java
- -2
- +2
./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
- History
- Source
- Diff
./java/org/.../actions/LearningAction.java
- -17
- +26
./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
- History
- Source
- Diff
./java/org/.../LearningWebsocketServer.java
- -2
- +2
./java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java
- History
- Source
- Diff
./java/org/.../actions/MonitoringAction.java
… 131 more files in changeset.

12:53 pm

Marcin Cieslak

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

LDEV-4394 Minor improvements for compiler optimisation

- -13
- +8
./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
- History
- Source
- Diff
./java/org/.../LearningWebsocketServer.java
… 2 more files in changeset.

3:53 pm

Marcin Cieslak

More
f066697
changed 12 files
v4.7, v4.8

LDEV-4394 Make page reload and websocket close requests cross-node

Some requests have been sent only to websockets on current node. Now

they are detected in DB and run on all nodes.

- -2
- +0
./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
- History
- Source
- Diff
./java/org/.../actions/LearningAction.java
- -7
- +17
./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
- History
- Source
- Diff
./java/org/.../LearningWebsocketServer.java
- -2
- +0
./java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java
- History
- Source
- Diff
./java/org/.../actions/MonitoringAction.java
… 9 more files in changeset.

1:42 pm

Marcin Cieslak

More
7cb18d1
changed 40 files
v4.7, v4.8

LDEV-4332: Send websocket ping after 3 minutes of idleness so the connection does not get cut because of idle timeout.

- -0
- +5
./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
- History
- Source
- Diff
./java/org/.../LearningWebsocketServer.java
… 39 more files in changeset.

8:18 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

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

LDEV-4336: Running the test harness showed up a case where reportText can be null so that is now catered for in the newline processing

- -1
- +1
./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
- History
- Source
- Diff
./java/org/.../LearningWebsocketServer.java

8:08 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
4a96002
changed 3 files
v4.7, v4.8

LDEV-4336: Text coming via websocket is now escaped and the newlines converted to <br> so the pages can use it as html and get the correct visual line breaks.

- -1
- +3
./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
- History
- Source
- Diff
./java/org/.../LearningWebsocketServer.java
… 2 more files in changeset.

9:31 pm

Marcin Cieslak

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

LDEV-4252: Use another collection type instead of synchronisation.

- -32
- +21
./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
- History
- Source
- Diff
./java/org/.../LearningWebsocketServer.java
… 3 more files in changeset.

12:32 am

Andrey Balan

More
6cfcb91
changed 22 files
v4.7, v4.8

LDEV-4286 Show Authoring advanced tab on re-editing content from monitor

- -10
- +7
./java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java
- History
- Source
- Diff
./java/org/.../actions/AuthoringAction.java
… 21 more files in changeset.

8:27 pm

Andrey Balan

More
2abc348
changed 89 files
v4.7, v4.8

LDEV-4300 Audit logs when activity is modified in monitor

- -0
- +7
./java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java
- History
- Source
- Diff
./java/org/.../service/IScribeService.java
- -0
- +5
./java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
- History
- Source
- Diff
./java/org/.../service/ScribeService.java
- -0
- +3
./java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java
- History
- Source
- Diff
./java/org/.../actions/AuthoringAction.java
… 86 more files in changeset.

2:31 am

Andrey Balan

More
23b5b0a
changed 31 files
v4.7, v4.8

LDEV-4291 Move getAccessMode method to WebUtil

- -21
- +3
./java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java
- History
- Source
- Diff
./java/org/.../actions/AuthoringAction.java
… 30 more files in changeset.

2:26 pm

Marcin Cieslak

More
2c1a1dd
changed 10 files
v4.7, v4.8

LDEV-4261: Remove version properties from entities. Remove management of optimistic locking failures as they never happen.

- -0
- +14
./java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20170308.sql
- History
- Source
./java/org/.../dbupdates/patch20170308.sql
- -15
- +2
./java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java
- History
- Source
- Diff
./java/org/.../model/ScribeSession.java
- -31
- +2
./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
- History
- Source
- Diff
./java/org/.../actions/LearningAction.java
… 7 more files in changeset.

10:00 pm

LDEV-4180: Make DB patches produce up-to-date structure during build instead of applying multiple patches. Get rid of unnecessary tables and keys. Modify boolean columns to tinyint(1) Simplify patches where possible.

- -0
- +14
./java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20170101.sql
- History
- Source
./java/org/.../dbupdates/patch20170101.sql
… 223 more files in changeset.

12:13 pm

Marcin Cieslak

More
5e319c8
changed 8 files
v4.7, v4.8

LDEV-4187: Make sure that even after an exception is thrown, the Hibernate session is closed. Add extra logging to verify completeActivity() failures.

- -4
- +5
./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
- History
- Source
- Diff
./java/org/.../LearningWebsocketServer.java
… 7 more files in changeset.

4:57 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
d1d97d8
changed 38 files
v4.7, v4.8

LDEV-4187: Get an learner's status from the tool for a particular tool session, which can be used to regenerate learner progress.

- -0
- +12
./java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
- History
- Source
- Diff
./java/org/.../service/ScribeService.java
… 37 more files in changeset.

11:48 pm

Marcin Cieslak

More
96f6a69
changed 6 files
v4.7, v4.8

LDEV-4187: Delegate non-HTTP-request tasks to own threads. Open and close Hibernate session for each of such thread. Bind created session to context and thread. Close session at the end of thread execution.