Activity lams/lams_tool

Previousl, the export xml was a bit wrong because a gmap has marker(s) and a marker has a gmap, so it got a bit ugly with nesting, nulling the marker's gmap object (as was done in forum) fixed the problem before the export

- -1
- +20
./org/lamsfoundation/lams/tool/gmap/service/GmapService.java
- History
- Source
- Diff
./org/lamsfoundation/.../GmapService.java

8:21 am

lfoxton

More
MAIN:lfoxton:20080626002106
changed 16 files
MAIN

learner and monitor draft versions are done

- -8
- +5
./org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../MonitoringAction.java
… 15 more files in changeset.

8:18 am

lfoxton

More
MAIN:lfoxton:20080626001836
changed 1 file
MAIN

Fixed a problem with removing markers, that was causing the rest of the markers to not be updated after the first was removed

Also, fixed a problem that was creating a new gmapUser each time the sequence was saved and not using the existing one

- -13
- +23
./org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../AuthoringAction.java

8:17 am

lfoxton

More
MAIN:lfoxton:20080626001738
changed 1 file
MAIN

Fixed a problem with removing markers, that was causing the rest of the markers to not be updated after the first was removed

- -2
- +2
./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../LearningAction.java

8:24 am

lfoxton

More
MAIN:lfoxton:20080606002418
changed 43 files
MAIN

Authoring is working, you can submit new markers and they will appear again when you go back to them.

- -2
- +2
./org/lamsfoundation/lams/tool/gmap/dao/IGmapAttachmentDAO.java
- History
- Source
- Diff
./org/.../IGmapAttachmentDAO.java
- -2
- +3
./org/lamsfoundation/lams/tool/gmap/dao/IGmapDAO.java
- History
- Source
- Diff
./org/lamsfoundation/.../dao/IGmapDAO.java
- -0
- +24
./org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java
- History
- Source
- Diff
./org/lamsfoundation/.../IGmapMarkerDAO.java
- -2
- +2
./org/lamsfoundation/lams/tool/gmap/dao/IGmapSessionDAO.java
- History
- Source
- Diff
./org/lamsfoundation/.../IGmapSessionDAO.java
- -2
- +2
./org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java
- History
- Source
- Diff
./org/lamsfoundation/.../dao/IGmapUserDAO.java
- -2
- +2
./org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapAttachmentDAO.java
- History
- Source
- Diff
./org/.../GmapAttachmentDAO.java
- -2
- +2
./org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java
- History
- Source
- Diff
./org/lamsfoundation/.../GmapDAO.java
- -2
- +2
./org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java
- History
- Source
- Diff
./org/lamsfoundation/.../GmapSessionDAO.java
- -2
- +2
./org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java
- History
- Source
- Diff
./org/lamsfoundation/.../GmapUserDAO.java
- -2
- +2
./org/lamsfoundation/lams/tool/gmap/dto/GmapAttachmentDTO.java
- History
- Source
- Diff
./org/.../GmapAttachmentDTO.java
- -3
- +4
./org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
- History
- Source
- Diff
./org/lamsfoundation/lams/.../dto/GmapDTO.java
- -0
- +24
./org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java
- History
- Source
- Diff
./org/lamsfoundation/.../GmapMarkerDTO.java
- -2
- +2
./org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java
- History
- Source
- Diff
./org/lamsfoundation/.../GmapSessionDTO.java
- -2
- +2
./org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java
- History
- Source
- Diff
./org/lamsfoundation/.../dto/GmapUserDTO.java
- -0
- +24
./org/lamsfoundation/lams/tool/gmap/dto/NotebookEntryDTO.java
- History
- Source
- Diff
./org/lamsfoundation/.../NotebookEntryDTO.java
… 28 more files in changeset.

1:54 pm

lfoxton

More
MAIN:lfoxton:20080604055441
changed 18 files
MAIN

Advanced options implemented in learner, some fixes to hte display of the info maessages for the markers,

created by user is also displayed

- -7
- +11
./org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
- History
- Source
- Diff
./org/lamsfoundation/lams/.../dto/GmapDTO.java
- -0
- +110
./org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java
- History
- Source
./org/lamsfoundation/.../dto/GmapMarkerDTO.java
- -54
- +46
./org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
- History
- Source
- Diff
./org/lamsfoundation/.../model/GmapMarker.java
- -1
- +3
./org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java
- History
- Source
- Diff
./org/lamsfoundation/.../GmapConstants.java
- -15
- +47
./org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../AuthoringAction.java
- -16
- +14
./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../LearningAction.java
… 12 more files in changeset.

11:53 am

lfoxton

More
MAIN:lfoxton:20080603035316
changed 13 files
MAIN

- Updated advanced tab

- Learner now displays gmap and markers

- Some map control advanced options implemented in learner

- build script updated to allow to deploy just the jar file

- -2
- +149
./org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
- History
- Source
- Diff
./org/lamsfoundation/lams/.../dto/GmapDTO.java
- -11
- +13
./org/lamsfoundation/lams/tool/gmap/model/Gmap.java
- History
- Source
- Diff
./org/lamsfoundation/lams/.../model/Gmap.java
- -4
- +6
./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../LearningAction.java
… 10 more files in changeset.

3:51 pm

lfoxton

More
MAIN:lfoxton:20080602075110
changed 18 files
MAIN

- Added options in advanced tab, as well as persistance entries in the Gmap object

- Add state-saving for the Gmap, so when the teacher saves teh map, it appears exactly as it was before when they go back, ie map type, zoom, location

- Fixed up language strings in application.properties

- All non-cosmetic authoring tasks so far are completed