Register wines, lottery and winners separatly.
Register page now uses new /lottery, /lottery/wines and /lottery/winners endpoints for sending information separatly. This allows lottery (colors, bought total & stolen), lottery wines (prelottery wines) and lottery winners (wine mapped to winner) sent. Before /lottery/winners & /lottery was sent together to a single endpoint.
This commit is contained in:
@@ -78,6 +78,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="button-container">
|
||||||
|
<button class="vin-button" @click="submitLottery">Send inn lotteri</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
<h3>Vinnere</h3>
|
<h3>Vinnere</h3>
|
||||||
<a class="wine-link" @click="fetchColorsAndWinners()">Refresh data fra virtuelt lotteri</a>
|
<a class="wine-link" @click="fetchColorsAndWinners()">Refresh data fra virtuelt lotteri</a>
|
||||||
<div class="winner-container" v-if="winners.length > 0">
|
<div class="winner-container" v-if="winners.length > 0">
|
||||||
@@ -130,8 +134,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</wine>
|
</wine>
|
||||||
|
|
||||||
<div class="button-container">
|
<div class="button-container column">
|
||||||
<button class="vin-button" @click="sendInfo">Send inn vinnere</button>
|
<button class="vin-button" @click="submitLotteryWinners">Send inn vinnere</button>
|
||||||
<button class="vin-button" @click="resetWinnerDataInStorage">Reset local wines</button>
|
<button class="vin-button" @click="resetWinnerDataInStorage">Reset local wines</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -142,9 +146,11 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import eventBus from "@/mixins/EventBus";
|
import eventBus from "@/mixins/EventBus";
|
||||||
|
import { dateString } from '@/utils'
|
||||||
import {
|
import {
|
||||||
prelottery,
|
prelottery,
|
||||||
log,
|
sendLotteryWinners,
|
||||||
|
sendLottery,
|
||||||
logWines,
|
logWines,
|
||||||
wineSchema,
|
wineSchema,
|
||||||
winnersSecure,
|
winnersSecure,
|
||||||
@@ -306,7 +312,7 @@ export default {
|
|||||||
},
|
},
|
||||||
sendWines: async function() {
|
sendWines: async function() {
|
||||||
let response = await logWines(this.wines);
|
let response = await logWines(this.wines);
|
||||||
if (response == true) {
|
if (response.success == true) {
|
||||||
alert("Sendt!");
|
alert("Sendt!");
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
} else {
|
} else {
|
||||||
@@ -324,7 +330,7 @@ export default {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
sendInfo: async function(event) {
|
submitLottery: async function(event) {
|
||||||
const colors = {
|
const colors = {
|
||||||
red: this.lotteryColors.filter(c => c.css == "red")[0].value,
|
red: this.lotteryColors.filter(c => c.css == "red")[0].value,
|
||||||
green: this.lotteryColors.filter(c => c.css == "green")[0].value,
|
green: this.lotteryColors.filter(c => c.css == "green")[0].value,
|
||||||
@@ -333,41 +339,56 @@ export default {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let sendObject = {
|
let sendObject = {
|
||||||
purchase: {
|
lottery: {
|
||||||
date: new Date(),
|
date: dateString(new Date()),
|
||||||
...colors
|
...colors
|
||||||
},
|
}
|
||||||
winners: this.winners
|
|
||||||
};
|
};
|
||||||
|
|
||||||
if (sendObject.purchase.red == undefined) {
|
if (sendObject.lottery.red == undefined) {
|
||||||
alert("Rød må defineres");
|
alert("Rød må defineres");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (sendObject.purchase.green == undefined) {
|
if (sendObject.lottery.green == undefined) {
|
||||||
alert("Grønn må defineres");
|
alert("Grønn må defineres");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (sendObject.purchase.yellow == undefined) {
|
if (sendObject.lottery.yellow == undefined) {
|
||||||
alert("Gul må defineres");
|
alert("Gul må defineres");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (sendObject.purchase.blue == undefined) {
|
if (sendObject.lottery.blue == undefined) {
|
||||||
alert("Blå må defineres");
|
alert("Blå må defineres");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sendObject.purchase.bought =
|
sendObject.lottery.bought =
|
||||||
parseInt(colors.blue) +
|
parseInt(colors.blue) +
|
||||||
parseInt(colors.red) +
|
parseInt(colors.red) +
|
||||||
parseInt(colors.green) +
|
parseInt(colors.green) +
|
||||||
parseInt(colors.yellow);
|
parseInt(colors.yellow);
|
||||||
const stolen = sendObject.purchase.bought - parseInt(this.payed) / 10;
|
const stolen = sendObject.lottery.bought - parseInt(this.payed) / 10;
|
||||||
if (isNaN(stolen) || stolen == undefined) {
|
if (isNaN(stolen) || stolen == undefined) {
|
||||||
alert("Betalt må registreres");
|
alert("Betalt må registreres");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
sendObject.purchase.stolen = stolen;
|
sendObject.lottery.stolen = stolen;
|
||||||
|
|
||||||
|
let response = await sendLottery(sendObject);
|
||||||
|
if (response == true) {
|
||||||
|
alert("Sendt!");
|
||||||
|
window.location.reload();
|
||||||
|
} else {
|
||||||
|
alert(response.message || "Noe gikk galt under innsending");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
submitLotteryWinners: async function(event) {
|
||||||
|
let sendObject = {
|
||||||
|
lottery: {
|
||||||
|
date: dateString(new Date()),
|
||||||
|
winners: this.winners
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (sendObject.winners.length == 0) {
|
if (sendObject.winners.length == 0) {
|
||||||
alert("Det må være med vinnere");
|
alert("Det må være med vinnere");
|
||||||
@@ -386,7 +407,7 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let response = await log(sendObject);
|
let response = await sendLotteryWinners(sendObject);
|
||||||
if (response == true) {
|
if (response == true) {
|
||||||
alert("Sendt!");
|
alert("Sendt!");
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
@@ -613,7 +634,7 @@ hr {
|
|||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
max-width: 1400px;
|
max-width: 1400px;
|
||||||
margin: 3rem auto 0;
|
margin: 3rem auto 1rem;
|
||||||
|
|
||||||
@include mobile {
|
@include mobile {
|
||||||
margin: 1.8rem auto 0;
|
margin: 1.8rem auto 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user