Map: basic management of map tab

3 files changed, 51 insertions, 13 deletions

diff --git a/ishtar_common/templates/blocks/DataTables-gallery.html b/ishtar_common/templates/blocks/DataTables-tabs.html
index fc9e0505a..ddfcaa575 100644
--- a/ishtar_common/templates/blocks/DataTables-gallery.html
+++ b/ishtar_common/templates/blocks/DataTables-tabs.html
@@ -8,13 +8,20 @@
         {% trans "Table" %}
     </a>
   </li>
-  <li class="nav-item">
+  {% if gallery %}<li class="nav-item">
       <a class="nav-link" id="tab-gallery-{{name}}" data-toggle="tab"
          href="#tab-content-gallery-{{name}}" role="tab"
          aria-controls="tab-content-gallery-{{name}}" aria-selected="true">
           {% trans "Gallery" %}
       </a>
-  </li>
+  </li>{% endif %}
+  {% if use_map %}<li class="nav-item">
+      <a class="nav-link" id="tab-map-{{name}}" data-toggle="tab"
+         href="#tab-content-map-{{name}}" role="tab"
+         aria-controls="tab-content-map-{{name}}" aria-selected="true">
+          {% trans "Map" %}
+      </a>
+  </li>{% endif %}
 </ul>
 
 <div class="tab-content">
@@ -23,10 +30,14 @@
        aria-labelledby="tab-grid-{{name}}">
       {% include "blocks/DataTables-content.html" %}
   </div>
-  <div class="tab-pane"
+  {% if gallery %}<div class="tab-pane"
        id="tab-content-gallery-{{name}}" role="tabpanel"
        aria-labelledby="tab-gallery-{{name}}">
-  </div>
+  </div>{% endif %}
+  {% if use_map %}<div class="tab-pane"
+       id="tab-content-map-{{name}}" role="tabpanel"
+       aria-labelledby="tab-map-{{name}}">
+  </div>{% endif %}
 </div>
 
 
diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index 56deff82e..f9fba7ba4 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -1,7 +1,5 @@
 {% load i18n %}
 
-<p class="text-center">
-
 <button id='search_{{name}}' class='btn btn-primary search_button'
         type="button">
     {% trans "Search" %}</button>
@@ -27,8 +25,8 @@
   </div>
 </div>
 
-{% if gallery %}
-{% include "blocks/DataTables-gallery.html" %}
+{% if gallery or use_map %}
+{% include "blocks/DataTables-tabs.html" %}
 {% else %}
 {% include "blocks/DataTables-content.html" %}
 {% endif %}
@@ -51,15 +49,22 @@ $('#modal_grid_{{name}}').on('hide.bs.modal', function (e) {
     current_modal = null;
 });
 
+{% if gallery or use_map %}
+$("#tab-grid-{{name}}").click(function(){
+    current_tab = "table";
+    datatable_submit_search();
+});
+{% endif %}
 {% if gallery %}
 $("#tab-gallery-{{name}}").click(function(){
     current_tab = "gallery";
     gallery_submit_search();
 });
-
-$("#tab-grid-{{name}}").click(function(){
-    current_tab = "table";
-    datatable_submit_search();
+{% endif %}
+{% if use_map %}
+$("#tab-map-{{name}}").click(function(){
+    current_tab = "map";
+    map_submit_search();
 });
 {% endif %}
 
@@ -95,6 +100,28 @@ gallery_submit_search = function(image_page){
     return false;
 };
 {% endif %}
+{% if use_map %}
+map_submit_search = function(){
+    var data = search_get_query_data(query_vars, "{{name}}");
+    var nb_select = jQuery("#id_{{name}}-length_map").val();
+    if (!nb_select) nb_select = 10;
+
+    var url = "{{source}}json-map?length=" + nb_select + "&submited=1&" + data;
+    $.getJSON(url, function(data) {
+        var timestamp = Math.floor(Date.now() / 1000);
+        var map_id = "map-" + timestamp;
+        var result = render_map(data, "{{name}}", nb_select, map_id);
+        $("#tab-content-map-{{name}}").html(result["html"]);
+        $("#id_{{name}}-length_map").change(map_submit_search);
+        register_map(map_id, result["points"]);
+    });
+
+    if ($('.modal-progress').length > 0){
+        $('.modal-progress').modal('hide');
+    }
+    return false;
+};
+{% endif %}
 
 datatable_submit_search = function(){
     var data = search_get_query_data(query_vars, "{{name}}");
diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html
index c5f9e2848..98d9e0fe6 100644
--- a/ishtar_common/templates/blocks/bs_form_snippet.html
+++ b/ishtar_common/templates/blocks/bs_form_snippet.html
@@ -17,7 +17,7 @@
 {% if form.SEARCH_AND_SELECT %}
 {{field}}
 {% elif field.name == 'search_vector' and forloop.counter0 == 0 %}
-<div class="form-row">
+<div class="form-row search-vector">
     <div class="form-group col-lg-12">
         {{field|safe}}
         {% if field.help_text %}