Merge branch 'feature/carto' into develop

resources/js/components/Dashboard/AdminView/Components/MaturityCyberMap.vue

@@ -56,7 +56,7 @@ export default {
             return this.$store.state.measures.all.filter( m => m.fundamental)
         },
         organizations () {
-            let orgs = this.$store.state.organizations.all.map( org => {
+            let orgs = this.$store.state.organizations.all.filter(org => org.active).map( org => {
                 let evaluations = this.evaluations.filter( e => e.organization_id === org.id)
                                 .filter( e => e.status === 2)
                                 .sort( (a,b) => new Date(b.updated_at) - new Date(a.updated_at))

resources/js/components/Organizations/Single/PositionBlock.vue

@@ -80,7 +80,7 @@ export default {
                     this.loading = false
 
                     if (!res.data.features.length) {
-                        this.$emit('addressError', "L'adresse n'a pas été trouvé")
+                        this.$emit('addressError', "L'adresse n'a pas été trouvée")
                         return;
                     }  else {
                         this.enableMap = true
@@ -91,6 +91,10 @@ export default {
                         this.setMarker(pointData.geometry.coordinates[1], pointData.geometry.coordinates[0])
                     }
                 })
+                .catch( () => {
+                    this.loading = false; 
+                    this.$emit('addressError', "L'adresse n'a pas été trouvée")
+                })
             }
         }
     }

resources/sass/app.scss

@@ -226,3 +226,14 @@ select.form-control {
 }
 
 /* DASHBOARD */
+// MARKER CLUSTER
+.marker-cluster {
+    background-color: rgba(40, 40, 91, 0.6)!important;
+    color:white!important;
+}
+.marker-cluster div {
+    background-color: rgba(40, 40, 91, 0.6)!important;
+}
+.marker-cluster span {
+    font-weight: bold;
+}
\ No newline at end of file