Merge branch 'master' into stage

Author: yvess

django/gsmap/schema.py

@@ -2,6 +2,7 @@
 import json
 import graphene
 from django.contrib.gis.db import models
+from django.contrib.gis.db.models import Q
 from django_filters import FilterSet
 from graphene.types import generic
 from graphene_django.types import DjangoObjectType
@@ -42,8 +43,8 @@ def resolve_thumbnail(self, info, size):
         return ThumbnailNode(self, size=size)
 
 
-Q_SNAPSHOT_ONLY_PUBLIC = models.Q(permission__exact=SnapshotPermission.PUBLIC)
-Q_SNAPSHOT_WITH_NOT_LISTED = models.Q(permission__lte=SnapshotPermission.NOT_LISTED)
+Q_SNAPSHOT_ONLY_PUBLIC = Q(permission__exact=SnapshotPermission.PUBLIC)
+Q_SNAPSHOT_WITH_NOT_LISTED = Q(permission__lte=SnapshotPermission.NOT_LISTED)
 
 
 class SnapshotOnlyPublicFilter(FilterSet):
@@ -89,7 +90,7 @@ class Meta:
     perimeter_bounds = graphene.List(graphene.Float)
 
     def resolve_snapshots(self, info):
-        return Snapshot.objects.filter(municipality__id=self.pk)
+        return Snapshot.objects.filter(Q_SNAPSHOT_ONLY_PUBLIC & Q(municipality__id=self.pk))
 
     def resolve_perimeter_centroid(self, info):
         return self.perimeter.centroid

vue/src/components/SnapshotList.vue

@@ -14,13 +14,14 @@
     three-line>
 
       <v-subheader
+        v-if="snapshots.length != 0 && title"
         style="color:black;font-weight:700;"
-        class="px-0">{{ listtitle }}
+        class="px-0">{{ title }}
       </v-subheader>
 
-      <v-list-item v-for="snapshot in snapshots" :key="snapshot.id"
-        :to="createRouteLink(snapshot.pk)"
-        class="px-2 mb-4" dense>
+      <v-list-item class="px-2 mb-4" dense
+        v-for="snapshot in snapshots" :key="snapshot.id"
+        :to="createRouteLink(snapshot.pk)">
         <v-list-item-avatar tile size="64" class="my-2">
           <v-img :src="djangobaseurl + snapshot.screenshot.url"></v-img>
         </v-list-item-avatar>
@@ -64,7 +65,10 @@ export default {
       default: ''
     },
     snapshots: Array,
