From 7faa9ef3272141232bcdc07435b4dde65ce92a74 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Wed, 15 May 2019 11:11:12 +0200
Subject: [PATCH] bugfixes in Cache edit

---
 frontend/src/components/qrscanner.vue         | 12 ++++++++---
 frontend/src/layouts/MyLayout.vue             | 19 ++++++++++++++++--
 frontend/src/pages/Cache.vue                  | 20 +++++++++----------
 frontend/src/pages/MyCaches.vue               |  2 ++
 frontend/src/pages/Overview.vue               |  2 ++
 frontend/src/pages/Register.vue               |  8 ++++++--
 frontend/src/pages/StationEdit.vue            |  9 ++++++++-
 frontend/src/store/cacheCollector/getters.js  |  4 ++++
 .../src/store/cacheCollector/mutations.js     |  7 ++++++-
 frontend/src/store/cacheCollector/state.js    |  1 +
 10 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/frontend/src/components/qrscanner.vue b/frontend/src/components/qrscanner.vue
index 471a353..08189fe 100644
--- a/frontend/src/components/qrscanner.vue
+++ b/frontend/src/components/qrscanner.vue
@@ -93,9 +93,15 @@
           console.log(params);
           if (!params.cacheID || !params.stationID || !params.durchgefuehrterCacheID || !params.token) {
             console.log("Mindestens 1 Parameter konnte nicht erkannt werden!");
+            let header = "Fehler!";
+            let message = "Der erkannte QR-Code ist fehlerhaft oder gehört nicht zu BuGa Geocaching.";
+            this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: message, title: header, });
             resolve(false);
           } else if (isNaN(params.cacheID) || isNaN(params.stationID) || isNaN(params.durchgefuehrterCacheID)) {
             console.log("Mindestens 1 Parameter ist fehlerhaft!");
+            let header = "Fehler!";
+            let message = "Der erkannte QR-Code ist fehlerhaft oder gehört nicht zu BuGa Geocaching.";
+            this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: message, title: header, });
             resolve(false);
           } else {
             this.$axios.put('/api/checkStation', null, { params })
@@ -162,12 +168,12 @@
       },
 
       updateProps() {
-        console.log("emit result!")
+        console.log("emit result!");
         this.$emit('result', this.params)
       },
       updateCameraState() {
-        console.log("Camera State:")
-        console.log(!this.askForPermission)
+        console.log("Camera State:");
+        console.log(!this.askForPermission);
         this.$emit('camera', !this.askForPermission)
       },
 
diff --git a/frontend/src/layouts/MyLayout.vue b/frontend/src/layouts/MyLayout.vue
index a689d69..cfdf895 100644
--- a/frontend/src/layouts/MyLayout.vue
+++ b/frontend/src/layouts/MyLayout.vue
@@ -1,5 +1,5 @@
 <template>
-  <q-layout view="hhh Lpr lFf">
+  <q-layout view="hhh Lpr lFf" @click.native="counter()">
     <q-header id="qheader" class="bg-white text-grey-14" elevated>
       <q-toolbar class="q-pa-md">
         <q-img src="statics/buga_logo.svg" style="max-width: 40px;" class="q-mr-sm"/>
@@ -162,6 +162,17 @@
             <q-item-label>Login</q-item-label>
           </q-item-section>
         </q-item>
+
+<!--        <q-item-->
+<!--          disable-->
+<!--          class="text-grey-5"-->
+<!--        >-->
+<!--          <q-item-section avatar>-->
+<!--          </q-item-section>-->
+<!--          <q-item-section>-->
+<!--            <q-item-label>dev: {{ clickCounter }} clicks</q-item-label>-->
+<!--          </q-item-section>-->
+<!--        </q-item>-->
       </q-list>
     </q-drawer>
 
