From 72e2606ed24079eddf0369a16a9db7128d2248ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Thu, 20 Aug 2020 22:05:20 +0200 Subject: [PATCH] =?UTF-8?q?Backendconnection=20f=C3=BCr=20FreeDrinkListHis?= =?UTF-8?q?toryWorkgroup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Es können jetzt auch Freigetränke für mit verschiedenen Gründen und Beschreibungen angelegt werden. Count ist vernachlässigt worden und muss größer als 0 sein. Es kann ebenfalls storniert werden. --- package-lock.json | 29 +- package.json | 2 +- src/components/baruser/BarFreedrinks.vue | 42 ++- .../user/freedrink/freedrinkUserView.vue | 333 +++++++++++------- src/plugins/routes.js | 1 + src/store/modules/freeDrinkList.js | 47 ++- 6 files changed, 282 insertions(+), 172 deletions(-) diff --git a/package-lock.json b/package-lock.json index e8b918a..b099db4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1707,10 +1707,13 @@ "dev": true }, "serialize-javascript": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz", - "integrity": "sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw==", - "dev": true + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz", + "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } }, "source-map": { "version": "0.6.1", @@ -4538,9 +4541,9 @@ "dev": true }, "elliptic": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz", - "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==", + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", + "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", "dev": true, "requires": { "bn.js": "^4.4.0", @@ -6842,9 +6845,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, "lodash.defaultsdeep": { @@ -11026,9 +11029,9 @@ "dev": true }, "vuetify": { - "version": "2.2.29", - "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.2.29.tgz", - "integrity": "sha512-UI1i8kEdV+s7tNQe2yJJMPlvxGTE8cZfUAXEGV2yO4owHmeybn6p5YzFpJqimoKkfX6ok+zV29+6yIKfkyUDAA==" + "version": "2.3.9", + "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.3.9.tgz", + "integrity": "sha512-E5K9flTvS21tCkHgqDBMl0BY/Rld4SLUaJpQ+sQdL8/2uPcWmWLrdumn4SI8LBFojE0UP1GSaH4zKuxLL36fYg==" }, "vuetify-loader": { "version": "1.4.4", diff --git a/package.json b/package.json index 7240f50..b36db1e 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "core-js": "^3.6.5", "vue": "^2.6.10", "vue-router": "^3.2.0", - "vuetify": "^2.2.29", + "vuetify": "^2.3.8", "vuex": "^3.4.0" }, "devDependencies": { diff --git a/src/components/baruser/BarFreedrinks.vue b/src/components/baruser/BarFreedrinks.vue index 10ecf09..bc47eba 100644 --- a/src/components/baruser/BarFreedrinks.vue +++ b/src/components/baruser/BarFreedrinks.vue @@ -110,27 +110,6 @@ Verlauf -
- +
Freigetränk für Versammlungen/Arbeit
@@ -9,95 +9,38 @@
- + - - Bier - - + Cuba - - - Schnaps - - - Wein - - - Gin Tonic - - - Fritz - - - Saft - - - Wasser + :color="color_fix" + @click="addAmount(freeDrink, freeDrinkTypeWorkgroup)" + >{{ freeDrink.label }} - - - - - - - {{ plus }} - + + + + + + {{ + free_drink_list_history_workgroup_without_canceled.length + }} + Getränke + + + @@ -113,52 +56,80 @@
- - + - {{ now(message.date) }} - + {{ + now(freeDrinkHistory.timestamp) + }} + + {{ freeDrinkHistory.free_drink_config.label }} wurde für {{ - createMessage(message) + (freeDrinkHistory.free_drink_config.price / 100).toFixed(2) }} - - + v-if=" + isStronoEnabled(freeDrinkHistory.timestamp) && + !freeDrinkHistory.canceled + " + >Klicken um zu Stornieren
- + Willst du wirklich?? - - - + + + @@ -168,37 +139,81 @@ - + + + + + + + {{ createMessage(message) }} + + + + + + mdi-close + + + + +