lams / lams_tool_gmap / src

java

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 8
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 5,764
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 18 Sep 2008
9:41 am

lfoxton

LDEV-1911 Making Gmap tool have its own config page for the gmap API key, istead of putting it in the general lams configuration page.

This is the backend stuff to make the config model possible

Options
    • -1
    • +7
    ./org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/gmap/dao/IGmapConfigItemDAO.java
    • -0
    • +32
    ./org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapConfigItemDAO.java
    • -0
    • +61
    ./org/lamsfoundation/lams/tool/gmap/model/GmapConfigItem.java
    • -6
    • +28
    ./org/lamsfoundation/lams/tool/gmap/service/GmapService.java
    • -3
    • +18
    ./org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
    • -1
    • +2
    ./org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java
    • -0
    • +72
    ./org/lamsfoundation/lams/tool/gmap/web/actions/AdminAction.java
    • -14
    • +21
    ./org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -1
    • +9
    ./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
    • -1
    • +9
    ./org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
    • -0
    • +34
    ./org/lamsfoundation/lams/tool/gmap/web/forms/AdminForm.java
    • -1
    • +9
    ./org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
Tuesday 29 Jul 2008
12:53 pm

lfoxton

LDEV-1850 - Doing reflection for Gmap, export portfolio

Options
    • -6
    • +42
    ./org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
  2. … 1 more file in changeset.
12:10 pm

lfoxton

LDEV-1850 - Doing reflection for Gmap, Learner, monitor done. Just need to do export portfolio

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -3
    • +22
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java
    • -1
    • +57
    ./org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
  4. … 10 more files in changeset.
Wednesday 23 Jul 2008
12:15 pm

lfoxton

For LDEV-1850

Adding in reflection, finished for learner and author.

Monitor and export portfolio still unfinished

Options
    • -2
    • +35
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -1
    • +24
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java
    • -3
    • +48
    ./org/lamsfoundation/lams/tool/gmap/model/Gmap.java
    • -48
    • +76
    ./org/lamsfoundation/lams/tool/gmap/service/GmapService.java
    • -1
    • +26
    ./org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
    • -1
    • +7
    ./org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -3
    • +72
    ./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
    • -1
    • +31
    ./org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java
    • -2
    • +10
    ./org/lamsfoundation/lams/tool/gmap/web/forms/LearningForm.java
  10. … 14 more files in changeset.
Tuesday 22 Jul 2008
10:36 am

lfoxton

For LDEV-1851

Adding the saveMarkers action to monitor so the teacher can save/update/remove markers

Options
    • -3
    • +15
    ./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
    • -1
    • +73
    ./org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
    • -2
    • +22
    ./org/lamsfoundation/lams/tool/gmap/web/forms/MonitoringForm.java
  4. … 3 more files in changeset.
10:35 am

lfoxton

For LDEV-1851

the isAuthored property of the marker should not be updated, only saved on the first time, otherwise any markers edited in monitor come unter the Authored user

Options
    • -3
    • +2
    ./org/lamsfoundation/lams/tool/gmap/service/GmapService.java
Monday 21 Jul 2008
2:02 pm

lfoxton

LDEV-1662 Putting in advanced options summary into monitoring summary page for every tool.

Gmap

Options
    • -10
    • +29
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
  2. … 1 more file in changeset.
Monday 14 Jul 2008
9:27 am

lfoxton

Removed import for the gmap image bundler class

Options
    • -2
    • +1
    ./org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
8:28 am

lfoxton

LDEV-1847 - Fixed export portfolio so custom images for gmap are bundled with the export.

Now the class is centralised in learner so this can be used in future for other tools.

Options
    • -85
    • +0
    ./org/lamsfoundation/lams/tool/gmap/util/GmapImageBundler.java
    • -7
    • +35
    ./org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
Friday 11 Jul 2008
10:00 am

lfoxton

Fixed up export portfolio so that images are included in the export.

That way the activity still displays correctly even when the lams server is down

Options
    • -0
    • +85
    ./org/lamsfoundation/lams/tool/gmap/util/GmapImageBundler.java
    • -3
    • +8
    ./org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java
    • -1
    • +9
    ./org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
  4. … 1 more file in changeset.
Tuesday 08 Jul 2008
2:49 pm

lfoxton

Code cleanup for java source

Options
    • -4
    • +1
    ./org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
1:09 pm

lfoxton

Code cleanup for java source

Options
    • -1
    • +12
    ./org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java
    • -1
    • +24
    ./org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapMarkerDAO.java
    • -1
    • +6
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -2
    • +3
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java
    • -1
    • +6
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java
    • -80
    • +0
    ./org/lamsfoundation/lams/tool/gmap/dto/NotebookEntryDTO.java
    • -20
    • +40
    ./org/lamsfoundation/lams/tool/gmap/model/Gmap.java
    • -9
    • +1
    ./org/lamsfoundation/lams/tool/gmap/model/GmapAttachment.java
    • -16
    • +12
    ./org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
    • -4
    • +4
    ./org/lamsfoundation/lams/tool/gmap/model/GmapSession.java
    • -60
    • +66
    ./org/lamsfoundation/lams/tool/gmap/service/GmapService.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/util/GmapException.java
    • -18
    • +2
    ./org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -13
    • +1
    ./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
