popup bulle

assets/app/frontend/js/bulle.js

@@ -58,8 +58,29 @@ series.dataSource.url = routes.app_carto_json;
 //     }]
 // }];
 
-series.nodes.template.events.on("hit", function(event) {
-    console.log(event.target.dataItem.nb);
+//Popover
+series.nodes.template.events.on("hit", function (event) {
+    if (typeof event.target.dataItem.nb !== 'undefined') {
+        if ($('.popover-body').length == 0) {
+            $('.popup').click();
+        } else {
+            $('.popover-body').fadeOut("fast");
+            $('.popover-body').fadeIn("fast");
+        }
+        var href = $('.popover-body a').attr('href');
+        // /cartographie-list?search_list_form%5Bcategory%5D%5B%5D=temp&search_list_form%5Bthematic%5D%5B%5D=1
+        var hrefArray = href.split("&");
+
+        var hrefCategoryArray = hrefArray[0].split('=');
+        var hrefCategory = hrefCategoryArray[0] + '=' + event.target.dataItem.id_category;
+
+        var hrefThematicArray = hrefArray[1].split('=');
+        var hrefThematic = hrefThematicArray[0] + '=' + event.target.dataItem.id_thematic;
+
+        var hrefFinal = hrefCategory + '&' + hrefThematic;
+        $('.popover-body a').attr('href', hrefFinal);
+        $('.popover-body .nb').html(event.target.dataItem.nb);
+    }
 });
 
 series.manyBodyStrength = -25;
@@ -76,10 +97,12 @@ series.maxLevels = 1
 // series.dataFields.linkWith = "link";
 
 //distance entre les bulles
-series.links.template.distance = 1.7;
+series.links.template.distance = 1.3;
 
 // Set up data fields
 series.dataFields.name = "name";
+series.dataFields.id_category = "id_category";
+series.dataFields.id_thematic = "id_thematic";
 series.dataFields.children = "children";
 series.dataFields.nb = "nb";
 
@@ -102,4 +125,4 @@ series.links.template.strokeWidth = 5;
 series.links.template.strokeOpacity = 1;
 
 //tooltip
-series.nodes.template.tooltipText = "{nb}";
+// series.nodes.template.tooltipText = "{nb}";

assets/app/frontend/js/script.js

@@ -15,6 +15,12 @@ function initialisePopovers() {
         placement: 'top',
         trigger: 'focus',
     });
+
+    $('[data-toggle="popover-bulle"]').popover({
+        html: true,
+        container: '.popup-bulle',
+        trigger: 'click',
+    });
 }
 
 function manageFormIndiv() {

assets/app/frontend/scss/base.scss

@@ -138,4 +138,48 @@ button:focus {
     opacity: 1;
     transform: translate3d(0, 0, 0);
   }
+}
+
+.popover {
+  border: 2px solid $green;
+  border-radius: 0;
+  font-size: 1.4rem;
+
+  .popover-body {
+    color: $green;
+    font-family: dinbold;
+    padding: 0;
+
+    span {
+      padding: 10px 0 10px 50px;
+      display: inline-block;
+
+      .nb {
+        padding: 0;
+      }
+    }
+
+    a {
+      font-family: dinbold;
+      background-image: url($dir-img + 'Picto-Loupe.png');
+      background-repeat: no-repeat;
+      background-size: 20px;
+      background-position: 15px center;
+      color: $green;
+      display: inline-block;
+      width: 100%;
+      background-color: $yellow;
+      padding: 5px 0 5px 50px;
+    }
+  }
+
+  .arrow {
+    &:after {
+      border-top-color: $green;
+    }
+
+    &:before {
+      border-top-color: $green;
+    }
+  }
 }

assets/app/frontend/scss/carto-carte.scss

@@ -39,46 +39,6 @@
     padding: 10px 10px 40px;
     position: relative;
 
