Merge pull request #34842 from dimagi/ze/refresh-warning-on-save-polygon

Refresh Warning After Saving Polygon (Geospatial)
dimagi · Jul 3, 2024 · 2a892a9 · 2a892a9
2 parents e743ec4 + de2862b
commit 2a892a9
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 55 deletions.
diff --git a/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js b/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
@@ -34,7 +34,7 @@ hqDefine("geospatial/js/geospatial_map", [
     function showMapControls(state) {
         $("#geospatial-map").toggle(state);
         $("#case-buttons").toggle(state);
-        $("#mapControls").toggle(state);
+        $("#polygon-filters").toggle(state);
         $("#user-filters-panel").toggle(state);
     }
 
@@ -233,7 +233,7 @@ hqDefine("geospatial/js/geospatial_map", [
 
     function initPolygonFilters() {
         // Assumes `map` var is initialized
-        const $mapControlDiv = $("#mapControls");
+        const $mapControlDiv = $("#polygon-filters");
         polygonFilterModel = new models.PolygonFilter(mapModel, false, true);
         polygonFilterModel.loadPolygons(initialPageData.get('saved_polygons'));
         if ($mapControlDiv.length) {

diff --git a/corehq/apps/geospatial/static/geospatial/js/models.js b/corehq/apps/geospatial/static/geospatial/js/models.js
@@ -800,6 +800,7 @@ hqDefine('geospatial/js/models', [
                         );
                         // redraw using mapControlsModelInstance
                         self.selectedSavedPolygonId(ret.id);
+                        self.shouldRefreshPage(true);
                     },
                     error: function () {
                         alertUser.alert_user(gettext(unexpectedErrorMessage), 'danger');

diff --git a/corehq/apps/geospatial/templates/case_grouping_map.html b/corehq/apps/geospatial/templates/case_grouping_map.html
@@ -30,24 +30,7 @@
   </div>
 </div>
 
-<div class="panel" id="polygon-filters">
-  <div class="row">
-    {% include 'geospatial/partials/saved_polygon_filter.html' %}
-  </div>
-  <div class="alert alert-info" style="margin-top:10px;" data-bind="visible: shouldRefreshPage">
-    {% blocktrans %}
-      Please
-      <a href="">refresh the page</a>
-      to apply the polygon filtering changes.
-    {% endblocktrans %}
-  </div>
-  <div class="alert alert-warning" data-bind="visible: hasUrlError">
-    {% blocktrans %}
-      There are too many polygons on the map. Please remove some before refreshing the page, otherwise the
-      newly added polygons will be lost.
-    {% endblocktrans %}
-  </div>
-</div>
+{% include 'geospatial/partials/saved_polygon_filter.html' with uses_disbursement='false' %}
 <div id="case-grouping-map" style="height: 500px"></div>
 
 <div class="panel-body-datatable">

diff --git a/corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html b/corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
@@ -1,33 +1,54 @@
 {% load i18n %}
-
-<div class="col-sm-8">
-    <div class="row form-horizontal">
-        <label for="saved-polygons" class="control-label col-sm-2">
-          {% trans "Filter by Saved Area" %}
-        </label>
-        <div class="col-sm-5" style="display:flex">
-            <select id="saved-polygons"
-                    class="form-control"
-                    data-bind="select2: savedPolygons,value: selectedSavedPolygonId,">
-            </select>
-            <button class="btn btn-default" data-bind="click: clearSelectedPolygonFilter, visible: selectedSavedPolygonId">
-              <i class="fa fa-remove"></i>
-            </button>
-        </div>
-        <div class="col-sm-5">
-            <a class="btn btn-default" data-bind="click: exportSelectedPolygonGeoJson, visible: selectedSavedPolygonId">
-                {% trans 'Export Area' %}
-            </a>
-            <button class="btn btn-danger" data-toggle="modal" data-target="#delete-saved-area-modal"
-                    data-bind="visible: selectedSavedPolygonId">
-                <i class="fa fa-trash"></i>
-                {% trans 'Delete Area' %}
-            </button>
+<div class="panel" id="polygon-filters">
+    <div class="row">
+        <div class="col-sm-8">
+            <div class="row form-horizontal">
+                <label for="saved-polygons" class="control-label col-sm-2">
+                  {% trans "Filter by Saved Area" %}
+                </label>
+                <div class="col-sm-5" style="display:flex">
+                    <select id="saved-polygons"
+                            class="form-control"
+                            data-bind="select2: savedPolygons,value: selectedSavedPolygonId,">
+                    </select>
+                    <button class="btn btn-default" data-bind="click: clearSelectedPolygonFilter, visible: selectedSavedPolygonId">
+                      <i class="fa fa-remove"></i>
+                    </button>
+                </div>
+                <div class="col-sm-5">
+                    <a class="btn btn-default" data-bind="click: exportSelectedPolygonGeoJson, visible: selectedSavedPolygonId">
+                        {% trans 'Export Area' %}
+                    </a>
+                    <button class="btn btn-danger" data-toggle="modal" data-target="#delete-saved-area-modal"
+                            data-bind="visible: selectedSavedPolygonId">
+                        <i class="fa fa-trash"></i>
+                        {% trans 'Delete Area' %}
+                    </button>
+                </div>
+            </div>
         </div>
+        <button id="btnSaveDrawnArea" class="btn btn-default" style="float:right; margin-right:1em"
+                data-bind="attr: { disabled: btnSaveDisabled }, click: saveGeoPolygon">
+           {% trans 'Save Area' %}
+       </button>
+       {% include 'geospatial/partials/delete_saved_area_modal.html' %}
+       {% if uses_disbursement == 'true' %}
+           <a id="btnRunDisbursement" class="col-sm-2 btn btn-primary" style="float:right; margin-right:1em" data-bind="attr: { disabled: btnRunDisbursementDisabled }">
+               {% trans 'Run Disbursement' %}
+           </a>
+       {% endif %}
     </div>
+    <div class="alert alert-info" style="margin-top:10px;" data-bind="visible: shouldRefreshPage">
+        {% blocktrans %}
+          Please
+          <a href="">refresh the page</a>
+          to apply the polygon filtering changes.
+        {% endblocktrans %}
+      </div>
+      <div class="alert alert-warning" data-bind="visible: hasUrlError">
+        {% blocktrans %}
+          There are too many polygons on the map. Please remove some before refreshing the page, otherwise the
+          newly added polygons will be lost.
+        {% endblocktrans %}
+      </div>
 </div>
- <button id="btnSaveDrawnArea" class="btn btn-default" style="float:right; margin-right:1em"
-         data-bind="attr: { disabled: btnSaveDisabled }, click: saveGeoPolygon">
-    {% trans 'Save Area' %}
-</button>
-{% include 'geospatial/partials/delete_saved_area_modal.html' %}
diff --git a/corehq/apps/geospatial/templates/map_visualization.html b/corehq/apps/geospatial/templates/map_visualization.html
@@ -67,12 +67,7 @@
         </button>
     </div>
 </div>
-<div class="row panel" id="mapControls">
-    {% include 'geospatial/partials/saved_polygon_filter.html' %}
-    <a id="btnRunDisbursement" class="col-sm-2 btn btn-primary" style="float:right; margin-right:1em" data-bind="attr: { disabled: btnRunDisbursementDisabled }">
-        {% trans 'Run Disbursement' %}
-    </a>
-</div>
+{% include 'geospatial/partials/saved_polygon_filter.html' with uses_disbursement='true' %}
 <div id="disbursement-spinner">
   <h4 id="loading" class="hide"
       data-bind="visible: isBusy(), css: {hide: false}">