More automated

src/components/RegisterPage.vue

@@ -79,6 +79,7 @@
     </div>
 
     <h3>Vinnere</h3>
+    <a class="wine-link" @click="fetchColorsAndWinners()">Refresh data fra virtuelt lotteri</a>
     <div class="winner-container" v-if="winners.length > 0">
       <wine v-for="winner in winners" :key="winner" :wine="winner.wine" :inlineSlot="true">
         <div class="winner-element">
@@ -107,12 +108,26 @@
               @click="winner.color = 'yellow'"
             ></button>
           </div>
-
           <div class="label-div">
             <label for="winner-name">Navn vinner</label>
             <input id="winner-name" type="text" placeholder="Navn" v-model="winner.name" />
           </div>
         </div>
+        <div class="label-div">
+          <label for="potential-winner-name">Virtuelle vinnere</label>
+          <select
+            id="potential-winner-name"
+            type="text"
+            placeholder="Navn"
+            v-model="winner.potentialWinner"
+            @change="potentialChange($event, winner)"
+          >
+            <option
+              v-for="fetchedWinner in fetchedWinners"
+              :value="stringify(fetchedWinner)"
+            >{{fetchedWinner.name}}</option>
+          </select>
+        </div>
       </wine>
 
       <div class="button-container">
@@ -126,7 +141,14 @@
 </template>
 
 <script>
-import { prelottery, log, logWines, wineSchema } from "@/api";
+import {
+  prelottery,
+  log,
+  logWines,
+  wineSchema,
+  winnersSecure,
+  attendees
+} from "@/api";
 import TextToast from "@/ui/TextToast";
 import Wine from "@/ui/Wine";
 import ScanToVinmonopolet from "@/ui/ScanToVinmonopolet";
@@ -137,6 +159,7 @@ export default {
     return {
       payed: undefined,
       winners: [],
+      fetchedWinners: [],
       wines: [],
       pushMessage: "",
       pushLink: "/",
@@ -161,7 +184,59 @@ export default {
   beforeDestroy() {
     this.setWinnerdataToStorage();
   },
+  mounted() {
+    this.fetchColorsAndWinners();
+  },
   methods: {
+    stringify(json) {
+      return JSON.stringify(json);
+    },
+    potentialChange(event, winner) {
+      let data = JSON.parse(event.target.value);
+      winner.name = data.name;
+      winner.color = data.color;
+    },
+    async fetchColorsAndWinners() {
+      let winners = await winnersSecure();
+      let _attendees = await attendees();
+      let colors = {
+        red: 0,
+        blue: 0,
+        green: 0,
+        yellow: 0
+      };
+      this.payed = 0;
+      for (let i = 0; i < _attendees.length; i++) {
+        let attendee = _attendees[i];
+        colors.red += attendee.red;
+        colors.blue += attendee.blue;
+        colors.green += attendee.green;
+        colors.yellow += attendee.yellow;
+        this.payed +=
+          (attendee.red + attendee.blue + attendee.green + attendee.yellow) *
+          10;
+      }
+
+      for (let i = 0; i < this.lotteryColors.length; i++) {
+        let currentColor = this.lotteryColors[i];
+        switch (currentColor.css) {
+          case "red":
+            currentColor.value = colors.red;
+            break;
+          case "blue":
+            currentColor.value = colors.blue;
+            break;
+            a;
+          case "green":
+            currentColor.value = colors.green;
+            break;
+          case "yellow":
+            currentColor.value = colors.yellow;
+            break;
+        }
+      }
+      this.fetchedWinners = winners;
+    },
     amIBeingEdited(wine) {
       return this.editWine.id == wine.id && this.editWine.name == wine.name;
     },
@@ -173,6 +248,7 @@ export default {
         this.winners.push({
           name: "",
           color: "",
+          potentialWinner: "",
           wine: {
             name: wine.name,
             vivinoLink: wine.vivinoLink,
@@ -341,7 +417,6 @@ export default {
       }
     },
     setWinnerdataToStorage() {
-      console.log("saving localstorage");
       localStorage.setItem("winners", JSON.stringify(this.winners));
       localStorage.setItem(
         "colorValues",
@@ -362,7 +437,13 @@ export default {
 <style lang="scss" scoped>
 @import "../styles/global.scss";
 @import "../styles/media-queries.scss";
-
+select {
+  margin: 0 0 auto;
+  height: 2rem;
+  min-width: 0;
+  width: 98%;
+  padding: 1%;
+}
 h1 {
   width: 100%;
   text-align: center;
@@ -376,6 +457,14 @@ h2 {
   font-family: knowit, Arial;
 }
 
+.wine-link {
+  color: #333333;
+  text-decoration: none;
+  font-weight: bold;
+  cursor: pointer;
+  border-bottom: 1px solid #ff5fff;
+}
+
 hr {
   width: 90%;
   margin: 2rem auto;

src/components/VirtualLotteryRegistrationPage.vue

@@ -201,19 +201,21 @@ export default {
       this.secondsLeft = this.drawTime;
     },
     drawWinner: async function() {
-      this.drawingWinner = true;
+      if (window.confirm("Er du sikker på at du vil trekke vinnere?")) {
-      let response = await getVirtualWinner();
+        this.drawingWinner = true;
-      if (response) {
+        let response = await getVirtualWinner();
-        if (this.currentWinners < this.numberOfWinners) {
+        if (response) {
-          this.countdown();
+          if (this.currentWinners < this.numberOfWinners) {
+            this.countdown();
+          } else {
+            this.drawingWinner = false;
+          }
+          this.getWinners();
+          this.getAttendees();
         } else {
           this.drawingWinner = false;
+          alert("Noe gikk galt under trekningen..!");
         }
-        this.getWinners();
-        this.getAttendees();
-      } else {
-        this.drawingWinner = false;
-        alert("Noe gikk galt under trekningen..!");
       }
     },
     countdown: function() {
@@ -236,19 +238,23 @@ export default {
       }, 1000);
     },
     deleteAllWinners: async function() {
-      let response = await deleteWinners();
+      if (window.confirm("Er du sikker på at du vil slette vinnere?")) {
-      if (response) {
+        let response = await deleteWinners();
-        this.getWinners();
+        if (response) {
-      } else {
+          this.getWinners();
-        alert("Klarte ikke hente ut vinnere");
+        } else {
+          alert("Klarte ikke hente ut vinnere");
+        }
       }
     },
     deleteAllAttendees: async function() {
-      let response = await deleteAttendees();
+      if (window.confirm("Er du sikker på at du vil slette alle deltakere?")) {
-      if (response) {
+        let response = await deleteAttendees();
-        this.getAttendees();
+        if (response) {
-      } else {
+          this.getAttendees();
-        alert("Klarte ikke hente ut vinnere");
+        } else {
+          alert("Klarte ikke hente ut vinnere");
+        }
       }
     },
     getWinners: async function() {