Merge pull request #969 from MTES-MCT/master

MTES-MCT · Nov 18, 2024 · f146f81 · f146f81
2 parents 2c3167a + a720486
commit f146f81
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/pages/ddt/_departement/collectivites/index.vue b/pages/ddt/_departement/collectivites/index.vue
@@ -196,12 +196,17 @@ export default {
       ]
     },
     collectivites () {
-      return this.referentiel?.filter(e => this.selectedCollectiviteTypesFilter.includes(e.type))
+      return this.referentiel?.filter((collectivite) => {
+        return !!this.selectedCollectiviteTypesFilter.find(type => collectivite.type.includes(type))
+      })
     }
   },
   async mounted () {
     const referentiel = await fetch(`/api/geo/collectivites?departements=${this.$route.params.departement}`)
     const { communes, groupements } = await referentiel.json()
+
+    console.log('groupements', groupements)
+
     const procedures = await this.$urbanisator.getCollectivitesProcedures(communes.map(c => c.code))
 
     const enrichedCommunes = this.parseCommunes(communes, procedures)

diff --git a/pages/frise/_procedureId/index.vue b/pages/frise/_procedureId/index.vue
@@ -55,8 +55,8 @@
           </template>
 
           <v-list>
-            <FriseInfosDialog v-if="isDgdActive" />
-            <FriseVoletQualiDialog v-if="isDgdActive" />
+            <!-- <FriseInfosDialog v-if="isDgdActive" />
+            <FriseVoletQualiDialog v-if="isDgdActive" /> -->
 
             <FriseDgdDialog v-if="isDgdActive" />
             <!-- <v-list-item link>

diff --git a/plugins/sharing.js b/plugins/sharing.js
@@ -1,7 +1,7 @@
 import _ from 'lodash'
 import axios from 'axios'
 
-export default ({ app, $supabase, $utils, $user }, inject) => {
+export default ({ app, $supabase, $utils, $user, $analytics }, inject) => {
   const sharing = {
     async  addToCollabs (procedure, collabs, collectivite) {
       let toInsert = collabs.map(e => ({
@@ -27,7 +27,7 @@ export default ({ app, $supabase, $utils, $user }, inject) => {
       toInsert = [...toInsert, sender]
       console.log('TO INSERT: ', toInsert)
 
-      this.$analytics({
+      $analytics({
         category: 'partage',
         name: 'ajout collaborateur',
         value: 'write_frise'