diff --git a/api/retrieve.js b/api/retrieve.js index 95fbdaf..abb4a77 100644 --- a/api/retrieve.js +++ b/api/retrieve.js @@ -35,12 +35,16 @@ router.route("/purchase/statistics/color").get(async (req, res) => { let blue = 0; let yellow = 0; let green = 0; + let stolen = 0; for (let i = 0; i < countColor.length; i++) { let element = countColor[i]; red += element.red; blue += element.blue; yellow += element.yellow; green += element.green; + if (element.stolen != undefined) { + stolen += element.stolen; + } } const highscore = await Highscore.find(); @@ -88,6 +92,7 @@ router.route("/purchase/statistics/color").get(async (req, res) => { total: yellow, win: yellowWin }, + stolen: stolen, total: total }); }); diff --git a/api/update.js b/api/update.js index a604a68..30dae8f 100644 --- a/api/update.js +++ b/api/update.js @@ -55,6 +55,9 @@ router.route("/log").post(async (req, res) => { const yellow = purchaseBody.yellow; const green = purchaseBody.green; + const bought = purchaseBody.bought; + const stolen = purchaseBody.stolen; + const winesThisDate = []; for (let i = 0; i < winnersBody.length; i++) { @@ -111,7 +114,9 @@ router.route("/log").post(async (req, res) => { yellow: yellow, red: red, green: green, - wines: winesThisDate + wines: winesThisDate, + bought: bought, + stolen: stolen }); await purchase.save(); diff --git a/schemas/Purchase.js b/schemas/Purchase.js index fae2327..63e2baa 100644 --- a/schemas/Purchase.js +++ b/schemas/Purchase.js @@ -7,6 +7,8 @@ const Purchase = new Schema({ red: Number, yellow: Number, green: Number, + bought: Number, + stolen: Number, wines: [ { type: Schema.Types.ObjectId, diff --git a/src/components/RegisterPage.vue b/src/components/RegisterPage.vue index 118004d..f3edff0 100644 --- a/src/components/RegisterPage.vue +++ b/src/components/RegisterPage.vue @@ -18,6 +18,10 @@ +