OpenMRS

Timestamp:

08/18/08 17:57:58 (3 months ago)

Author:

TorLye

Message:

gmapsimageviewer: Fixed moving of annotation markers. New icon for markers that are being moved.

Files:

• openmrs-modules/gmapsimageviewer/metadata/messages.properties (modified) (1 diff)
• openmrs-modules/gmapsimageviewer/web/module/portlets/imageViewerWindow.jsp (modified) (10 diffs)
• openmrs-modules/gmapsimageviewer/web/module/resources/blue-dot.png (added)

openmrs-modules/gmapsimageviewer/metadata/messages.properties

@@ -20 +20 @@
-@MODULE_ID@.opennewwindow=Open in new window
-@MODULE_ID@.links=Links
+@MODULE_ID@.moveexplain1=You can now move this annotation by dragging it to its new location.
+@MODULE_ID@.moveexplain2=Save, cancel or move some more?

openmrs-modules/gmapsimageviewer/web/module/portlets/imageViewerWindow.jsp

@@ -13 +13 @@
-        var annoationlist;
-        var markerlist;
+
+        //Icon to use for markers that are being moved
+        var blueIcon = new GIcon(G_DEFAULT_ICON);
+        blueIcon.image = "${pageContext.request.contextPath}/moduleResources/gmapsimageviewer/blue-dot.png";
-
-        function ImageViewerLoad() {
@@ -80 +84 @@
-                                        var latlng = map.getCurrentMapType().getProjection().fromPixelToLatLng(point, ${model.nullScaleZoomLevel});
-                                        
-
+"<div>" + 
-                                                        + "<spring:message code='gmapsimageviewer.date' />: "
-                                                        + annotationitem.date
@@ -87 +91 @@
-                                                        + "<a onclick='dragMarker(" + listindex + ")'><spring:message code='gmapsimageviewer.move' /></a> "
-                                                        + "<a onclick='editMarker(" + listindex + ")'><spring:message code='gmapsimageviewer.edit' /></a> "
-
+</div>
-
-                                        var newmarker = putMarker(latlng, message);
@@ -101 +105 @@
-        //This function creates a marker at the given point and adds a listener to open its info window
-        function putMarker(point, message) {
-, {draggable: true}
+
-                GEvent.addListener(marker, "click", function() {
-                        marker.openInfoWindowHtml(message);
@@ -109 +113 @@
-
-        function createMarker(point) {
-, {draggable: true}
+
-                var point = map.getCurrentMapType().getProjection().fromLatLngToPixel(marker.getLatLng(), ${model.nullScaleZoomLevel});
-                map.addOverlay(marker);
-                marker.openInfoWindowHtml(
-
+div><
-                        + "<input type='hidden' name='obsid' value='${model.obsId}' />"
-                        + "<input type='hidden' name='id' value='-1' />"
@@ -121 +125 @@
-                        + "<a onclick='saveMarker()'><spring:message code='gmapsimageviewer.save' /></a> "
-                        + "<a onclick='map.closeInfoWindow()'><spring:message code='gmapsimageviewer.cancel' /></a>"
-
+</div>
-                );
-
@@ -151 +155 @@
-                var point = map.getCurrentMapType().getProjection().fromLatLngToPixel(marker.getLatLng(), ${model.nullScaleZoomLevel});
-                marker.openInfoWindowHtml(
-
+div><
-                        + "<input type='hidden' name='obsid' value='${model.obsId}' />"
-                        + "<input type='hidden' name='id' value='" + annotationitem.id + "' />"
@@ -160 +164 @@
-                        + "<a onclick='saveMarker()'><spring:message code='gmapsimageviewer.save' /></a> "
-                        + "<a onclick='map.closeInfoWindow()'><spring:message code='gmapsimageviewer.cancel' /></a>"
-
+</div>
-                );
-
@@ -170 +174 @@
-        function saveNewMarkerPosition(listindex, lat, lng) {
-                var annotationitem = annoationlist[listindex];
-marker.getLatLng(
+new GLatLng(lat, lng
-                jQuery.post(
-                        "${pageContext.request.contextPath}/moduleServlet/gmapsimageviewer/imageAnnotationServlet",
@@ -193 +197 @@
-
-        function dragMarker(listindex) {
-
+old
-                var annotationitem = annoationlist[listindex];
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                        map.closeInfoWindow();
-                });
-
-
-
-
-
-
+
+
+
+
-                                        + "</div>");
-                        marker.disableDragging();
-                        
-                        //var listener = GEvent.addListener(map, "infowindowclose", function() {
-                        //      GEvent.removeListener(listener);
-                        //});
-                        GEvent.removeListener(dragListener);
-                        GEvent.removeListener(dropListener);
-                });
-        }