Activity lams-github/lams_tool_mindmap/src/java/org

4:24 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
fbba41c
changed 11 files
v4.7, v4.8

LDEV-4588 Adding a colour picker

- -103
- +0
./lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../LearningAction.java
… 10 more files in changeset.

2:12 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
9cda52b
changed 30 files
v4.7, v4.8

LDEV-4588 Flash removed from authoring, learning and monitor

- -0
- +15
./lamsfoundation/lams/tool/mindmap/dbupdates/patch20180517.sql
- History
- Source
./lamsfoundation/lams/.../patch20180517.sql
- -0
- +141
./lamsfoundation/lams/tool/mindmap/dto/IdeaJSON.java
- History
- Source
./lamsfoundation/lams/tool/.../dto/IdeaJSON.java
- -0
- +57
./lamsfoundation/lams/tool/mindmap/dto/NotifyActionJSON.java
- History
- Source
./lamsfoundation/lams/.../dto/NotifyActionJSON.java
- -0
- +48
./lamsfoundation/lams/tool/mindmap/dto/NotifyResponseJSON.java
- History
- Source
./lamsfoundation/lams/.../NotifyResponseJSON.java
- -0
- +102
./lamsfoundation/lams/tool/mindmap/dto/RootJSON.java
- History
- Source
./lamsfoundation/lams/tool/.../dto/RootJSON.java
- -3
- +1
./lamsfoundation/lams/tool/mindmap/service/IMindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../IMindmapService.java
- -37
- +12
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java
- -0
- +4
./lamsfoundation/lams/tool/mindmap/util/xmlmodel/PollResponseModel.java
- History
- Source
- Diff
./lamsfoundation/.../PollResponseModel.java
- -74
- +34
./lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../AuthoringAction.java
- -121
- +390
./lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../LearningAction.java
- -166
- +12
./lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringAction.java
… 19 more files in changeset.

7:12 pm

Marcin Cieslak

More
ad8707a
changed 84 files
v4.7, v4.8

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

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

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.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/MonitoringAction.java

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.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/web/action/MonitoringAction.java

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

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

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

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

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

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

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

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

- -6
- +6
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java
… 83 more files in changeset.

2:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
045ebfd
changed 66 files
v4.7, v4.8

LDEV-4501 All Audit Log entries are now Log Event entries

- -6
- +6
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java
… 65 more files in changeset.

5:17 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
fcc5eca
changed 63 files
v4.7, v4.8

LDEV-4501 Tool context files no longer reference audit service.

- -1
- +1
./lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml
- History
- Source
- Diff
./lamsfoundation/.../mindmapApplicationContext.xml
… 62 more files in changeset.

10:41 pm

Andrey Balan

More
02b9b12
changed 59 files
v4.7, v4.8

LDEV-4407 Tools to stop using learnerService

There is no need to have a separate ILearnerService designed

for tools only. As long as they require only one method from it

completeToolSession() which we can simply move to

ILamsToolService. After which we just remove learnerService

from the tools.

- -1
- +0
./lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml
- History
- Source
- Diff
./lamsfoundation/.../mindmapApplicationContext.xml
- -11
- +1
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java
… 57 more files in changeset.

2:09 pm

Andrey Balan

More
f450236
changed 79 files
v4.7, v4.8

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

- -4
- +2
./lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../LearningAction.java
… 78 more files in changeset.

12:24 am

Andrey Balan

More
4ee1866
changed 78 files
v4.7, v4.8

LDEV-4407 Tools to use contentrepository classes from lams_common

Tools start using shared contentrepository classes that were

recently moved to lams_common from lams_contentrepository.

Remove any leftover dependencies on lams_contentrepository. Which

includes getting rid of getRepositoryLoginTicket() and some other

methods from tools services.

- -1
- +1
./lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java
- History
- Source
- Diff
./lamsfoundation/.../MindmapPedagogicalPlannerForm.java
… 77 more files in changeset.

1: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
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java
… 45 more files in changeset.

1: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
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java
… 28 more files in changeset.

4:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
8e090b3
changed 43 files
v4.7, v4.8

LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

- -0
- +11
./lamsfoundation/lams/tool/mindmap/dto/MindmapUserDTO.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapUserDTO.java
… 42 more files in changeset.

4:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
109770e
changed 43 files
v4.7, v4.8

LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

- -0
- +11
./lamsfoundation/lams/tool/mindmap/dto/MindmapUserDTO.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapUserDTO.java
… 42 more files in changeset.

6:28 pm

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.

- -10
- +8
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java
… 135 more files in changeset.

12:23 pm

Marcin Cieslak

More
497b3a6
changed 13 files
v4.7, v4.8

LDEV-4402 Remove obsolete XPP3 and XMLPull libraries

The libraries have been used by earlier versions of XStream. They are

not needed for latest XStream and Java 6+.

Deserialized classes must implement a no-arg constructor.

- -10
- +9
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java
… 12 more files in changeset.

6:32 pm

Andrey Balan

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

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

- -11
- +8
./lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../AuthoringAction.java
… 21 more files in changeset.

2: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
./lamsfoundation/lams/tool/mindmap/service/IMindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../IMindmapService.java
- -0
- +5
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java
- -0
- +3
./lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../AuthoringAction.java
… 86 more files in changeset.

8:31 pm

Andrey Balan

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

LDEV-4291 Move getAccessMode method to WebUtil

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

3: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
./lamsfoundation/lams/tool/mindmap/dbupdates/patch20170101.sql
- History
- Source
./lamsfoundation/lams/.../patch20170101.sql
… 223 more files in changeset.

9:57 am

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
- +11
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java
… 37 more files in changeset.

10:26 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
7e8d2e6
changed 14 files
v4.7, v4.8

LDEV-4092: Date passed back by server was reconverting time for Daylight Saving, making it an hour out, as the convertToStringForJSON takes the timezone into account. Therefore convert the already timezone converted time (which gets converted back again) rather than the original time.

- -1
- +1
./lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringAction.java
… 13 more files in changeset.

11:59 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
c6ad849
changed 39 files
v4.7, v4.8

LDEV-4092: Support the server supplying a localised date string for the submission deadline (datetimepicker does not have localisation of the format, just the language).