-    .popover {
-      border: 2px solid $green;
-      border-radius: 0;
-      font-size: 1.4rem;
-
-      .popover-body {
-        color: $green;
-        font-family: dinbold;
-        padding: 0;
-
-        span {
-          padding: 10px 0 10px 50px;
-          display: inline-block;
-        }
-
-        a {
-          font-family: dinbold;
-          background-image: url($dir-img + 'Picto-Loupe.png');
-          background-repeat: no-repeat;
-          background-size: 20px;
-          background-position: 15px center;
-          color: $green;
-          display: inline-block;
-          width: 100%;
-          background-color: $yellow;
-          padding: 5px 0 5px 50px;
-        }
-      }
-
-      .arrow {
-        &:after {
-          border-top-color: $green;
-        }
-
-        &:before {
-          border-top-color: $green;
-        }
-      }
-    }
-
     .img-map {
       display: none;
 

assets/app/frontend/scss/carto-int.scss

@@ -7,12 +7,27 @@
     margin-bottom: 75px;
   }
 
-  .carto-bulles {
-    border: 2px solid $green;
-    min-height: 800px;
+  .popup-bulle {
+    position: relative;
 
-    tspan {
-      font-family: dinbold;
+    .popover {
+      transform: none !important;
+      top: 5px !important;
+      right: 5px;
+      left: auto !important;
+
+      .arrow {
+        display: none;
+      }
+    }
+
+    .carto-bulles {
+      border: 2px solid $green;
+      min-height: 800px;
+
+      tspan {
+        font-family: dinbold;
+      }
     }
   }
 }

public/build/entrypoints.json

@@ -2,27 +2,25 @@
   "entrypoints": {
     "adminlte-plugins": {
       "js": [
-        "/build/runtime.cbcc88f9.js",
-        "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
-        "/build/vendors-node_modules_core-js_modules_es_string_replace_js.06749256.js",
-        "/build/vendors-node_modules_core-js_modules_es_array_find_js.5b9cb885.js",
-        "/build/vendors-node_modules_jquery_src_jquery_js.2a8ff255.js",
+        "/build/runtime.ef68e0db.js",
+        "/build/vendors-node_modules_core-js_internals_export_js.2e873f33.js",
+        "/build/vendors-node_modules_core-js_internals_advance-string-index_js-node_modules_core-js_internals-bed4a0.74e1ccb1.js",
+        "/build/vendors-node_modules_core-js_internals_array-iteration_js-node_modules_core-js_modules_es_str-0c9418.b5fc4c19.js",
         "/build/vendors-node_modules_core-js_modules_es_string_split_js-node_modules_popper_js_dist_esm_popper_js.22d0763b.js",
-        "/build/vendors-node_modules_admin-lte_dist_js_adminlte_min_js-node_modules_bootstrap-autocomplete_di-57a6be.35767fac.js",
-        "/build/adminlte-plugins.a206a66e.js"
+        "/build/vendors-node_modules_admin-lte_dist_js_adminlte_min_js-node_modules_bootstrap-autocomplete_di-5760c2.7a48c88c.js",
+        "/build/adminlte-plugins.058f2e02.js"
       ],
       "css": [
-        "/build/vendors-node_modules_admin-lte_dist_js_adminlte_min_js-node_modules_bootstrap-autocomplete_di-57a6be.fa890b12.css"
+        "/build/vendors-node_modules_admin-lte_dist_js_adminlte_min_js-node_modules_bootstrap-autocomplete_di-5760c2.fa890b12.css"
       ]
     },
     "adminlte-index": {
       "js": [
-        "/build/runtime.cbcc88f9.js",
-        "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
-        "/build/vendors-node_modules_core-js_modules_es_string_replace_js.06749256.js",
-        "/build/vendors-node_modules_core-js_modules_es_array_find_js.5b9cb885.js",
-        "/build/vendors-node_modules_core-js_modules_es_array_filter_js-node_modules_core-js_modules_es_array-f7c72f.c0107d2e.js",
-        "/build/adminlte-index.3de48d32.js"
+        "/build/runtime.ef68e0db.js",
+        "/build/vendors-node_modules_core-js_internals_export_js.2e873f33.js",
+        "/build/vendors-node_modules_core-js_internals_advance-string-index_js-node_modules_core-js_internals-bed4a0.74e1ccb1.js",
+        "/build/vendors-node_modules_core-js_internals_add-to-unscopables_js-node_modules_core-js_modules_es_-e14c1c.756bb6b8.js",
+        "/build/adminlte-index.b393b588.js"
       ],
       "css": [
         "/build/adminlte-index.e4548695.css"
@@ -30,10 +28,10 @@
     },
     "adminlte-form": {
       "js": [
-        "/build/runtime.cbcc88f9.js",
-        "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
-        "/build/vendors-node_modules_core-js_modules_es_array_find_js.5b9cb885.js",
-        "/build/adminlte-form.4079807b.js"
+        "/build/runtime.ef68e0db.js",
+        "/build/vendors-node_modules_core-js_internals_export_js.2e873f33.js",
+        "/build/vendors-node_modules_core-js_modules_es_array_find_js-_7db01.8e56d6b5.js",
+        "/build/adminlte-form.52acb20e.js"
       ],
       "css": [
         "/build/adminlte-form.59862983.css"
@@ -41,13 +39,12 @@
     },
     "adminlte-sort": {
       "js": [
-        "/build/runtime.cbcc88f9.js",
-        "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
-        "/build/vendors-node_modules_core-js_modules_es_string_replace_js.06749256.js",
-        "/build/vendors-node_modules_core-js_modules_es_array_find_js.5b9cb885.js",
-        "/build/vendors-node_modules_jquery_src_jquery_js.2a8ff255.js",
-        "/build/vendors-node_modules_jquery-ui-dist_jquery-ui_js.d62744d3.js",
-        "/build/adminlte-sort.72f3a9ea.js"
+        "/build/runtime.ef68e0db.js",
+        "/build/vendors-node_modules_core-js_internals_export_js.2e873f33.js",
+        "/build/vendors-node_modules_core-js_internals_advance-string-index_js-node_modules_core-js_internals-bed4a0.74e1ccb1.js",
+        "/build/vendors-node_modules_core-js_internals_array-iteration_js-node_modules_core-js_modules_es_str-0c9418.b5fc4c19.js",
+        "/build/vendors-node_modules_core-js_modules_es_array_find_js-node_modules_jquery-ui-dist_jquery-ui_js.2e367944.js",
+        "/build/adminlte-sort.8ff818a1.js"
       ],
       "css": [
         "/build/adminlte-sort.8d9ca659.css"
@@ -55,9 +52,9 @@
     },
     "adminlte-field-filemanager": {
       "js": [
-        "/build/runtime.cbcc88f9.js",
-        "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
-        "/build/adminlte-field-filemanager.d8302fb7.js"
+        "/build/runtime.ef68e0db.js",
+        "/build/vendors-node_modules_core-js_internals_export_js.2e873f33.js",
+        "/build/adminlte-field-filemanager.5b4b01b5.js"
       ],
       "css": [
         "/build/adminlte-field-filemanager.aacd1c4c.css"
@@ -65,13 +62,12 @@
     },
     "adminlte-field-collection": {
       "js": [
-        "/build/runtime.cbcc88f9.js",
-        "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
-        "/build/vendors-node_modules_core-js_modules_es_string_replace_js.06749256.js",
-        "/build/vendors-node_modules_core-js_modules_es_array_find_js.5b9cb885.js",
-        "/build/vendors-node_modules_jquery_src_jquery_js.2a8ff255.js",
-        "/build/vendors-node_modules_jquery-ui-dist_jquery-ui_js.d62744d3.js",
-        "/build/adminlte-field-collection.db18b61c.js"
+        "/build/runtime.ef68e0db.js",
+        "/build/vendors-node_modules_core-js_internals_export_js.2e873f33.js",
+        "/build/vendors-node_modules_core-js_internals_advance-string-index_js-node_modules_core-js_internals-bed4a0.74e1ccb1.js",
+        "/build/vendors-node_modules_core-js_internals_array-iteration_js-node_modules_core-js_modules_es_str-0c9418.b5fc4c19.js",
+        "/build/vendors-node_modules_core-js_modules_es_array_find_js-node_modules_jquery-ui-dist_jquery-ui_js.2e367944.js",
+        "/build/adminlte-field-collection.88287cf4.js"
       ],
       "css": [
         "/build/adminlte-field-collection.55dda2c2.css"
@@ -79,10 +75,10 @@
     },
     "adminlte-main": {
       "js": [
-        "/build/runtime.cbcc88f9.js",
-        "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
-        "/build/vendors-node_modules_core-js_modules_es_string_replace_js.06749256.js",
-        "/build/adminlte-main.e8feeffc.js"
+        "/build/runtime.ef68e0db.js",
+        "/build/vendors-node_modules_core-js_internals_export_js.2e873f33.js",
+        "/build/vendors-node_modules_core-js_internals_advance-string-index_js-node_modules_core-js_internals-bed4a0.74e1ccb1.js",
+        "/build/adminlte-main.54e70d9c.js"
       ],
       "css": [
         "/build/adminlte-main.87244ec8.css"
@@ -90,7 +86,7 @@
     },
     "sov-reminder": {
       "js": [
-        "/build/runtime.cbcc88f9.js",
+        "/build/runtime.ef68e0db.js",
         "/build/sov-reminder.27580486.js"
       ],
       "css": [
@@ -99,16 +95,16 @@
     },
     "sov-ticket": {
       "js": [
-        "/build/runtime.cbcc88f9.js",
+        "/build/runtime.ef68e0db.js",
         "/build/sov-ticket.df76c7a0.js"
       ]
     },
     "app-backend": {
       "js": [
-        "/build/runtime.cbcc88f9.js",
-        "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
-        "/build/vendors-node_modules_core-js_modules_es_array_find_js.5b9cb885.js",
-        "/build/app-backend.9246973d.js"
+        "/build/runtime.ef68e0db.js",
+        "/build/vendors-node_modules_core-js_internals_export_js.2e873f33.js",
+        "/build/vendors-node_modules_core-js_modules_es_array_find_js-_7db00.020ca672.js",
+        "/build/app-backend.e87ef456.js"
       ],
       "css": [
         "/build/app-backend.3d882954.css"
@@ -116,23 +112,25 @@
     },
     "app-frontend": {
       "js": [
-        "/build/runtime.cbcc88f9.js",
-        "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
-        "/build/vendors-node_modules_core-js_modules_es_string_replace_js.06749256.js",
-        "/build/vendors-node_modules_jquery_src_jquery_js.2a8ff255.js",
+        "/build/runtime.ef68e0db.js",
+        "/build/vendors-node_modules_core-js_internals_export_js.2e873f33.js",
+        "/build/vendors-node_modules_core-js_internals_advance-string-index_js-node_modules_core-js_internals-bed4a0.74e1ccb1.js",
+        "/build/vendors-node_modules_core-js_internals_array-iteration_js-node_modules_core-js_modules_es_str-0c9418.b5fc4c19.js",
         "/build/vendors-node_modules_core-js_modules_es_string_split_js-node_modules_popper_js_dist_esm_popper_js.22d0763b.js",
-        "/build/vendors-node_modules_bootstrap_dist_js_bootstrap_js-node_modules_core-js_internals_object-def-7fa577.a4fc2b12.js",
-        "/build/app-frontend.0eab0ec9.js"
+        "/build/vendors-node_modules_bootstrap_dist_js_bootstrap_js-node_modules_core-js_modules_es_array_for-85fc9f.e742e2fb.js",
+        "/build/app-frontend.1e3b4ae2.js"
       ],
       "css": [
-        "/build/app-frontend.1e476ca5.css"
+        "/build/app-frontend.2ddca656.css"
       ]
     },
     "app-bulle": {
       "js": [
-        "/build/runtime.cbcc88f9.js",
-        "/build/vendors-node_modules_amcharts_amcharts4_charts_js-node_modules_amcharts_amcharts4_core_js-nod-e7c189.7a170faa.js",
-        "/build/app-bulle.522340dc.js"
+        "/build/runtime.ef68e0db.js",
+        "/build/vendors-node_modules_core-js_internals_export_js.2e873f33.js",
+        "/build/vendors-node_modules_core-js_internals_advance-string-index_js-node_modules_core-js_internals-bed4a0.74e1ccb1.js",
+        "/build/vendors-node_modules_amcharts_amcharts4_charts_js-node_modules_amcharts_amcharts4_core_js-nod-680fc8.d2df4450.js",
+        "/build/app-bulle.1628dbdd.js"
       ]
     }
   }

public/build/manifest.json

@@ -1,40 +1,41 @@
 {
-  "build/adminlte-plugins.js": "/build/adminlte-plugins.a206a66e.js",
+  "build/adminlte-plugins.js": "/build/adminlte-plugins.058f2e02.js",
   "build/adminlte-index.css": "/build/adminlte-index.e4548695.css",
-  "build/adminlte-index.js": "/build/adminlte-index.3de48d32.js",
+  "build/adminlte-index.js": "/build/adminlte-index.b393b588.js",
   "build/adminlte-form.css": "/build/adminlte-form.59862983.css",
-  "build/adminlte-form.js": "/build/adminlte-form.4079807b.js",
+  "build/adminlte-form.js": "/build/adminlte-form.52acb20e.js",
   "build/adminlte-sort.css": "/build/adminlte-sort.8d9ca659.css",
-  "build/adminlte-sort.js": "/build/adminlte-sort.72f3a9ea.js",
+  "build/adminlte-sort.js": "/build/adminlte-sort.8ff818a1.js",
   "build/adminlte-field-filemanager.css": "/build/adminlte-field-filemanager.aacd1c4c.css",
-  "build/adminlte-field-filemanager.js": "/build/adminlte-field-filemanager.d8302fb7.js",
+  "build/adminlte-field-filemanager.js": "/build/adminlte-field-filemanager.5b4b01b5.js",
   "build/adminlte-field-collection.css": "/build/adminlte-field-collection.55dda2c2.css",
-  "build/adminlte-field-collection.js": "/build/adminlte-field-collection.db18b61c.js",
+  "build/adminlte-field-collection.js": "/build/adminlte-field-collection.88287cf4.js",
   "build/adminlte-main.css": "/build/adminlte-main.87244ec8.css",
-  "build/adminlte-main.js": "/build/adminlte-main.e8feeffc.js",
+  "build/adminlte-main.js": "/build/adminlte-main.54e70d9c.js",
   "build/sov-reminder.css": "/build/sov-reminder.05d9ff45.css",
   "build/sov-reminder.js": "/build/sov-reminder.27580486.js",
   "build/sov-ticket.js": "/build/sov-ticket.df76c7a0.js",
   "build/app-backend.css": "/build/app-backend.3d882954.css",
-  "build/app-backend.js": "/build/app-backend.9246973d.js",
-  "build/app-frontend.css": "/build/app-frontend.1e476ca5.css",
-  "build/app-frontend.js": "/build/app-frontend.0eab0ec9.js",
-  "build/app-bulle.js": "/build/app-bulle.522340dc.js",
-  "build/runtime.js": "/build/runtime.cbcc88f9.js",
+  "build/app-backend.js": "/build/app-backend.e87ef456.js",
+  "build/app-frontend.css": "/build/app-frontend.2ddca656.css",
+  "build/app-frontend.js": "/build/app-frontend.1e3b4ae2.js",
+  "build/app-bulle.js": "/build/app-bulle.1628dbdd.js",
+  "build/runtime.js": "/build/runtime.ef68e0db.js",
   "build/pdfmake.js": "/build/pdfmake.fbf70324.js",
-  "build/canvg.js": "/build/canvg.23051f37.js",
+  "build/canvg.js": "/build/canvg.881f9fc1.js",
   "build/xlsx.js": "/build/xlsx.05855660.js",
-  "build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js": "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
-  "build/vendors-node_modules_core-js_modules_es_string_replace_js.06749256.js": "/build/vendors-node_modules_core-js_modules_es_string_replace_js.06749256.js",
-  "build/vendors-node_modules_core-js_modules_es_array_find_js.5b9cb885.js": "/build/vendors-node_modules_core-js_modules_es_array_find_js.5b9cb885.js",
-  "build/vendors-node_modules_jquery_src_jquery_js.2a8ff255.js": "/build/vendors-node_modules_jquery_src_jquery_js.2a8ff255.js",
-  "build/vendors-node_modules_jquery-ui-dist_jquery-ui_js.d62744d3.js": "/build/vendors-node_modules_jquery-ui-dist_jquery-ui_js.d62744d3.js",
+  "build/vendors-node_modules_core-js_internals_export_js.2e873f33.js": "/build/vendors-node_modules_core-js_internals_export_js.2e873f33.js",
+  "build/vendors-node_modules_core-js_internals_advance-string-index_js-node_modules_core-js_internals-bed4a0.74e1ccb1.js": "/build/vendors-node_modules_core-js_internals_advance-string-index_js-node_modules_core-js_internals-bed4a0.74e1ccb1.js",
+  "build/vendors-node_modules_core-js_internals_array-iteration_js-node_modules_core-js_modules_es_str-0c9418.b5fc4c19.js": "/build/vendors-node_modules_core-js_internals_array-iteration_js-node_modules_core-js_modules_es_str-0c9418.b5fc4c19.js",
+  "build/vendors-node_modules_core-js_modules_es_array_find_js-node_modules_jquery-ui-dist_jquery-ui_js.2e367944.js": "/build/vendors-node_modules_core-js_modules_es_array_find_js-node_modules_jquery-ui-dist_jquery-ui_js.2e367944.js",
   "build/vendors-node_modules_core-js_modules_es_string_split_js-node_modules_popper_js_dist_esm_popper_js.22d0763b.js": "/build/vendors-node_modules_core-js_modules_es_string_split_js-node_modules_popper_js_dist_esm_popper_js.22d0763b.js",
-  "build/vendors-node_modules_core-js_modules_es_array_filter_js-node_modules_core-js_modules_es_array-f7c72f.c0107d2e.js": "/build/vendors-node_modules_core-js_modules_es_array_filter_js-node_modules_core-js_modules_es_array-f7c72f.c0107d2e.js",
-  "build/vendors-node_modules_amcharts_amcharts4_charts_js-node_modules_amcharts_amcharts4_core_js-nod-e7c189.7a170faa.js": "/build/vendors-node_modules_amcharts_amcharts4_charts_js-node_modules_amcharts_amcharts4_core_js-nod-e7c189.7a170faa.js",
-  "build/vendors-node_modules_admin-lte_dist_js_adminlte_min_js-node_modules_bootstrap-autocomplete_di-57a6be.fa890b12.css": "/build/vendors-node_modules_admin-lte_dist_js_adminlte_min_js-node_modules_bootstrap-autocomplete_di-57a6be.fa890b12.css",
-  "build/vendors-node_modules_admin-lte_dist_js_adminlte_min_js-node_modules_bootstrap-autocomplete_di-57a6be.35767fac.js": "/build/vendors-node_modules_admin-lte_dist_js_adminlte_min_js-node_modules_bootstrap-autocomplete_di-57a6be.35767fac.js",
-  "build/vendors-node_modules_bootstrap_dist_js_bootstrap_js-node_modules_core-js_internals_object-def-7fa577.a4fc2b12.js": "/build/vendors-node_modules_bootstrap_dist_js_bootstrap_js-node_modules_core-js_internals_object-def-7fa577.a4fc2b12.js",
+  "build/vendors-node_modules_core-js_internals_add-to-unscopables_js-node_modules_core-js_modules_es_-e14c1c.756bb6b8.js": "/build/vendors-node_modules_core-js_internals_add-to-unscopables_js-node_modules_core-js_modules_es_-e14c1c.756bb6b8.js",
+  "build/vendors-node_modules_amcharts_amcharts4_charts_js-node_modules_amcharts_amcharts4_core_js-nod-680fc8.d2df4450.js": "/build/vendors-node_modules_amcharts_amcharts4_charts_js-node_modules_amcharts_amcharts4_core_js-nod-680fc8.d2df4450.js",
+  "build/vendors-node_modules_admin-lte_dist_js_adminlte_min_js-node_modules_bootstrap-autocomplete_di-5760c2.fa890b12.css": "/build/vendors-node_modules_admin-lte_dist_js_adminlte_min_js-node_modules_bootstrap-autocomplete_di-5760c2.fa890b12.css",
+  "build/vendors-node_modules_admin-lte_dist_js_adminlte_min_js-node_modules_bootstrap-autocomplete_di-5760c2.7a48c88c.js": "/build/vendors-node_modules_admin-lte_dist_js_adminlte_min_js-node_modules_bootstrap-autocomplete_di-5760c2.7a48c88c.js",
+  "build/vendors-node_modules_core-js_modules_es_array_find_js-_7db00.020ca672.js": "/build/vendors-node_modules_core-js_modules_es_array_find_js-_7db00.020ca672.js",
+  "build/vendors-node_modules_core-js_modules_es_array_find_js-_7db01.8e56d6b5.js": "/build/vendors-node_modules_core-js_modules_es_array_find_js-_7db01.8e56d6b5.js",
+  "build/vendors-node_modules_bootstrap_dist_js_bootstrap_js-node_modules_core-js_modules_es_array_for-85fc9f.e742e2fb.js": "/build/vendors-node_modules_bootstrap_dist_js_bootstrap_js-node_modules_core-js_modules_es_array_for-85fc9f.e742e2fb.js",
   "build/vendors-node_modules_xlsx_xlsx_js.f1747964.js": "/build/vendors-node_modules_xlsx_xlsx_js.f1747964.js",
   "build/images/fa-solid-900.svg": "/build/images/fa-solid-900.13de59f1.svg",
   "build/images/fa-brands-400.svg": "/build/images/fa-brands-400.216edb96.svg",

src/Controller/Frontend/CartoController.php

@@ -134,7 +134,7 @@ class CartoController extends DefaultController
         foreach ($territoryArray as $territory) {
             $resultSortArray[$territory->getDevAlias()] =
                 [
-                    AbstractData::TERRITORY => "",
+                    AbstractData::TERRITORY => $territory->getId(),
                     AbstractData::CATEGORY_REVOLT => "0",
                     AbstractData::CATEGORY_DREAM => "0",
                     AbstractData::CATEGORY_PROJECTBOOST => "0",
@@ -146,15 +146,10 @@ class CartoController extends DefaultController
             $className = (new ReflectionClass($result))->getShortName();
             if ($result->getIndividualData()) {
                 $devAliasTerritory = $result->getIndividualData()->getTerritory()->getDevAlias();
-                $idTerritory = $result->getIndividualData()->getTerritory()->getId();
             } elseif ($result->getCollectifData()->getTerritory()) {
                 $devAliasTerritory = $result->getCollectifData()->getTerritory()->getDevAlias();
-                $idTerritory = $result->getCollectifData()->getTerritory()->getId();
             }
 
-            if (empty($resultSortArray[$devAliasTerritory][AbstractData::TERRITORY])) {
-                $resultSortArray[$devAliasTerritory][AbstractData::TERRITORY] = $idTerritory;
-            }
             $resultSortArray[$devAliasTerritory][$className] = $resultSortArray[$devAliasTerritory][$className] + 1;
         }
 
@@ -192,19 +187,23 @@ class CartoController extends DefaultController
                     ];
 //                  on insere le premier thème de la contribution
                     $data[$key]['children'][] = [
-                        'name' => $contrib->getThematic()->getName(),
+                        'name' => $thematic->getName(),
+                        'id_thematic' => $thematic->getId(),
+                        'id_category' => AbstractData::getCategoryByLabel($contrib->__toString()),
                         'nb' => 1,
                     ];
                     $key++;
                 } else {
                     $keyTheme = array_search(
-                        $contrib->getThematic()->getName(),
+                        $thematic->getName(),
                         array_column($data[$keyAlreadyHere]['children'], 'name')
                     );
 //                    si le thème de la contribution n'existe pas encore on le créer
                     if ($keyTheme === false) {
                         $data[$keyAlreadyHere]['children'][] = [
-                            'name' => $contrib->getThematic()->getName(),
+                            'name' => $thematic->getName(),
+                            'id_thematic' => $thematic->getId(),
+                            'id_category' => AbstractData::getCategoryByLabel($contrib->__toString()),
                             'nb' => 1,
                         ];
                     } else {

src/Entity/AbstractData.php

@@ -38,4 +38,11 @@ abstract class AbstractData implements StatusInterface, EntityInterface
             self::CATEGORY_LABEL_PROJECTINSPIRING => self::CATEGORY_PROJECTINSPIRING,
         ];
     }
+
+    static function getCategoryByLabel(string $label): string
+    {
+        $categoryArray = self::getCategory();
+
+        return $categoryArray[$label];
+    }
 }

templates/frontend/carto-carte.html.twig

@@ -56,19 +56,19 @@
                 <div class="img-map img-{{ key }}">
                     {% set url = '<a href="'~ path('app_carto_liste', {search_list_form:{category:{'':constant('App\\Entity\\AbstractData::CATEGORY_REVOLT')}, territory:{'':result.Territory}}}) ~'">Consulter la liste</a>' %}
                     <img src="{{ 'assets/img/Picto-Revoltes.png' }}" alt="" data-toggle="popover"
-                        tabindex="0" data-trigger="focus" data-content='<span>Nombre de Révoltes : {{ result.Revolt }} </span> {{ url }}'>
+                        tabindex="0" data-content='<span>Nombre de Révoltes : {{ result.Revolt }} </span> {{ url }}'>
 
                     {% set url = '<a href="'~ path('app_carto_liste', {search_list_form:{category:{'':constant('App\\Entity\\AbstractData::CATEGORY_DREAM')}, territory:{'':result.Territory}}}) ~'">Consulter la liste</a>' %}
                     <img src="{{ 'assets/img/Picto-Reve.png' }}" alt="" data-toggle="popover"
-                         tabindex="0" data-trigger="focus" data-content='<span>Nombre de Rêves : {{ result.Dream }} </span> {{ url }}'>
+                         tabindex="0" data-content='<span>Nombre de Rêves : {{ result.Dream }} </span> {{ url }}'>
 
                     {% set url = '<a href="'~ path('app_carto_liste', {search_list_form:{category:{'':constant('App\\Entity\\AbstractData::CATEGORY_PROJECTBOOST')}, territory:{'':result.Territory}}}) ~'">Consulter la liste</a>' %}
                     <img src="{{ 'assets/img/Picto-Actions-Booster.png' }}" alt="" data-toggle="popover"
-                         tabindex="0" data-trigger="focus" data-content='<span>Nombre de projets à booster : {{ result.ProjectBoost }} </span> {{ url }}'>
+                         tabindex="0" data-content='<span>Nombre de projets à booster : {{ result.ProjectBoost }} </span> {{ url }}'>
 
                     {% set url = '<a href="'~ path('app_carto_liste', {search_list_form:{category:{'':constant('App\\Entity\\AbstractData::CATEGORY_PROJECTINSPIRING')}, territory:{'':result.Territory}}}) ~'">Consulter la liste</a>' %}
                     <img src="{{ 'assets/img/Picto-Actions-Inspirantes.png' }}" alt="" data-toggle="popover"
-                         tabindex="0" data-trigger="focus" data-content='<span>Nombre de projets inspirants : {{ result.ProjectInspiring }} </span> {{ url }}'>
+                         tabindex="0" data-content='<span>Nombre de projets inspirants : {{ result.ProjectInspiring }} </span> {{ url }}'>
                 </div>
             {% endfor %}
         </div>

templates/frontend/carto-int.html.twig

@@ -4,8 +4,11 @@
     <div id="carto-int">
         <h1 class="title-interactive">La cartographie interactive Nord Franche-Comté</h1>
 
-        <div class="carto-bulles">
+        <div class="popup-bulle">
+            {% set url = '<a href="'~ path('app_carto_liste', {search_list_form:{category:{'':'temp'}, thematic:{'':'1'}}}) ~'">Consulter la liste</a>' %}
+            <div class="popup" data-toggle="popover-bulle" tabindex="0" data-content='<span>Nombre : <span class="nb"></span></span> {{ url }}'></div>
 
+            <div class="carto-bulles"></div>
         </div>
     </div>
 {% endblock %}