-    listtitle: String
+    title: {
+      type: String,
+      default: ''
+    }
   },
 
   methods: {

vue/src/router/index.js

@@ -107,7 +107,7 @@ const routes = [
       {
         path: ':wshash([0-9A-Z]{5})/:hash([0-9A-Z]{6})/',
         pathToRegexpOptions: { sensitive: true, strict: true },
-        name: 'workspace',
+        name: 'workspaceRedirect',
         component: () => import('@/views/Workspace.vue'),
         meta: {
           layout: () => import('@/layouts/LayoutSnapshot.vue')

vue/src/views/Snapshot.vue

@@ -10,7 +10,8 @@
     "noSnapshot.municipalityText": "diese Gemeinde",
     "noSnapshot.p1": "Für {municipalityText} stehen zur Zeit noch keine Daten zur Verfügung.",
     "noSnapshot.p2": "Erkunden Sie unsere Fallbeispiele um ein besseres Bild der Möglichkeiten für Ihre Gemeinde zu erhalten.",
-    "listtitle": "Fallbeispiele"
+    "listtitle": "Fallbeispiele",
+    "listtitleMore": "Weitere Fallbeispiele"
   },
   "fr": {
     "calltoactionText": "Offre pour votre commune",
@@ -21,7 +22,8 @@
     "noSnapshot.municipalityText": "cette communauté",
     "noSnapshot.p1": "En ce moment il n’éxiste pas encore de données pour {municipalityText}.",
     "noSnapshot.p2": "Prenez compte de nos études pour une meilleure vue d’ensemble des possibilitiées qui s’offrent à votre commune.",
-    "listtitle": "Examples"
+    "listtitle": "Examples",
+    "listtitleMore": "D'autres examples"
   }
 }
 </i18n>
@@ -62,12 +64,17 @@
               </router-link>
             </v-btn>
           </div>
+
+          <snapshot-list
+            v-if="snapshotsMunicipality"
+            :snapshots="snapshotsMunicipality"
+          />
         </div>
 
         <snapshot-list
+          v-if="snapshotsExamples"
           :snapshots="snapshotsExamples"
-          :pushRoute="true"
-          :listtitle="this.$t('listtitle')"
+          :title="listtitleText"
         />
       </div>
 
@@ -124,7 +131,9 @@ export default {
       geojson: null,
       geobounds: [],
       municipalityName: '',
-      snapshotsExamples: []
+      snapshotsExamples: [],
+      snapshotsIdExamplesExclude: [],
+      snapshotsMunicipality: []
     };
   },
 
@@ -153,6 +162,13 @@ export default {
 
     municipalityText() {
       return this.municipalityName ? this.municipalityName : this.$t('noSnapshot.municipalityText');
+    },
+
+    listtitleText() {
+      if (this.snapshotsMunicipality.length > 0) {
+        return this.$t('listtitleMore');
+      }
+      return this.$t('listtitle');
     }
   },
 
@@ -167,6 +183,15 @@ export default {
             municipality {
               bfsNumber
               fullname
+              snapshots {
+                id
+                pk
+                title
+                topic
+                screenshot {
+                  url
+                }
+              }
             }
           }
 
@@ -191,7 +216,12 @@ export default {
       if (result.data.hasOwnProperty('snapshot') && result.data.snapshot) {
         this.geojson = result.data.snapshot.data;
         this.municipalityName = result.data.snapshot.municipality.fullname;
-        this.snapshotsExamples = result.data.snapshots.edges.map(snapshot => snapshot.node);
+        this.snapshotsMunicipality = result.data.snapshot.municipality.snapshots;
+        const snapshotsIdExamplesExclude = this.snapshotsMunicipality.map(snapshot => snapshot.id);
+        this.snapshotsExamples = result.data.snapshots.edges.map(snapshot => snapshot.node).filter(
+          snapshot => !snapshotsIdExamplesExclude.includes(snapshot.id)
+        );
+
         this.$store.commit('setBfsnumber', result.data.snapshot.municipality.bfsNumber);
         this.$store.commit('setBfsname', result.data.snapshot.municipality.fullname);
       } else {
@@ -208,8 +238,18 @@ export default {
             fullname
             perimeter
             perimeterBounds
+            snapshots {
+              id
+              pk
+              title
+              topic
+              screenshot {
+                url
+              }
+            }
           }
-          snapshots {
+
+          snapshots(isShowcase: true) {
             edges {
               node {
                 id
@@ -230,7 +270,7 @@ export default {
       this.municipalityName = result.data.municipality.fullname;
       this.geojson = result.data.municipality.perimeter;
       this.geobounds = result.data.municipality.perimeterBounds;
-      this.snapshotsExamples = result.data.snapshots.edges;
+      this.snapshotsExamples = result.data.snapshots.edges.map(snapshot => snapshot.node);
       this.$store.commit('setBfsnumber', result.data.municipality.bfsNumber);
       this.$store.commit('setBfsname', result.data.municipality.fullname);
     }

vue/src/views/Workspace.vue

@@ -2,10 +2,8 @@
 <i18n>
 {
   "de": {
-    "listtitle": "Scans"
   },
   "fr": {
-    "listtitle": "Scans"
   }
 }
 </i18n>
@@ -37,7 +35,6 @@
 
         <snapshot-list
           :snapshots="snapshotsWorkspace"
-          :listtitle="$t('listtitle')"
           :workspaceHash="wshash"
         />
       </div>
@@ -128,7 +125,6 @@ export default {
             pk
             title
             description
-
             snapshots {
               id
               pk
@@ -147,6 +143,15 @@ export default {
             municipality {
               bfsNumber
               fullname
+              snapshots {
+                id
+                pk
+                title
+                topic
+                screenshot {
+                  url
+                }
+            }
             }
           }
         }`,