Merged and all

This commit is contained in:
Kasper Rynning-Tønnesen
2020-02-07 15:59:44 +01:00
parent 5d276df229
commit 1d6267064b

View File

@@ -41,21 +41,31 @@
</div> </div>
<div class="label-div"> <div class="label-div">
<div class="color-selector"> <div class="color-selector">
<button class="blue" <button
:class="{'active': winner.color == 'blue' }" class="blue"
@click="updateColorForWinner(winner, 'blue')"></button> :class="{'active': winner.color == 'blue' }"
<button class="red" @click="updateColorForWinner(winner, 'blue')"
:class="{'active': winner.color == 'red' }" ></button>
@click="updateColorForWinner(winner, 'red')"></button> <button
<button class="green" class="red"
:class="{'active': winner.color == 'green' }" :class="{'active': winner.color == 'red' }"
@click="updateColorForWinner(winner, 'green')"></button> @click="updateColorForWinner(winner, 'red')"
<button class="yellow" ></button>
:class="{'active': winner.color == 'yellow' }" <button
@click="updateColorForWinner(winner, 'yellow')"></button> class="green"
:class="{'active': winner.color == 'green' }"
@click="updateColorForWinner(winner, 'green')"
></button>
<button
class="yellow"
:class="{'active': winner.color == 'yellow' }"
@click="updateColorForWinner(winner, 'yellow')"
></button>
</div> </div>
<span class="color-selected">Selected color: {{ winner.color ? winner.color : '(none)' }}</span> <span
class="color-selected"
>Selected color: {{ winner.color ? winner.color : '(none)' }}</span>
</div> </div>
<div class="label-div"> <div class="label-div">
<input type="text" v-model="winner.wine.name" placeholder="Vin-navn" /> <input type="text" v-model="winner.wine.name" placeholder="Vin-navn" />
@@ -141,7 +151,7 @@ export default {
}); });
}, },
updateColorForWinner(winner, color) { updateColorForWinner(winner, color) {
winner.color = winner.color == color ? null : color winner.color = winner.color == color ? null : color;
}, },
sendWines: async function() { sendWines: async function() {
let _response = await fetch("/api/log/wines", { let _response = await fetch("/api/log/wines", {
@@ -206,7 +216,6 @@ export default {
parseInt(this.green) + parseInt(this.green) +
parseInt(this.yellow); parseInt(this.yellow);
const stolen = sendObject.purchase.bought - parseInt(this.payed) / 10; const stolen = sendObject.purchase.bought - parseInt(this.payed) / 10;
console.log(sendObject.purchase.bought, this.payed);
if (isNaN(stolen) || stolen == undefined) { if (isNaN(stolen) || stolen == undefined) {
alert("Betalt må registreres"); alert("Betalt må registreres");
return; return;
@@ -351,11 +360,14 @@ hr {
&.green { &.green {
background: #c8f9df; background: #c8f9df;
}&.blue { }
&.blue {
background: #d4f2fe; background: #d4f2fe;
}&.red { }
&.red {
background: #fbd7de; background: #fbd7de;
}&.yellow { }
&.yellow {
background: #fff6d6; background: #fff6d6;
} }
} }