Merge branch 'develop' into frontend/robin

build.gradle

@@ -58,6 +58,9 @@ dependencies {
 
     compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.0.2'
 
+    // https://mvnrepository.com/artifact/com.mashape.unirest/unirest-java
+    compile group: 'com.mashape.unirest', name: 'unirest-java', version: '1.3.1'
+
 }
 
 node {

frontend/quasar.conf.js

@@ -111,12 +111,12 @@ module.exports = function (ctx) {
         ? { // Base URL for API-Calls: DEV
           API: JSON.stringify('http://localhost:8080'),
           // API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching'),
-          USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19usermanagement')
+          USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement')
         }
         : { // Base URL for API-Calls: PRODUCTION (build)
           API: JSON.stringify('http://localhost:8080'),
           //API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching'),
-          USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19usermanagement')
+          USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement')
         }
     },
 

frontend/src/pages/CacheStart.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
-    <q-img transition="fade"
+    <iframe transition="fade"
            class="q-mb-md "
-           :ratio="16/9"
+           height= "200px"
-           src="https://www.buga2019.de/we-bilder/3.Gartenausstellung/Gelaendeplan/190320_Gelaendeplan-quadratisch.jpg"
+           width= "100%"
            v-if="!cameraActive"
-    ></q-img>
+           :src= "iFrameURL" frameborder="0"></iframe>
     <div v-if="!cameraActive" class="q-ma-md">
       <p class="text-h4">{{ cacheName }}</p>
       <p>{{ instruction }}</p>
@@ -21,13 +21,27 @@
     name: "CacheStart",
     components: {qrscanner},
     data() {
-      return { //TODO Lageplan einbinden
+      return {
         result: null,
         cameraActive: false,
         cacheID: "",
         cacheName: "",
         //code: "8/7",
         instruction: "Bitte begib Dich zu der auf der Karte angezeigten Position. An dieser Position wirst Du einen QR-Code finden. Wenn du ihn gefunden hast, drücke den Knopf zum Starten des QR-Scanners und gib uns die Berechtigung, Deine Kamera zu öffnen. Nachdem Du den QR-Code gescannt hast, erhältst du ein Rätsel zur Position der nächsten Station. Die Lösung zu dem Rätsel ist also das Versteck des nächsten QR-Codes.",
+        // Following Params belong to QR-Code Scanner
+        askForPermission: true,
+        activateCamera: false,
+        isValid: false,
+        validating: false,
+        loading: false,
+        paused: false,
+        params: null,
+        noStreamApiSupport: false,
+        lon: "",
+        lat: "",
+        stationID: [],
+        iFrameURL: ""
+
       }
     },
     created() {
@@ -42,8 +56,40 @@
             const cache = response.data.find(cache => cache.id === Number(this.$route.params.cache));
             this.cacheName = cache.name;
             this.cacheID = this.$route.params.cache;
+            this.stationID = cache.stationen[0];
+            this.lon = this.stationID.longitude;
+            this.lat = this.stationID.lattitude;
+            this.iFrameURL = `http://www.se.hs-heilbronn.de:3000/api/map/lon=${this.lon}&lat=${this.lat}`
           })
       },
