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

1:05 am

Marcin Cieslak

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

LDEV-3171: Keep requests and learner in Mindmap tool. Make "Keep content" the default option when forcing learner to a previous activity.

- -28
- +25
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java
… 1 more file in changeset.

10:00 pm

Marcin Cieslak

More
567af22
changed 35 files
v4.7, v4.8

LDEV-3171: Remove users from activities. Fix several bugs.

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

1:19 am

Marcin Cieslak

More
15045d0
changed 60 files
v4.7, v4.8

LDEV-3171: Give a Monitor an option to remove learner's content from activities when moving him backwards in a sequence. Implementation of content-removing method for most of tools.

- -0
- +3
./lamsfoundation/lams/tool/mindmap/dao/IMindmapNodeDAO.java
- History
- Source
- Diff
./lamsfoundation/lams/.../IMindmapNodeDAO.java
- -0
- +2
./lamsfoundation/lams/tool/mindmap/dao/IMindmapRequestDAO.java
- History
- Source
- Diff
./lamsfoundation/.../IMindmapRequestDAO.java
- -1
- +9
./lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapNodeDAO.java
- -0
- +8
./lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java
- History
- Source
- Diff
./lamsfoundation/.../MindmapRequestDAO.java
- -4
- +4
./lamsfoundation/lams/tool/mindmap/model/MindmapNode.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapNode.java
- -0
- +68
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java
… 54 more files in changeset.

10:11 pm

LDEV-3164: Support several more tools. Changes in those tools' code TestHarness can interact with them without running Javascript. Remove unnecessary Flash methods. Remove junk from TestHarness project, including zipped Learning Designs which can not be imported anymore as they have non-numeric server version ("beta") Major clean up and logs improvement.

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

6:12 am

Andrey Balan

More
be07c35
changed 340 files
v4.7, v4.8

LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options

- -35
- +0
./lamsfoundation/lams/tool/mindmap/dao/IMindmapAttachmentDAO.java
- History
- Source
- Diff
./lamsfoundation/.../IMindmapAttachmentDAO.java
- -2
- +0
./lamsfoundation/lams/tool/mindmap/dao/IMindmapDAO.java
- History
- Source
- Diff
./lamsfoundation/lams/.../dao/IMindmapDAO.java
- -35
- +0
./lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapAttachmentDAO.java
- History
- Source
- Diff
./lamsfoundation/.../MindmapAttachmentDAO.java
- -22
- +0
./lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapDAO.java
- -0
- +1
./lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java
- History
- Source
- Diff
./lamsfoundation/.../MindmapRequestDAO.java
- -0
- +19
./lamsfoundation/lams/tool/mindmap/dbupdates/patch20140102.sql
- History
- Source
./lamsfoundation/lams/.../patch20140102.sql
- -102
- +0
./lamsfoundation/lams/tool/mindmap/dto/MindmapAttachmentDTO.java
- History
- Source
- Diff
./lamsfoundation/.../MindmapAttachmentDTO.java
- -57
- +0
./lamsfoundation/lams/tool/mindmap/dto/MindmapDTO.java
- History
- Source
- Diff
./lamsfoundation/lams/.../dto/MindmapDTO.java
- -8
- +0
./lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml
- History
- Source
- Diff
./lamsfoundation/.../mindmapApplicationContext.xml
- -89
- +5
./lamsfoundation/lams/tool/mindmap/model/Mindmap.java
- History
- Source
- Diff
./lamsfoundation/lams/.../model/Mindmap.java
- -233
- +0
./lamsfoundation/lams/tool/mindmap/model/MindmapAttachment.java
- History
- Source
- Diff
./lamsfoundation/.../MindmapAttachment.java
- -9
- +1
./lamsfoundation/lams/tool/mindmap/service/IMindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../IMindmapService.java
- -0
- +43
./lamsfoundation/lams/tool/mindmap/service/MindmapImportContentVersionFilter.java
- History
- Source
./lamsfoundation/.../MindmapImportContentVersionFilter.java
- -147
- +6
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java
- -2
- +0
./lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java
- History
- Source
- Diff
./lamsfoundation/.../MindmapConstants.java
… 325 more files in changeset.

4:42 pm

Marcin Cieslak

More
b33e717
changed 41 files
v4.7, v4.8

LDEV-3163: Make LAMS use ServerURL when providing URLs.

- -1
- +1
./lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java
- History
- Source
- Diff
./lamsfoundation/lams/.../ExportServlet.java
… 40 more files in changeset.