12:41 pm

lfoxton

code cleanup - removing any remaining occurences of notebook code

Options
    • -8
    • +4
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java
    • -32
    • +1
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java
    • -13
    • +1
    ./org/lamsfoundation/lams/tool/gmap/model/GmapUser.java
    • -35
    • +1
    ./org/lamsfoundation/lams/tool/gmap/service/GmapService.java
    • -29
    • +1
    ./org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
    • -4
    • +7
    ./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
    • -41
    • +2
    ./org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
    • -11
    • +1
    ./org/lamsfoundation/lams/tool/gmap/web/forms/LearningForm.java
    • -3
    • +1
    ./org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
  10. … 6 more files in changeset.
12:09 pm

lfoxton

Putting updateMarkersXML in gmapService and removing from author and learner actions

Options
    • -6
    • +69
    ./org/lamsfoundation/lams/tool/gmap/service/GmapService.java
    • -1
    • +11
    ./org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
    • -61
    • +3
    ./org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -69
    • +3
    ./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
10:23 am

lfoxton

Added save action and button in the learning inteface so users can save markers without going to the next activity

Options
    • -21
    • +35
    ./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
  2. … 1 more file in changeset.
9:49 am

lfoxton

Learner export completed, export portfolio functionality completed

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
  2. … 1 more file in changeset.
7:49 am

lfoxton

Fixing up export servlet for learner export portfolio

Options
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/gmap/model/GmapSession.java
    • -28
    • +12
    ./org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
Friday 04 Jul 2008
1:41 pm

lfoxton

Fixed problem preventing the current user from being diplayed in the sidebar unless they have saved a marker

Options
    • -6
    • +11
    ./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
12:28 pm

lfoxton

Fixed up a problem with export/import tool content that was throwing an error when the user saves an imported gmap

Options
    • -2
    • +15
    ./org/lamsfoundation/lams/tool/gmap/service/GmapService.java
  2. … 3 more files in changeset.
10:36 am

lfoxton

Added changes in to implement code and interfaces for grouping, this was previously un-implemented n monitor and learner

Options
    • -2
    • +3
    ./org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java
    • -1
    • +8
    ./org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapMarkerDAO.java
    • -14
    • +11
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -4
    • +12
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java
    • -2
    • +25
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java
    • -1
    • +21
    ./org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
    • -1
    • +38
    ./org/lamsfoundation/lams/tool/gmap/service/GmapService.java
    • -1
    • +11
    ./org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/util/GmapException.java
    • -10
    • +6
    ./org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -19
    • +18
    ./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
    • -2
    • +30
    ./org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
    • -20
    • +23
    ./org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
  14. … 23 more files in changeset.
Tuesday 01 Jul 2008
9:19 am

lfoxton

Implementing export sevlet

Options
    • -17
    • +15
    ./org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
  2. … 1 more file in changeset.
Thursday 26 Jun 2008
11:05 am

lfoxton

Fixed up GmapService for exporting the learning design activity correctly:

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

Options
    • -1
    • +20
    ./org/lamsfoundation/lams/tool/gmap/service/GmapService.java
8:21 am

lfoxton

learner and monitor draft versions are done

Options
    • -8
    • +5
    ./org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
  2. … 15 more files in changeset.
8:18 am

lfoxton

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

Options
    • -13
    • +23
    ./org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
8:17 am

lfoxton

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

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
Friday 06 Jun 2008
8:24 am

lfoxton

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

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/dao/IGmapAttachmentDAO.java
    • -2
    • +3
    ./org/lamsfoundation/lams/tool/gmap/dao/IGmapDAO.java
    • -0
    • +24
    ./org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/dao/IGmapSessionDAO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapAttachmentDAO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapAttachmentDTO.java
    • -3
    • +4
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -0
    • +24
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java
    • -0
    • +24
    ./org/lamsfoundation/lams/tool/gmap/dto/NotebookEntryDTO.java
  16. … 28 more files in changeset.
Wednesday 04 Jun 2008
1:54 pm

lfoxton

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

created by user is also displayed

Options
    • -7
    • +11
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -0
    • +110
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java
    • -54
    • +46
    ./org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
    • -1
    • +3
    ./org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java
    • -15
    • +47
    ./org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -16
    • +14
    ./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
  7. … 12 more files in changeset.
Tuesday 03 Jun 2008
11:53 am

lfoxton

- 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

Options
    • -2
    • +149
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -11
    • +13
    ./org/lamsfoundation/lams/tool/gmap/model/Gmap.java
    • -4
    • +6
    ./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
  4. … 10 more files in changeset.
Monday 02 Jun 2008
3:51 pm

lfoxton

- 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

Options
    • -10
    • +10
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -14
    • +176
    ./org/lamsfoundation/lams/tool/gmap/model/Gmap.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/service/GmapService.java
    • -3
    • +26
    ./org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
    • -6
    • +116
    ./org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java
  7. … 12 more files in changeset.
9:08 am

lfoxton

Added title field to the marker object

added sidebar to the view

Options
    • -0
    • +19
    ./org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
    • -1
    • +4
    ./org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
  3. … 9 more files in changeset.