+      checkStation() {
+        let params = this.setParams();
+        console.log(params);
+        this.$axios.get('/api/checkStation', {params})
+          .then((response) => {
+            console.log(response);
+            console.log("Anfrage erfolgreich");
+
+          }).catch((error) => {
+          console.log(error);
+          console.log("Anfrage fehlgeschlagen");
+        })
+        this.$router.push({path: `/station/${params.cacheID}/${params.stationID}`})
+      },
+
+      setParams() {
+        console.log("setParams: ");
+        let params = {};
+        params.cacheID = this.result.split('/')[0];
+        params.stationID = this.result.split('/')[1];
+        params.durchgefuehrterCacheID = this.cacheID;
+        console.log("CacheID: " + params.cacheID + " und StationID: " + params.stationID);
+        console.log(params.durchgefuehrterCacheID);
+        if (localStorage.getItem('userToken')) {
+          params.token = JSON.parse(localStorage.getItem('userToken')).token;
+        }
+        return params;
+      },
 
       updateResult(event) {
         console.log("updateResult()");

frontend/src/pages/Overview.vue

@@ -93,6 +93,8 @@
       return {
         tab: 'list',
         caches: [],
+        stations: [],
+        pois: []
       }
     },
     mounted: function () {
@@ -116,8 +118,19 @@
       fetchAllCaches() {
         this.$axios.get('/api/allCaches')
           .then((response) => {
-            console.log("Caches: " + this.caches);
             this.caches = response.data;
+            for(let cache in this.caches) {
+
+              this.stations[cache]=(this.caches[cache].stationen[0]);
+              const poiItem = {
+                Name: this.caches[cache].name,
+                CategoryID: 3,
+                Latitude: this.stations[cache].lattitude,
+                Longitude: this.stations[cache].longitude
+              };
+              this.pois.push(poiItem);
+            }
+            this.initMap();
           }).catch((error) => {
           let message;
           let header = "Fehler: ";
@@ -146,9 +159,23 @@
       },
       editCache() {
       },
+      initMap(){
+        console.log("Signalwort: " + this.pois);
+      //   this.$axios.post('http://seserver.se.hs-heilbronn.de:3000/api/map', {
+      //     body: this.pois
+      //   }).then((response)=>{
+      //     console.log(response)
+      //   })
+      // },
+        this.$axios.get('http://www.se.hs-heilbronn.de:3000/api/map/lon=9&lat=49', {
+          body: this.pois
+        }).then((response)=>{
+          console.log(response)
+        })
+      },
       deleteCache(id) {
         console.log('delete cache: ' + id);
-        this.$axios.get('/api/deleteCache', {params: {cacheID: id}})
+        axios.get('/api/deleteCache', {params: {cacheID: id}})
           .then((response) => {
             this.fetchAllCaches()
           }).catch((error) => {

frontend/src/pages/ranking.vue

@@ -36,13 +36,13 @@
 
         <q-tab-panel name="team" class=" fit">
           <q-list>
-            <q-card class="q-mb-md">
+            <q-card class="q-mb-md" v-for="(team,index) in teamRankinglist" :key="team.id">
               <q-item class="q-pr-sm ">
                 <q-item-section>
-                  <q-item-label>Single line item</q-item-label>
+                  <q-item-label><a class="text-black" style="text-decoration: none"><span>{{index+1}}. {{team.teamname}}</span></a></q-item-label>
                 </q-item-section>
                 <q-item-section side>
-                  <span class="text-grey"> Punkte </span>
+                  <span class="text-grey">{{team.rankingPointsSum}} Punkte </span>
                 </q-item-section>
               </q-item>
             </q-card>
@@ -68,12 +68,15 @@
     data() {
       return {
         tab: 'solo',
-        rankinglist: []
+        rankinglist: [],
+        teamRankinglist: []
       }
     },
     created: function() {
       console.log("created(): " + this.rankinglist);
+      console.log("created(): " + this.teamRankinglist);
       this.fetchRankinglist();
+      this.fetchTeamRankinglist();
     },
     methods: {
       fetchRankinglist() {
@@ -104,6 +107,35 @@
           console.log(error.config);
           this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: msg, title: title, });
         })
+      },
+      fetchTeamRankinglist() {
+        this.$axios.get('/api/getTeamRankingList')
+          .then((response) => {
+            console.log("Team-Rankinglist: ");
+            console.log(response.data);
+            this.teamRankinglist = response.data;
+          }).catch((error) => {
+          // Error
+          let msg;
+          let title;
+          if (error.response) {
+            // The request was made and the server responded with a status code
+            title = "Problem with response!";
+            msg = error.response;
+          } else if (error.request) {
+            // The request was made but no response was received
+            title = "Problem with request!";
+            msg = "Error occured due to wrong server request!"
+            console.log(error.request);
+          } else {
+            // Something happened in setting up the request that triggered an Error
+            title = "Error";
+            msg = error.message;
+            console.log('Error', error.message);
+          }
+          console.log(error.config);
+          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: msg, title: title, });
+        })
       }
     }
 }

src/main/java/hhn/labsw/bugageocaching/controller/Controller.java

@@ -1,6 +1,7 @@
 package hhn.labsw.bugageocaching.controller;
 
 import com.google.gson.Gson;
+import com.mashape.unirest.http.exceptions.UnirestException;
 import hhn.labsw.bugageocaching.entities.*;
 import hhn.labsw.bugageocaching.helper.POI;
 import hhn.labsw.bugageocaching.helper.RankingListHelper;
@@ -57,7 +58,7 @@ public class Controller {
   TeamInviteRepository teamInviteRepository;
 
   @PostConstruct
-  public void init() {
+  public void init(){
     fetchPublicKey();
   }
 
@@ -544,6 +545,7 @@ public class Controller {
 
     Team team = new Team();
     team.setName(name);
+    team.setTeamStatus("");
     teamRepository.save(team);
 
     user_info.setTeam(team);

src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java

@@ -4,7 +4,6 @@ import hhn.labsw.bugageocaching.fetchObjects.PublicKey;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.Jwts;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 
@@ -17,10 +16,10 @@ public class VerificationUtil {
 
   public static Key publicKey;
 
-  public static void fetchPublicKey() {
+  public static void fetchPublicKey(){
     RestTemplate restTemplate = new RestTemplate();
     try {
-      PublicKey response = restTemplate.getForObject("http://seserver.se.hs-heilbronn.de:8090/buga19usermanagement/token/publickey", PublicKey.class);
+      PublicKey response = restTemplate.getForObject("http://seserver.se.hs-heilbronn.de:9080/buga19usermanagement/token/publickey", PublicKey.class);
       byte[] decodedKey = Base64.getDecoder().decode(response.getMessage());
       KeyFactory factory = KeyFactory.getInstance("RSA");
       X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(decodedKey);