7:12 am

Marcin Cieslak

More
33da76d
changed 36 files
v4.7, v4.8

LDEV-3070: Use tool content title as lesson name instead of showing prompt pop up. Skip "Reedit"/"Cancel" page.

- -1
- +5
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java
… 35 more files in changeset.

8:47 pm

Marcin Cieslak

More
8aded0b
changed 183 files
v4.7, v4.8

LDEV-3026: Add utilities for getting activity position. Make Tools position-aware and display different label if they are last in LD.

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

7:11 pm

Andrey Balan

More
1420c10
changed 16 files
v4.7, v4.8

LDEV-2868 move swfobject.js to lams_central

- -4
- +6
./lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java
- History
- Source
- Diff
./lamsfoundation/lams/.../ExportServlet.java
… 15 more files in changeset.

9:58 pm

Andrey Balan

More
35a0e71
changed 765 files
v4.7, v4.8

LDEV-2868 * updated jquery.js, jquery-ui.js and jqgrid.js, jquery.layout.js, jqury.mobile.js, jqeury.form.js, jquery.autocomplete.js * removed repetitions of those libraries throughout all Lams * fixed some issues brought up by these updates * jquery.sizzle.js cut out from jquery.js and now it's a separate file

- -1
- +1
./lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java
- History
- Source
- Diff
./lamsfoundation/lams/.../ExportServlet.java
… 764 more files in changeset.

10:49 pm

Andrey Balan

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

LDEV-2844 don't throw exception if <mindmapExportContent> is null

- -15
- +17
./lamsfoundation/lams/tool/mindmap/service/MindmapService.java
- History
- Source
- Diff
./lamsfoundation/lams/.../MindmapService.java

9:48 pm

erniegx <ernieg@gmail.com>

More
228482c
changed 12 files
v4.7, v4.8

LDEV-2842: fixing typos

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

12:43 am

Andrey Balan

More
79d80d5
changed 12 files
v4.7, v4.8

LDEV-2657 Date and time restriction in MindMap

*merge from lams2_3_release

- -0
- +15
./lamsfoundation/lams/tool/mindmap/dbupdates/patch20110414_updateTo236.sql
- History
- Source
./lamsfoundation/.../patch20110414_updateTo236.sql
- -0
- +20
./lamsfoundation/lams/tool/mindmap/model/Mindmap.java
- History
- Source
- Diff
./lamsfoundation/lams/.../model/Mindmap.java
- -0
- +3
./lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java
- History
- Source
- Diff
./lamsfoundation/.../MindmapConstants.java
- -0
- +21
./lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../LearningAction.java
- -0
- +49
./lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java
- History
- Source
- Diff
./lamsfoundation/.../MonitoringAction.java
… 7 more files in changeset.

2:55 am

Marcin Cieslak

More
fd8292d
changed 26 files
v4.7, v4.8

LDEV-2642, LDEV-2616: Move Planner activity metadata (hidden, collapsed, expanded) to a separate table, as it may grow in the future and we don't want to make ToolActivity too complex. Move Editing Advice content from Online Instructions in activities to the metadata table. Allow editing the Editing Advice straight from the planner. Use jquery_ui instead of cluetip (dispose the last one completely). While creating a node, the Learning Design is imported just once from ZIP into DB, instead of importing it each time someone opens it in Planner. This allows less unnecessary copies of the LD and allows easier modfication of the original design. Change the way a Teacher gets a copy of the design. When opening the template in Planner, a copy is made in common folder ("Planner preview"). When the user saves the design, the same copy is *moved* to user's folder, rather than copying it again. Futhermore, each subsequent save modifies the same LD rather than making another copy.

- -27
- +4
./lamsfoundation/lams/tool/mindmap/web/actions/PedagogicalPlannerAction.java
- History
- Source
- Diff
./lamsfoundation/.../PedagogicalPlannerAction.java
… 25 more files in changeset.

11:04 am

lfoxton

More
273bb06
changed 1 file
v4.7, v4.8

LDEV-2440 Merging with head

- -1
- +1
./lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../LearningAction.java

11:04 am

lfoxton

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

Fixing format of file

- -48
- +55
./lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../LearningAction.java

6:21 am

Marcin Cieslak

More
1a5446e
changed 50 files
v4.7, v4.8

LDEV-2374: - Vote now accepts nominations created by Teacher as well as ones derived from input. - Teacher can now limit number of Learners contributing to Vote's nomination pool. - Each tool now declares which DataOutputDefinitions it can accept for Data Flow.