lams-github

lams_tool_gmap

Clone Tools

Stats

Commits this week: 0
Total Committers: 18
Last Commit:
Commits this week: 0

Lines of code count not available

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
Friday 04 Jul 2008
1:42 pm

lfoxton

Removing defunct mapFuntions.js

Fixed problem preventing deleted markers being removed from the sidebar

Options
    • -221
    • +0
    ./web/includes/javascript/mapFunctions.js
    • -3
    • +3
    ./web/includes/jsp/mapFunctions.jsp
1:41 pm

lfoxton

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

Options
    • -5
    • +10
    ./src/java/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
    • -1
    • +14
    ./src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
    • -1
    • +1
    ./web/includes/javascript/mapFunctionsAuthoring.js
    • -2
    • +2
    ./web/includes/jsp/mapFunctions.jsp
    • -1
    • +1
    ./web/pages/authoring/basic.jsp
11:43 am

lfoxton

some minor language changes

Options
    • -1
    • +1
    ./conf/language/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./conf/language/rams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/rams/ApplicationResources_en_AU.properties
11:30 am

lfoxton

Slight inteface change for learner so group name does not go over the line in the sidebar

Options
    • -1
    • +1
    ./web/includes/jsp/mapFunctions.jsp
11:21 am

lfoxton

Removing the test button from the author interface

Options
    • -1
    • +0
    ./web/pages/authoring/basic.jsp
11:11 am

lfoxton

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

Options
    • -2
    • +0
    ./web/includes/javascript/mapFunctionsLearning.js
    • -1
    • +1
    ./web/pages/learning/gmap.jsp
10:36 am

lfoxton

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

Options
    • -0
    • +3
    ./.classpath
    • -0
    • +10
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml
    • -31
    • +49
    ./conf/language/ApplicationResources.properties
    • -28
    • +14
    ./conf/language/lams/ApplicationResources.properties
    • -27
    • +43
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -38
    • +53
    ./conf/language/rams/ApplicationResources.properties
    • -38
    • +53
    ./conf/language/rams/ApplicationResources_en_AU.properties
    • -1
    • +2
    ./db/sql/create_lams_tool_gmap.sql
    • -1
    • +3
    ./db/sql/table-schema.sql
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java
    • -1
    • +8
    ./src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapMarkerDAO.java
    • -13
    • +10
    ./src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -3
    • +11
    ./src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java
    • -1
    • +24
    ./src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java
    • -1
    • +21
    ./src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
  16. … 20 more files in changeset.
Tuesday 01 Jul 2008
9:22 am

lfoxton

Optimising javascript in view pages

Options
    • -40
    • +139
    ./web/pages/export/exportPortfolio.jsp
    • -5
    • +1
    ./web/pages/learning/gmap.jsp
    • -17
    • +11
    ./web/pages/monitoring/headItems.jsp
    • -51
    • +5
    ./web/pages/monitoring/summary.jsp
9:22 am

lfoxton

Optimising the author javascript

Options
    • -31
    • +38
    ./web/pages/authoring/basic.jsp
    • -11
    • +0
    ./web/pages/authoring/headItems.jsp
9:21 am

lfoxton

Optimisting leanerHeader.jsp to use jstl tags better

Options
    • -49
    • +20
    ./web/common/learnerheader.jsp
    • -1
    • +1
    ./web/layouts/learningLayout.jsp
9:21 am

lfoxton

*** empty log message ***

Options
    • -9
    • +1
    ./web/includes/jsp/mapFunctions.jsp
9:21 am

lfoxton

Working on monitoring view

Options
    • -2
    • +0
    ./web/includes/javascript/mapFunctionsAuthoring.js
    • -1
    • +1
    ./web/includes/javascript/mapFunctionsLearning.js
    • -0
    • +0
    ./web/includes/javascript/mapFunctionsMonitoring.js
    • -3
    • +0
    ./web/includes/javascript/monitoring.js
9:20 am

lfoxton

Images for the monitor user menu

Options
    • binary
    ./web/images/collapse.gif
    • binary
    ./web/images/expand.gif
    • binary
    ./web/images/tree_closed.gif
    • binary
    ./web/images/tree_open.gif
9:19 am

lfoxton

Implementing export sevlet

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -16
    • +14
    ./src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
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
    • -0
    • +19
    ./src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
8:21 am

lfoxton

