From 10eccba914154b5aebd43f4766d5e87340778868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Tue, 1 Sep 2020 09:16:24 +0200
Subject: [PATCH] Entfernen der User aus den FreeDrinkLists

---
 .../FreeDrinkList/FreeDrinkListBand.vue       | 23 +++----------------
 .../FreeDrinkList/FreeDrinkListJob.vue        | 23 +++----------------
 2 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue
index 98848c1..c8548eb 100644
--- a/src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue
+++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue
@@ -46,10 +46,6 @@ name: "FreeDrinkListBand",
           text: 'Anzahl',
           value: 'count'
         },
-        {
-          text: 'User',
-          value: 'user'
-        },
         {
           text: 'Preis pro Getränk',
           value: 'pricepro'
@@ -87,29 +83,16 @@ name: "FreeDrinkListBand",
           let history_of_config = history_of_date.filter(item => {
             return item.free_drink_config_id == drink_config.id
           })
-          // eslint-disable-next-line no-unused-vars
-          let users = []
-          history_of_config.forEach(history_config => {
-            if (!users.find(user_id => { return user_id == history_config.user_id})) {
-              users.push(history_config.user_id)
-            }
-          })
-          users.forEach(user_id => {
-            let history_of_user = history_of_config.filter(item => {
-              return item.user_id == user_id
-            })
-            if (history_of_user.length > 0) {
+            if (history_of_config.length > 0) {
               retVal.push({
                 date: `${from.getDate()}.${from.getMonth() + 1}.${from.getFullYear()}`,
                 label: drink_config.label,
                 name: drink_config.drink.name,
-                user: `${history_of_user[0].user.firstname} ${history_of_user[0].user.lastname}`,
-                count: history_of_user.length,
+                count: history_of_config.length,
                 pricepro: (drink_config.price / 100).toFixed(2),
-                sum: (drink_config.price / 100 * history_of_user.length).toFixed(2)
+                sum: (drink_config.price / 100 * history_of_config.length).toFixed(2)
               })
             }
-          })
         })
       }
       return retVal
diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue
index 7d35878..f0fd708 100644
--- a/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue
+++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue
@@ -46,10 +46,6 @@ data() {
         text: 'Anzahl',
         value: 'count'
       },
-      {
-        text: 'User',
-        value: 'user'
-      },
       {
         text: 'Preis pro Getränk',
         value: 'pricepro'
@@ -87,29 +83,16 @@ computed: {
         let history_of_config = history_of_date.filter(item => {
           return item.free_drink_config_id == drink_config.id
         })
-        // eslint-disable-next-line no-unused-vars
-        let users = []
-        history_of_config.forEach(history_config => {
-          if (!users.find(user_id => { return user_id == history_config.user_id})) {
-            users.push(history_config.user_id)
-          }
-        })
-        users.forEach(user_id => {
-          let history_of_user = history_of_config.filter(item => {
-            return item.user_id == user_id
-          })
-        if (history_of_user.length > 0) {
+        if (history_of_config.length > 0) {
           retVal.push({
             date: `${from.getDate()}.${from.getMonth() + 1}.${from.getFullYear()}`,
             label: drink_config.label,
             name: drink_config.drink.name,
-            user: `${history_of_user[0].user.firstname} ${history_of_user[0].user.lastname}`,
-            count: history_of_user.length,
+            count: history_of_config.length,
             pricepro: (drink_config.price / 100).toFixed(2),
-            sum: (drink_config.price / 100 * history_of_user.length).toFixed(2)
+            sum: (drink_config.price / 100 * history_of_config.length).toFixed(2)
           })
         }
-        })
       })
     }
     return retVal