@@ -196,6 +207,7 @@
     data() {
       return {
         leftDrawerOpen: this.$q.platform.is.desktop,
+        clickCounter: 0,
       };
     },
     computed: {
@@ -238,7 +250,10 @@
       //this.evalAuthentication();
     },
     methods: {
-      //openURL
+      counter() {
+        this.clickCounter++;
+        //console.log(this.clickCounter);
+      },
       dialogClose() {
         console.log("dialogClose(): ")
         this.$store.commit('dialog/RESET_MESSAGE_DIALOG');
diff --git a/frontend/src/pages/Cache.vue b/frontend/src/pages/Cache.vue
index fd18a6f..7e46324 100644
--- a/frontend/src/pages/Cache.vue
+++ b/frontend/src/pages/Cache.vue
@@ -124,7 +124,7 @@
     created: function () {
       console.log("isNewCache: " + this.isNewCache);
       console.log("Route Params: " + this.$route.params.id);
-      if (!this.isNewCache) {
+      if (!this.isNewCache && !this.$store.getters['cacheCollector/GET_LOCK']) {
         this.$axios.get('/api/allCaches')
           .then((response) => {
             console.log("/api/allCaches");
@@ -140,8 +140,8 @@
             this.$store.commit('cacheCollector/SET_STATIONS', stations);
             this.$store.commit('cacheCollector/SET_ENDSTATION', endstation);
           })
-
       }
+      this.$store.commit('cacheCollector/SET_LOCK', false);
     },
     beforeMount: function () {
     },
@@ -174,25 +174,22 @@
         console.log(this.$store.getters['cacheCollector/GET_STATIONS']);
         const station = this.$store.getters['cacheCollector/GET_STATIONS'][index];
         console.log(station);
-        if (station.hasOwnProperty('id')) {
-          //this.$router.push({ path: '/station/'+station.id});
-        } else {
-          // TODO Stationen bearbeitbar machen bevor sie abgeschickt werden. Am besten Station Objekt als Übergabe Parameter bei Router
-          this.$store.commit('cacheCollector/SET_TEMPSTATION', station);
-          this.$router.push({path: `/tempstation/${index}`}); // add parameter
-        }
+        this.$store.commit('cacheCollector/SET_TEMPSTATION', station);
+        this.$store.commit('cacheCollector/SET_LOCK', true);
+        this.$router.push({path: `/tempstation/${index}`}); // add parameter
       },
       deleteStation(index) {
-        // TODO wenn Station id hat, mit Backend abgleichen
         this.$store.commit('cacheCollector/REMOVE_STATION', index);
       },
       saveCache() {
         // commit to store, send to api, if success -> reset store
+        console.log("saveCache!");
         let cache = JSON.parse(JSON.stringify(this.computedCache));
         console.log(cache);
         cache.stationen.push(this.computedEndstation);
+        console.log("isnewcache "+this.isNewCache)
         if (this.isNewCache) {
-
+          console.log("CREATECACHE")
           this.$axios.post('/api/createCache', cache)
             .then((response) => {
               console.log("POST api/createCache: " + response.statusText);
@@ -217,6 +214,7 @@
             this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {message: msg, title: title,});
           })
         } else {
+          console.log("EDITCACHE")
           this.$axios.put('/api/editCache', cache)
             .then((response) => {
               console.log("POST api/editCache: " + response.statusText);
diff --git a/frontend/src/pages/MyCaches.vue b/frontend/src/pages/MyCaches.vue
index d7e463e..de3842f 100644
--- a/frontend/src/pages/MyCaches.vue
+++ b/frontend/src/pages/MyCaches.vue
@@ -21,6 +21,7 @@
       <q-tab-panels v-model="tab" animated swipeable class="col">
 
         <q-tab-panel name="startedCaches" class=" fit">
+          <p class="text-grey-4 text-h5 text-center" v-if="startedCaches.filter(cache => cache.cacheAccesDefinition.id === 0).length === 0">keine Einträge</p>
           <q-list>
             <q-card
               class="q-mb-md"
@@ -55,6 +56,7 @@
         </q-tab-panel>
 
         <q-tab-panel name="finishedCaches" class="fit">
+          <p class="text-grey-4 text-h5 text-center" v-if="startedCaches.filter(cache => cache.cacheAccesDefinition.id === 1).length === 0">keine Einträge</p>
           <q-list>
             <q-card class="q-mb-md"
                     v-for="finishedCache in startedCaches.filter(cache => cache.cacheAccesDefinition.id === 1)"
diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue
index 03db3e3..3856f9a 100644
--- a/frontend/src/pages/Overview.vue
+++ b/frontend/src/pages/Overview.vue
@@ -27,6 +27,7 @@
             color="primary"
             size="10em"
           />
+          <p class="text-grey-4 text-h5 text-center" v-if="caches.length === 0">keine Einträge</p>
           <q-list v-if="render">
             <q-card class="q-mb-md" v-for="cache in caches" :key="cache.id">
               <q-expansion-item
@@ -229,6 +230,7 @@
       },
 
       addCache() {
+        this.$store.commit('cacheCollector/RESET_NEW_CACHE');
         this.$router.push({path: `/cache`})
       },
       editCache(cacheID) {
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 2a9d9ae..fb31b6a 100644
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -134,13 +134,17 @@
             })
             .catch((error) => {
               let message;
-              let header = "Unbekannter Fehler...";
+              let header = "Unbekannter Fehler!";
               if (error.response) {
-                console.log(error.response)
+                console.log(error.response);
                 if (error.response.status === 409) {
                   message= "Die E-Mail-Adresse wird bereits verwendet!";
                   header= "Anmeldedaten überprüfen!";
                 }
+                if (error.response.status === 500) {
+                  message= "Der Anmeldeserver konnte die Daten nicht verarbeiten.";
+                  header= "Fehler!";
+                }
               } else if (error.request) {
                 console.log(error.request);
                 header = "Anfrage fehlgeschlagen!";
diff --git a/frontend/src/pages/StationEdit.vue b/frontend/src/pages/StationEdit.vue
index a1736d9..61b2db3 100644
--- a/frontend/src/pages/StationEdit.vue
+++ b/frontend/src/pages/StationEdit.vue
@@ -97,13 +97,20 @@
       saveStation() {
         console.log("saveStation(): ");
         console.log(this.station);
+        console.log(this.isNewStation);
+        console.log(this.$route.params.pos);
         if (this.isNewStation) {
           this.$store.commit('cacheCollector/ADD_STATION', this.station);
         } else {
           this.$store.commit('cacheCollector/EDIT_STATION', {index: this.$route.params.pos, station: this.station});
           this.$store.commit('cacheCollector/SET_TEMPSTATION', null);
         }
-        this.$router.push({path: `/cache`});
+        let cache = this.$store.getters['cacheCollector/GET_CACHE'];
+        if (cache.hasOwnProperty('id')) {
+          this.$router.push({path: `/cache/${cache.id}`});
+        } else {
+          this.$router.push({path: `/cache`});
+        }
         console.log("station saved..");
       },
       dismiss() {
diff --git a/frontend/src/store/cacheCollector/getters.js b/frontend/src/store/cacheCollector/getters.js
index a09722a..3292a66 100644
--- a/frontend/src/store/cacheCollector/getters.js
+++ b/frontend/src/store/cacheCollector/getters.js
@@ -2,6 +2,10 @@ export const GET_CACHE = (state) => {
   console.log("GET_CACHE: retrieve cache from store. ");
   return state.newCache;
 };
+export const GET_LOCK = (state) => {
+  console.log("GET_LOCK: ");
+  return state.locked;
+};
 export const GET_TEMPSTATION = (state) => {
   console.log("GET_TEMPSTATION: retrieve cache from store. ");
   return state.tempStation;
diff --git a/frontend/src/store/cacheCollector/mutations.js b/frontend/src/store/cacheCollector/mutations.js
index 360fe68..ec68887 100644
--- a/frontend/src/store/cacheCollector/mutations.js
+++ b/frontend/src/store/cacheCollector/mutations.js
@@ -1,7 +1,11 @@
 export const SET_CACHE = (state, cache) => {
-  console.log("SET_CACHE: save cache to store. ")
+  console.log("SET_CACHE: save cache to store. ");
   state.newCache = cache;
 };
+export const SET_LOCK = (state, bool) => {
+  console.log("SET_LOCK: ");
+  state.locked = bool;
+};
 export const SET_TEMPSTATION = (state, station) => {
   console.log("SET_TEMPSTATION: add new station to cache: "+station);
   state.tempStation = station;
@@ -25,6 +29,7 @@ export const EDIT_STATION = (state, indexStation) => {
   console.log("EDIT_STATION: "+index+" "+station);
 
   state.newCache.stationen[index] = station;
+  console.log("EDIT_STATION: "+JSON.stringify(state.newCache.stationen[index]));
 };
 export const REMOVE_STATION = (state, index) => {
   console.log("REMOVE_STATION: "+index);
diff --git a/frontend/src/store/cacheCollector/state.js b/frontend/src/store/cacheCollector/state.js
index 95549d4..b8cb39a 100644
--- a/frontend/src/store/cacheCollector/state.js
+++ b/frontend/src/store/cacheCollector/state.js
@@ -1,4 +1,5 @@
 export default {
+  locked: false,
   newCache: {
     name: "",
     description: "",