learner and monitor draft versions are done

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -7
    • +4
    ./src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
    • -15
    • +13
    ./web/common/learnerheader.jsp
    • binary
    ./web/images/collapse.gif
    • binary
    ./web/images/expand.gif
    • -1
    • +2
    ./web/includes/javascript/mapFunctions.js
    • -1
    • +1
    ./web/includes/javascript/mapFunctionsAuthoring.js
    • -1
    • +1
    ./web/includes/javascript/mapFunctionsLearning.js
    • -0
    • +0
    ./web/includes/javascript/mapFunctionsMonitoring.js
    • -3
    • +17
    ./web/includes/jsp/mapFunctions.jsp
    • -2
    • +6
    ./web/pages/authoring/basic.jsp
    • -0
    • +1
    ./web/pages/authoring/headItems.jsp
    • -10
    • +17
    ./web/pages/learning/gmap.jsp
    • -2
    • +157
    ./web/pages/monitoring/headItems.jsp
    • -1
    • +46
    ./web/pages/monitoring/summary.jsp
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
    • -12
    • +22
    ./src/java/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
    • -1
    • +1
    ./src/java/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
    • +8
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapAttachmentDAO.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapDAO.java
    • -0
    • +24
    ./src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapSessionDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapAttachmentDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapAttachmentDTO.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -0
    • +24
    ./src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java
  16. … 27 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
    • -0
    • +22
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml
    • -1
    • +3
    ./db/sql/create_lams_tool_gmap.sql
    • -1
    • +5
    ./db/sql/table-schema.sql
    • -6
    • +10
    ./src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -0
    • +110
    ./src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java
    • -54
    • +46
    ./src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java
    • -14
    • +46
    ./src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -15
    • +13
    ./src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
    • -3
    • +6
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -12
    • +24
    ./web/common/learnerheader.jsp
    • -0
    • +1
    ./web/includes/javascript/authoring.js
    • -210
    • +53
    ./web/includes/javascript/mapFunctions.js
    • -0
    • +114
    ./web/includes/javascript/mapFunctionsAuthoring.js
    • -0
    • +92
    ./web/includes/javascript/mapFunctionsLearning.js
    • -1
    • +2
    ./web/pages/authoring/basic.jsp
    • -0
    • +1
    ./web/pages/authoring/headItems.jsp
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
    • -0
    • +19
    ./build.xml
    • -1
    • +148
    ./src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -10
    • +12
    ./src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
    • -0
    • +59
    ./web/common/learnerheader.jsp
    • -3
    • +0
    ./web/includes/javascript/authoring.js
    • -35
    • +10
    ./web/includes/javascript/mapFunctions.js
    • -1
    • +1
    ./web/layouts/learningLayout.jsp
    • -0
    • +11
    ./web/pages/authoring/advanced.jsp
    • -5
    • +5
    ./web/pages/authoring/authoring.jsp
    • -34
    • +25
    ./web/pages/authoring/basic.jsp
    • -2
    • +4
    ./web/pages/authoring/headItems.jsp
    • -15
    • +32
    ./web/pages/learning/gmap.jsp
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
    • -9
    • +104
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml
    • -1
    • +24
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +26
    ./db/sql/create_lams_tool_gmap.sql
    • -1
    • +1
    ./db/sql/table-schema.sql
    • -8
    • +8
    ./src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -13
    • +175
    ./src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
    • -2
    • +25
    ./src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
    • -5
    • +115
    ./src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java
    • -0
    • +1
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +8
    ./web/includes/javascript/authoring.js
    • -25
    • +33
    ./web/includes/javascript/mapFunctions.js
    • -4
    • +80
    ./web/pages/authoring/advanced.jsp
    • -2
    • +5
    ./web/pages/authoring/authoring.jsp
    • -12
    • +15
    ./web/pages/authoring/basic.jsp
    • -0
    • +3
    ./web/pages/authoring/headItems.jsp
9:08 am

lfoxton

Added title field to the marker object

added sidebar to the view

Options
    • -0
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml
    • -1
    • +1
    ./db/sql/create_lams_tool_gmap.sql
    • -1
    • +1
    ./db/sql/table-schema.sql
    • -0
    • +19
    ./src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -1
    • +2
    ./web/includes/javascript/authoring.js
    • -27
    • +110
    ./web/includes/javascript/mapFunctions.js
    • -5
    • +21
    ./web/pages/authoring/basic.jsp
    • -3
    • +1
    ./web/pages/authoring/headItems.jsp
    • -10
    • +0
    ./web/pages/authoring/map.jsp
Friday 30 May 2008
11:42 am

lfoxton

Code for google map tool

Now can save markers in authoring, they are redisplayed on the map

Options
    • -3
    • +8
    ./.classpath
    • -1
    • +1
    ./build.xml
    • -3
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml
    • -66
    • +7
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml
    • -4
    • +1
    ./db/sql/create_lams_tool_gmap.sql
    • -7
    • +1
    ./db/sql/table-schema.sql
    • -0
    • +12
    ./src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java
    • -0
    • +20
    ./src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapMarkerDAO.java
    • -1
    • +7
    ./src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml
    • -4
    • +58
    ./src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java
    • -141
    • +46
    ./src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
    • -1
    • +17
    ./src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
    • -1
    • +8
    ./src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
    • -10
    • +95
    ./src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -0
    • +22
    ./src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java
  16. … 9 more files in changeset.
Friday 23 May 2008
2:29 pm

lfoxton

First commit for the gmap tool

Got the gmaps appearing in author, you can add multiple markers and descriptions for the markers, but you cannot save yet.

Draft data model also completed

Options
    • -0
    • +12
    ./.classpath
    • -0
    • +4
    ./.cvsignore
    • -0
    • +2
    ./.myumldata
    • -0
    • +17
    ./.project
    • -0
    • +20
    ./build.properties
    • -0
    • +500
    ./build.xml
    • -0
    • +7
    ./conf/hibernate/mappings/hibernate.properties
    • -0
    • +208
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml
    • -0
    • +93
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapAttachment.hbm.xml
    • -0
    • +156
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml
    • -0
    • +111
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapSession.hbm.xml
    • -0
    • +101
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapUser.hbm.xml
    • -0
    • +3
    ./conf/jar/META-INF/MANIFEST.MF
    • -0
    • +85
    ./conf/language/ApplicationResources.properties
    • -0
    • +87
    ./conf/language/lams/ApplicationResources.properties
  16. … 129 more files in changeset.