From dadb31f3769d743caaf1fc0d7e804960bd1b8fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Sun, 23 Feb 2020 11:19:53 +0100
Subject: [PATCH 1/5] finished ##188

for sm only send year, month, day. But you have to decrement month to send, because month starts with 0.
Also you have to increment month to get.
---
 src/components/user/Jobs/Day.vue              | 48 ++++++-------------
 .../ServiceManagementComponents/Day.vue       | 25 ++++++++--
 src/store/modules/jobs.js                     |  4 +-
 src/store/modules/serviceManagement.js        |  5 +-
 4 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/src/components/user/Jobs/Day.vue b/src/components/user/Jobs/Day.vue
index a7c8138..cd3edaa 100644
--- a/src/components/user/Jobs/Day.vue
+++ b/src/components/user/Jobs/Day.vue
@@ -14,38 +14,12 @@
         </v-expand-transition>
         <v-expand-transition>
           <div v-show="!day.loading">
-<!--            <v-autocomplete-->
-<!--              chips-->
-<!--              return-object-->
-<!--              multiple-->
-<!--              v-model="day.worker"-->
-<!--              item-text="fullName"-->
-<!--              label="Dienste"-->
-<!--              filled-->
-<!--              color="green"-->
-<!--              @input="searchInput = null"-->
-<!--              :search-input.sync="searchInput"-->
-<!--              @blur="focused = false"-->
-<!--              @focus="focused = true"-->
-<!--              disabled-->
-<!--            >-->
-<!--              <template v-slot:prepend-inner>-->
-<!--                <v-icon>{{ account_add }}</v-icon>-->
-<!--              </template>-->
-<!--              <template v-slot:selection="data">-->
-<!--                <v-chip v-bind="data.attrs" :input-value="data.selected" close>-->
-<!--                  {{ data.item.firstname }} {{ data.item.lastname }}-->
-<!--                </v-chip>-->
-<!--              </template>-->
-<!--              <template v-slot:item="data">-->
-<!--                <v-list-item-content>-->
-<!--                  <v-list-item-title>-->
-<!--                    {{ data.item.firstname }} {{ data.item.lastname }}-->
-<!--                  </v-list-item-title>-->
-<!--                </v-list-item-content>-->
-<!--              </template>-->
-<!--            </v-autocomplete>-->
-            <v-chip style="margin: 3px;" v-for="worker in day.worker" :key="day.worker.indexOf(worker)">{{ worker.firstname }} {{ worker.lastname }}</v-chip>
+            <v-chip
+              style="margin: 3px;"
+              v-for="worker in day.worker"
+              :key="day.worker.indexOf(worker)"
+              >{{ worker.firstname }} {{ worker.lastname }}</v-chip
+            >
           </div>
         </v-expand-transition>
       </v-card-text>
@@ -71,7 +45,10 @@ export default {
     this.setLoading(this.day.date)
     this.getUser({
       date: this.day.date.getTime() / 1000,
-      startdatetime: this.day.date
+      startdatetime: this.day.date,
+      year: this.day.date.getFullYear(),
+      month: this.day.date.getMonth() + 1,
+      day: this.day.date.getDate()
     })
   },
   methods: {
@@ -108,7 +85,10 @@ export default {
     day() {
       this.getUser({
         date: this.day.date.getTime() / 1000,
-        startdatetime: this.day.date
+        startdatetime: this.day.date,
+        year: this.day.date.getFullYear(),
+        month: this.day.date.getMonth() + 1,
+        day: this.day.date.getDate()
       })
     },
     worker() {
diff --git a/src/components/vorstand/ServiceManagementComponents/Day.vue b/src/components/vorstand/ServiceManagementComponents/Day.vue
index 2142525..264cfaa 100644
--- a/src/components/vorstand/ServiceManagementComponents/Day.vue
+++ b/src/components/vorstand/ServiceManagementComponents/Day.vue
@@ -78,7 +78,10 @@ export default {
     this.setLoading(this.day.date)
     this.getUser({
       date: this.day.date.getTime() / 1000,
-      startdatetime: this.day.date
+      startdatetime: this.day.date,
+      year: this.day.date.getFullYear(),
+      month: this.day.date.getMonth() + 1,
+      day: this.day.date.getDate()
     })
   },
   methods: {
@@ -99,7 +102,10 @@ export default {
       this.deleteUser({
         startdatetime: this.day.date,
         date: this.day.date.getTime() / 1000,
-        user: deletedUser
+        user: deletedUser,
+        year: this.day.date.getFullYear(),
+        month: this.day.date.getMonth() + 1,
+        day: this.day.date.getDate()
       })
     },
     test(event) {
@@ -139,7 +145,10 @@ export default {
             addedUser = newValue[user]
             this.addUser({
               date: this.day.date.getTime() / 1000,
-              user: addedUser
+              user: addedUser,
+              year: this.day.date.getFullYear(),
+              month: this.day.date.getMonth() + 1,
+              day: this.day.date.getDate()
             })
           }
         }
@@ -151,7 +160,10 @@ export default {
             this.deleteUser({
               startdatetime: this.day.date,
               date: this.day.date.getTime() / 1000,
-              user: deletedUser
+              user: deletedUser,
+              year: this.day.date.getFullYear(),
+              month: this.day.date.getMonth() + 1,
+              day: this.day.date.getDate()
             })
           }
         }
@@ -160,7 +172,10 @@ export default {
     day() {
       this.getUser({
         date: this.day.date.getTime() / 1000,
-        startdatetime: this.day.date
+        startdatetime: this.day.date,
+        year: this.day.date.getFullYear(),
+        month: this.day.date.getMonth() + 1,
+        day: this.day.date.getDate()
       })
     },
     focused(newVal, oldValue) {
diff --git a/src/store/modules/jobs.js b/src/store/modules/jobs.js
index 319a77b..0f35f6b 100644
--- a/src/store/modules/jobs.js
+++ b/src/store/modules/jobs.js
@@ -25,7 +25,7 @@ const mutations = {
     let week = { id: id, days: {} }
     for (let intDay = startDate; intDay <= days + 7; intDay++) {
       if (end) break
-      let currentDate = new Date(year, mon, intDay, 12)
+      let currentDate = new Date(year, mon, intDay)
 
       switch (currentDate.getDay()) {
         case 1:
@@ -106,7 +106,7 @@ const mutations = {
     state.month = month
   },
   updateMonth: (state, data) => {
-    const date = new Date(data.startdatetime)
+    const date = new Date(data.start.year, data.start.month - 1, data.start.day)
     const user = data.user
     for (let week = 0; week < state.month.length; week++) {
       for (let day in state.month[week].days) {
diff --git a/src/store/modules/serviceManagement.js b/src/store/modules/serviceManagement.js
index 2b1b82e..dde6eae 100644
--- a/src/store/modules/serviceManagement.js
+++ b/src/store/modules/serviceManagement.js
@@ -34,7 +34,7 @@ const mutations = {
     let week = { id: id, days: {} }
     for (let intDay = startDate; intDay <= days + 7; intDay++) {
       if (end) break
-      let currentDate = new Date(year, mon, intDay, 12)
+      let currentDate = new Date(year, mon, intDay)
 
       switch (currentDate.getDay()) {
         case 1:
@@ -148,7 +148,7 @@ const mutations = {
     }
   },
   updateMonth: (state, data) => {
-    const date = new Date(data.startdatetime)
+    const date = new Date(data.start.year, data.start.month - 1, data.start.day)
     const user = data.user
     for (let week = 0; week < state.month.length; week++) {
       for (let day in state.month[week].days) {
@@ -223,6 +223,7 @@ const actions = {
         { ...data },
         { headers: { Token: rootState.login.user.accessToken } }
       )
+      console.log(response.data)
       for (let item = 0; item < response.data.length; item++) {
         commit('updateMonth', { ...response.data[item], com: 'add' })
       }

From b6dfc45c466a0417b95efee04a0d2af092bb89ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Sun, 23 Feb 2020 22:32:31 +0100
Subject: [PATCH 2/5] finished ##184

---
 public/index.html                      |  2 +-
 src/components/user/Jobs/Day.vue       | 17 ++++++-
 src/plugins/routes.js                  |  3 +-
 src/store/modules/jobs.js              | 68 ++++++++++++++++++++------
 src/store/modules/serviceManagement.js | 25 ++++++----
 5 files changed, 87 insertions(+), 28 deletions(-)

diff --git a/public/index.html b/public/index.html
index 7e96d1c..ec4c4c7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="de">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
diff --git a/src/components/user/Jobs/Day.vue b/src/components/user/Jobs/Day.vue
index cd3edaa..d2db7df 100644
--- a/src/components/user/Jobs/Day.vue
+++ b/src/components/user/Jobs/Day.vue
@@ -23,6 +23,20 @@
           </div>
         </v-expand-transition>
       </v-card-text>
+      <v-card-actions>
+        <v-spacer />
+        <v-btn
+          v-if="!day.locked && !day.loading && day.worker.length < 2"
+          @click="
+            addJob({
+              year: day.date.getFullYear(),
+              month: day.date.getMonth() + 1,
+              day: day.date.getDate()
+            })
+          "
+          >Eintragen</v-btn
+        >
+      </v-card-actions>
     </v-card>
   </div>
 </template>
@@ -55,7 +69,8 @@ export default {
     ...mapActions({
       getUser: 'jobs/getUser',
       setLoading: 'jobs/setDayLoading',
-      setNotLoading: 'jobs/setDayNotLoading'
+      setNotLoading: 'jobs/setDayNotLoading',
+      addJob: 'jobs/addJob'
     }),
     test(event) {
       console.log('blur', event)
diff --git a/src/plugins/routes.js b/src/plugins/routes.js
index caabd83..128224f 100644
--- a/src/plugins/routes.js
+++ b/src/plugins/routes.js
@@ -29,7 +29,8 @@ const url = {
   },
   user: {
     config: main + 'user/saveConfig',
-    job: main + 'user/job'
+    job: main + 'user/job',
+    addJob: main + 'user/addJob'
   },
   barU: {
     storno: main + 'bar/storno'
diff --git a/src/store/modules/jobs.js b/src/store/modules/jobs.js
index 0f35f6b..82ca622 100644
--- a/src/store/modules/jobs.js
+++ b/src/store/modules/jobs.js
@@ -38,7 +38,8 @@ const mutations = {
             date: currentDate,
             name: 'Montag',
             worker: [],
-            loading: false
+            loading: false,
+            locked: false
           }
           break
         case 2:
@@ -47,7 +48,8 @@ const mutations = {
             date: currentDate,
             name: 'Dienstag',
             worker: [],
-            loading: false
+            loading: false,
+            locked: false
           }
           break
         case 3:
@@ -61,7 +63,8 @@ const mutations = {
               date: currentDate,
               name: 'Mittwoch',
               worker: [],
-              loading: false
+              loading: false,
+              locked: false
             }
           }
           break
@@ -71,7 +74,8 @@ const mutations = {
             date: currentDate,
             name: 'Donnerstag',
             worker: [],
-            loading: false
+            loading: false,
+            locked: false
           }
           break
         case 5:
@@ -80,7 +84,8 @@ const mutations = {
             date: currentDate,
             name: 'Freitag',
             worker: [],
-            loading: false
+            loading: false,
+            locked: false
           }
           break
         case 6:
@@ -89,7 +94,8 @@ const mutations = {
             date: currentDate,
             name: 'Samstag',
             worker: [],
-            loading: false
+            loading: false,
+            locked: false
           }
           break
         case 0:
@@ -98,7 +104,8 @@ const mutations = {
             date: currentDate,
             name: 'Sontag',
             worker: [],
-            loading: false
+            loading: false,
+            locked: false
           }
           break
       }
@@ -114,13 +121,18 @@ const mutations = {
           let worker = state.month[week].days[day].worker.find(a => {
             return a.username === user.username
           })
-          if (!worker && data.com === 'add') {
-            state.month[week].days[day].worker.push({
-              firstname: user.firstname,
-              lastname: user.lastname,
-              username: user.username,
-              fullName: user.firstname + ' ' + user.lastname
-            })
+          if (user) {
+            if (!worker && data.com === 'add') {
+              state.month[week].days[day].worker.push({
+                firstname: user.firstname,
+                lastname: user.lastname,
+                username: user.username,
+                fullName: user.firstname + ' ' + user.lastname
+              })
+            }
+          }
+          if (data.day) {
+            state.month[week].days[day].locked = data.day.locked
           }
         }
       }
@@ -192,14 +204,38 @@ const actions = {
         { ...data },
         { headers: { Token: rootState.login.user.accessToken } }
       )
-      for (let item = 0; item < response.data.length; item++) {
-        commit('updateMonth', { ...response.data[item], com: 'add' })
+      for (let item = 0; item < response.data.worker.length; item++) {
+        commit('updateMonth', {
+          ...response.data.worker[item],
+          com: 'add',
+          day: response.data.day
+        })
       }
+      if (response.data.worker.length === 0)
+        commit('updateMonth', {
+          start: response.data.day.date,
+          day: response.data.day
+        })
       commit('setDayNotLoading', { date: data.startdatetime, getters })
     } catch (e) {
       if (e.response)
         if (e.response.status === 401) dispatch('logout', null, { root: true })
     }
+  },
+  async addJob({ commit, rootState, dispatch }, data) {
+    try {
+      const response = await axios.post(
+        url.user.addJob,
+        { ...data },
+        {
+          headers: { Token: rootState.login.user.accessToken }
+        }
+      )
+      commit('updateMonth', { ...response.data[0], com: 'add' })
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
   }
 }
 
diff --git a/src/store/modules/serviceManagement.js b/src/store/modules/serviceManagement.js
index dde6eae..1193de3 100644
--- a/src/store/modules/serviceManagement.js
+++ b/src/store/modules/serviceManagement.js
@@ -156,13 +156,18 @@ const mutations = {
           let worker = state.month[week].days[day].worker.find(a => {
             return a.username === user.username
           })
-          if (!worker && data.com === 'add') {
-            state.month[week].days[day].worker.push({
-              firstname: user.firstname,
-              lastname: user.lastname,
-              username: user.username,
-              fullName: user.firstname + ' ' + user.lastname
-            })
+          if (user) {
+            if (!worker && data.com === 'add') {
+              state.month[week].days[day].worker.push({
+                firstname: user.firstname,
+                lastname: user.lastname,
+                username: user.username,
+                fullName: user.firstname + ' ' + user.lastname
+              })
+            }
+          }
+          if (data.day) {
+            state.month[week].days[day].locked = data.day.locked
           }
         }
       }
@@ -224,9 +229,11 @@ const actions = {
         { headers: { Token: rootState.login.user.accessToken } }
       )
       console.log(response.data)
-      for (let item = 0; item < response.data.length; item++) {
-        commit('updateMonth', { ...response.data[item], com: 'add' })
+      for (let item = 0; item < response.data.worker.length; item++) {
+        commit('updateMonth', { ...response.data.worker[item], com: 'add', day: response.data.day })
       }
+      if (response.data.worker.length === 0)
+        commit('updateMonth', { start: response.data.day.date, day:response.data.day})
       commit('setDayNotLoading', { date: data.startdatetime, getters })
     } catch (e) {
       if (e.response)

From 9082b005679f49ef0e64fcaf1cb8cd35d7c9b4db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Mon, 24 Feb 2020 12:19:13 +0100
Subject: [PATCH 3/5] finished ##186

---
 src/components/user/Jobs.vue                  |  2 +-
 src/components/user/Jobs/Day.vue              |  9 +++-
 src/components/vorstand/ServiceManagement.vue | 17 +++++-
 .../ServiceManagementComponents/Day.vue       | 33 +++++++++---
 src/plugins/routes.js                         |  3 +-
 src/store/modules/jobs.js                     | 15 +++---
 src/store/modules/serviceManagement.js        | 53 ++++++++++++++-----
 7 files changed, 97 insertions(+), 35 deletions(-)

diff --git a/src/components/user/Jobs.vue b/src/components/user/Jobs.vue
index 642b1d4..a50bef1 100644
--- a/src/components/user/Jobs.vue
+++ b/src/components/user/Jobs.vue
@@ -21,7 +21,7 @@
       </v-toolbar-items>
       <v-spacer />
     </v-toolbar>
-    <v-card v-for="week in month" :key="month.indexOf(week)">
+    <v-card v-for="week in month" :key="month.indexOf(week)" flat tile>
       <v-card-title class="subtitle-1 font-weight-bold">
         Woche vom {{ week.startDate.getDate() }}.{{
           week.startDate.getMonth() + 1
diff --git a/src/components/user/Jobs/Day.vue b/src/components/user/Jobs/Day.vue
index d2db7df..29b96f2 100644
--- a/src/components/user/Jobs/Day.vue
+++ b/src/components/user/Jobs/Day.vue
@@ -23,7 +23,14 @@
           </div>
         </v-expand-transition>
       </v-card-text>
-      <v-card-actions>
+      <v-card-actions class="text--secondary">
+        <div v-if="day.locked">
+          Du kannst dich nicht zum Bardienst eintragen, da der Tag gesperrt ist.
+        </div>
+        <div v-else-if="day.worker.length >= 2">
+          Du kannst dich nicht Bardienst eintragen, da mehr als 2 Personen schon eingetragen sind.
+        </div>
+        <div v-else>Hier kannst du dich zum Bardienst eintragen.</div>
         <v-spacer />
         <v-btn
           v-if="!day.locked && !day.loading && day.worker.length < 2"
diff --git a/src/components/vorstand/ServiceManagement.vue b/src/components/vorstand/ServiceManagement.vue
index 9f51b8c..d951ba3 100644
--- a/src/components/vorstand/ServiceManagement.vue
+++ b/src/components/vorstand/ServiceManagement.vue
@@ -21,8 +21,12 @@
           </v-btn>
         </v-toolbar-items>
         <v-spacer />
+        <v-toolbar-items>
+          <v-btn text @click="lockDays(true)">Monat sperren</v-btn>
+          <v-btn text @click="lockDays(false)">Monat freigeben</v-btn>
+        </v-toolbar-items>
       </v-toolbar>
-      <v-card v-for="week in month" :key="month.indexOf(week)">
+      <v-card v-for="week in month" :key="month.indexOf(week)" tile flat>
         <v-card-title class="subtitle-1 font-weight-bold">
           Woche vom {{ week.startDate.getDate() }}.{{
             week.startDate.getMonth() + 1
@@ -81,7 +85,8 @@ export default {
   methods: {
     ...mapActions({
       createMonth: 'sm/createMonth',
-      getAllUsers: 'sm/getAllUsers'
+      getAllUsers: 'sm/getAllUsers',
+      lockDay: 'sm/lockDay'
     }),
     changeMonth(value) {
       if (value === -1) {
@@ -90,6 +95,14 @@ export default {
         this.date = new Date(this.date.getFullYear(), this.date.getMonth() + 1)
       }
       this.createMonth(this.date)
+    },
+    lockDays(value) {
+      for (var week in this.month) {
+        for (var dayint in this.month[week].days) {
+          var day = this.month[week].days[dayint]
+          this.lockDay({year: day.date.getFullYear(), month: day.date.getMonth() + 1, day: day.date.getDate(), locked: value})
+        }
+      }
     }
   },
   computed: {
diff --git a/src/components/vorstand/ServiceManagementComponents/Day.vue b/src/components/vorstand/ServiceManagementComponents/Day.vue
index 264cfaa..5d9440c 100644
--- a/src/components/vorstand/ServiceManagementComponents/Day.vue
+++ b/src/components/vorstand/ServiceManagementComponents/Day.vue
@@ -24,14 +24,13 @@
               label="Dienste"
               filled
               color="green"
-              @input="searchInput=null"
+              @input="searchInput = null"
               :search-input.sync="searchInput"
-              @blur="focused=false"
-              @focus="focused=true"
-
+              @blur="focused = false"
+              @focus="focused = true"
             >
               <template v-slot:prepend-inner>
-                <v-icon>{{account_add}}</v-icon>
+                <v-icon>{{ account_add }}</v-icon>
               </template>
               <template v-slot:selection="data">
                 <v-chip
@@ -55,13 +54,18 @@
           </div>
         </v-expand-transition>
       </v-card-text>
+      <v-card-actions v-if="!day.loading">
+        <v-chip class="text-uppercase" :color="lockedColor">{{ lockedText }}</v-chip>
+        <v-spacer />
+        <v-btn @click="lock">{{lockedTextBtn}}</v-btn>
+      </v-card-actions>
     </v-card>
   </div>
 </template>
 
 <script>
 import { mapGetters, mapActions } from 'vuex'
-import {mdiAccountPlus} from '@mdi/js'
+import { mdiAccountPlus } from '@mdi/js'
 export default {
   name: 'Day',
   props: {
@@ -90,7 +94,8 @@ export default {
       getUser: 'sm/getUser',
       deleteUser: 'sm/deleteUser',
       setLoading: 'sm/setDayLoading',
-      setNotLoading: 'sm/setDayNotLoading'
+      setNotLoading: 'sm/setDayNotLoading',
+      lockDay: 'sm/lockDay'
     }),
     // eslint-disable-next-line no-unused-vars
     remove(deletedUser) {
@@ -126,6 +131,9 @@ export default {
         return 'grey lighten-4'
       }
     },
+    lock() {
+      this.lockDay({year: this.day.date.getFullYear(), month: this.day.date.getMonth() + 1, day: this.day.date.getDate(), locked: !this.day.locked})
+    }
   },
   computed: {
     ...mapGetters({
@@ -134,6 +142,15 @@ export default {
     }),
     worker() {
       return this.day.worker
+    },
+    lockedColor() {
+      return this.day.locked ? 'red' : 'green'
+    },
+    lockedText() {
+      return this.day.locked ? 'gesperrt' : 'frei'
+    },
+    lockedTextBtn() {
+      return this.day.locked ? 'freigeben' : 'sperren'
     }
   },
   watch: {
@@ -156,7 +173,7 @@ export default {
         for (let user in oldValue) {
           if (!newValue.includes(oldValue[user])) {
             deletedUser = oldValue[user]
-            console.log("deleteUser", deletedUser, this.day.date)
+            console.log('deleteUser', deletedUser, this.day.date)
             this.deleteUser({
               startdatetime: this.day.date,
               date: this.day.date.getTime() / 1000,
diff --git a/src/plugins/routes.js b/src/plugins/routes.js
index 128224f..12f123a 100644
--- a/src/plugins/routes.js
+++ b/src/plugins/routes.js
@@ -24,7 +24,8 @@ const url = {
     sm: {
       addUser: main + 'sm/addUser',
       deleteUser: main + 'sm/deleteUser',
-      getUser: main + 'sm/getUser'
+      getUser: main + 'sm/getUser',
+      lockDay: main + 'sm/lockDay'
     }
   },
   user: {
diff --git a/src/store/modules/jobs.js b/src/store/modules/jobs.js
index 82ca622..0dacce8 100644
--- a/src/store/modules/jobs.js
+++ b/src/store/modules/jobs.js
@@ -118,10 +118,10 @@ const mutations = {
     for (let week = 0; week < state.month.length; week++) {
       for (let day in state.month[week].days) {
         if (state.month[week].days[day].date - date === 0) {
-          let worker = state.month[week].days[day].worker.find(a => {
-            return a.username === user.username
-          })
           if (user) {
+            let worker = state.month[week].days[day].worker.find(a => {
+              return a.username === user.username
+            })
             if (!worker && data.com === 'add') {
               state.month[week].days[day].worker.push({
                 firstname: user.firstname,
@@ -211,11 +211,10 @@ const actions = {
           day: response.data.day
         })
       }
-      if (response.data.worker.length === 0)
-        commit('updateMonth', {
-          start: response.data.day.date,
-          day: response.data.day
-        })
+      commit('updateMonth', {
+        start: response.data.day.date,
+        day: response.data.day
+      })
       commit('setDayNotLoading', { date: data.startdatetime, getters })
     } catch (e) {
       if (e.response)
diff --git a/src/store/modules/serviceManagement.js b/src/store/modules/serviceManagement.js
index 1193de3..cb530da 100644
--- a/src/store/modules/serviceManagement.js
+++ b/src/store/modules/serviceManagement.js
@@ -47,7 +47,8 @@ const mutations = {
             date: currentDate,
             name: 'Montag',
             worker: [],
-            loading: false
+            loading: false,
+            locked: false
           }
           break
         case 2:
@@ -56,7 +57,8 @@ const mutations = {
             date: currentDate,
             name: 'Dienstag',
             worker: [],
-            loading: false
+            loading: false,
+            locked: false
           }
           break
         case 3:
@@ -70,7 +72,8 @@ const mutations = {
               date: currentDate,
               name: 'Mittwoch',
               worker: [],
-              loading: false
+              loading: false,
+              locked: false
             }
           }
           break
@@ -80,7 +83,8 @@ const mutations = {
             date: currentDate,
             name: 'Donnerstag',
             worker: [],
-            loading: false
+            loading: false,
+            locked: false
           }
           break
         case 5:
@@ -89,7 +93,8 @@ const mutations = {
             date: currentDate,
             name: 'Freitag',
             worker: [],
-            loading: false
+            loading: false,
+            locked: false
           }
           break
         case 6:
@@ -98,7 +103,8 @@ const mutations = {
             date: currentDate,
             name: 'Samstag',
             worker: [],
-            loading: false
+            loading: false,
+            locked: false
           }
           break
         case 0:
@@ -107,7 +113,8 @@ const mutations = {
             date: currentDate,
             name: 'Sontag',
             worker: [],
-            loading: false
+            loading: false,
+            locked: false
           }
           break
       }
@@ -153,10 +160,10 @@ const mutations = {
     for (let week = 0; week < state.month.length; week++) {
       for (let day in state.month[week].days) {
         if (state.month[week].days[day].date - date === 0) {
-          let worker = state.month[week].days[day].worker.find(a => {
-            return a.username === user.username
-          })
           if (user) {
+            let worker = state.month[week].days[day].worker.find(a => {
+              return a.username === user.username
+            })
             if (!worker && data.com === 'add') {
               state.month[week].days[day].worker.push({
                 firstname: user.firstname,
@@ -228,12 +235,17 @@ const actions = {
         { ...data },
         { headers: { Token: rootState.login.user.accessToken } }
       )
-      console.log(response.data)
       for (let item = 0; item < response.data.worker.length; item++) {
-        commit('updateMonth', { ...response.data.worker[item], com: 'add', day: response.data.day })
+        commit('updateMonth', {
+          ...response.data.worker[item],
+          com: 'add',
+          day: response.data.day
+        })
       }
-      if (response.data.worker.length === 0)
-        commit('updateMonth', { start: response.data.day.date, day:response.data.day})
+      commit('updateMonth', {
+        start: response.data.day.date,
+        day: response.data.day
+      })
       commit('setDayNotLoading', { date: data.startdatetime, getters })
     } catch (e) {
       if (e.response)
@@ -255,6 +267,19 @@ const actions = {
         if (e.response.status === 401) dispatch('logout', null, { root: true })
     }
   },
+  async lockDay({ commit, rootState, dispatch }, data) {
+    try {
+      const response = await axios.post(
+        url.vorstand.sm.lockDay,
+        { ...data },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      commit('updateMonth', { start: response.data.date, day: response.data })
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  },
   setDayLoading({ commit, getters }, date) {
     commit('setDayLoading', { date, getters })
   },

From 917690eba3332ea605982c606d3fce5193958eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Mon, 24 Feb 2020 18:57:28 +0100
Subject: [PATCH 4/5] finished ##192

user can delete his job if day not locked
---
 src/components/user/Jobs/Day.vue | 52 +++++++++++++++++++++++---------
 src/plugins/routes.js            |  3 +-
 src/store/modules/jobs.js        | 19 ++++++++++++
 3 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/src/components/user/Jobs/Day.vue b/src/components/user/Jobs/Day.vue
index 29b96f2..f14941a 100644
--- a/src/components/user/Jobs/Day.vue
+++ b/src/components/user/Jobs/Day.vue
@@ -14,23 +14,35 @@
         </v-expand-transition>
         <v-expand-transition>
           <div v-show="!day.loading">
-            <v-chip
-              style="margin: 3px;"
-              v-for="worker in day.worker"
-              :key="day.worker.indexOf(worker)"
-              >{{ worker.firstname }} {{ worker.lastname }}</v-chip
-            >
+            <div v-for="worker in day.worker" :key="day.worker.indexOf(worker)">
+              <v-chip
+                style="margin: 3px;"
+                :close="user(worker) && !day.locked"
+                @click:close="
+                  deleteJob({
+                    year: day.date.getFullYear(),
+                    month: day.date.getMonth() + 1,
+                    day: day.date.getDate()
+                  })
+                "
+                >{{ worker.firstname }} {{ worker.lastname }}
+              </v-chip>
+            </div>
           </div>
         </v-expand-transition>
       </v-card-text>
       <v-card-actions class="text--secondary">
-        <div v-if="day.locked">
-          Du kannst dich nicht zum Bardienst eintragen, da der Tag gesperrt ist.
+        <div v-if="!userInWorker">
+          <div v-if="day.locked">
+            Du kannst dich nicht zum Bardienst eintragen, da der Tag gesperrt
+            ist.
+          </div>
+          <div v-else-if="day.worker.length >= 2">
+            Du kannst dich nicht Bardienst eintragen, da mehr als 2 Personen
+            schon eingetragen sind.
+          </div>
+          <div v-else>Hier kannst du dich zum Bardienst eintragen.</div>
         </div>
-        <div v-else-if="day.worker.length >= 2">
-          Du kannst dich nicht Bardienst eintragen, da mehr als 2 Personen schon eingetragen sind.
-        </div>
-        <div v-else>Hier kannst du dich zum Bardienst eintragen.</div>
         <v-spacer />
         <v-btn
           v-if="!day.locked && !day.loading && day.worker.length < 2"
@@ -77,7 +89,8 @@ export default {
       getUser: 'jobs/getUser',
       setLoading: 'jobs/setDayLoading',
       setNotLoading: 'jobs/setDayNotLoading',
-      addJob: 'jobs/addJob'
+      addJob: 'jobs/addJob',
+      deleteJob: 'jobs/deleteJob'
     }),
     test(event) {
       console.log('blur', event)
@@ -96,12 +109,21 @@ export default {
       } else {
         return 'grey lighten-4'
       }
+    },
+    user(worker) {
+      return worker.username === this.activeUser.username
     }
   },
   computed: {
     ...mapGetters({
-      disabled: 'jobs/disabled'
-    })
+      disabled: 'jobs/disabled',
+      activeUser: 'user'
+    }),
+    userInWorker() {
+      return this.day.worker.find(a => {
+        return a.username === this.activeUser.username
+      })
+    }
   },
   watch: {
     day() {
diff --git a/src/plugins/routes.js b/src/plugins/routes.js
index 12f123a..d6e4439 100644
--- a/src/plugins/routes.js
+++ b/src/plugins/routes.js
@@ -31,7 +31,8 @@ const url = {
   user: {
     config: main + 'user/saveConfig',
     job: main + 'user/job',
-    addJob: main + 'user/addJob'
+    addJob: main + 'user/addJob',
+    deleteJob: main + 'user/deleteJob'
   },
   barU: {
     storno: main + 'bar/storno'
diff --git a/src/store/modules/jobs.js b/src/store/modules/jobs.js
index 0dacce8..d338af8 100644
--- a/src/store/modules/jobs.js
+++ b/src/store/modules/jobs.js
@@ -130,6 +130,10 @@ const mutations = {
                 fullName: user.firstname + ' ' + user.lastname
               })
             }
+            if (worker && data.com === 'delete') {
+              const index = state.month[week].days[day].worker.indexOf(worker)
+              state.month[week].days[day].worker.splice(index, 1)
+            }
           }
           if (data.day) {
             state.month[week].days[day].locked = data.day.locked
@@ -235,6 +239,21 @@ const actions = {
       if (e.response)
         if (e.response.status === 401) dispatch('logout', null, { root: true })
     }
+  },
+  // eslint-disable-next-line no-unused-vars
+  async deleteJob({ commit, rootState, dispatch }, data) {
+    try {
+      const response = await axios.post(
+        url.user.deleteJob,
+        { ...data },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      commit('updateMonth', {start: {...data}, user: rootState.login.user, com: 'delete'})
+      console.log(response)
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
   }
 }
 

From e90dbf65137246c3668ccab753616fbd4c7056c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Tue, 25 Feb 2020 22:34:45 +0100
Subject: [PATCH 5/5] finished ##169 and ##170

user can transact a Job, if the transact accepted the user can delete his job

user can decline or accept a jobrequest
---
 src/components/user/JobRequests.vue    | 250 +++++++++++++++++++++++++
 src/components/user/Jobs.vue           |   4 +-
 src/components/user/Jobs/Day.vue       |  91 ++++++++-
 src/components/user/UserNavigation.vue |  29 ++-
 src/plugins/routes.js                  |   7 +-
 src/router/index.js                    |   6 +
 src/store/index.js                     |   4 +-
 src/store/modules/jobRequests.js       | 161 ++++++++++++++++
 src/store/modules/jobs.js              |  50 ++++-
 9 files changed, 584 insertions(+), 18 deletions(-)
 create mode 100644 src/components/user/JobRequests.vue
 create mode 100644 src/store/modules/jobRequests.js

diff --git a/src/components/user/JobRequests.vue b/src/components/user/JobRequests.vue
new file mode 100644
index 0000000..1260bb8
--- /dev/null
+++ b/src/components/user/JobRequests.vue
@@ -0,0 +1,250 @@
+<template>
+  <div>
+    <v-toolbar>
+      <v-toolbar-title>
+        Dienstanfragen
+      </v-toolbar-title>
+    </v-toolbar>
+    <v-card tile flat>
+      <v-card-title>
+        Gesendete Anfragen
+      </v-card-title>
+      <v-progress-circular indeterminate v-if="transactJobsLoading" />
+      <div v-for="job in transactJobs" :key="transactJobs.indexOf(job)">
+        <v-expand-transition>
+          <v-card tile style="margin-top: 3px">
+            <v-card-text>
+              <v-row>
+                <v-col>
+                  <v-combobox
+                          outlined
+                          label="An"
+                          :value="job.to_user.firstname + ' ' + job.to_user.lastname"
+                          readonly
+                          append-icon
+                  >
+                    <template v-slot:selection="data">
+                      <v-chip>
+                        {{ data.item }}
+                      </v-chip>
+                    </template>
+                  </v-combobox>
+                </v-col>
+                <v-col>
+                  <v-combobox
+                          outlined
+                          label="Datum"
+                          :value="
+                    job.date.getDate() +
+                      '.' +
+                      (job.date.getMonth() + 1) +
+                      '.' +
+                      job.date.getFullYear()
+                  "
+                          readonly
+                          append-icon
+                  >
+                    <template v-slot:selection="data">
+                      <v-chip>
+                        {{ data.item }}
+                      </v-chip>
+                    </template>
+                  </v-combobox>
+                </v-col>
+                <v-col>
+                  <v-combobox
+                          outlined
+                          label="Status"
+                          :value="acceptedStatus(job)"
+                          readonly
+                          append-icon
+                  >
+                    <template v-slot:selection="data">
+                      <v-chip :color="statusColor(job)">
+                        {{ data.item }}
+                      </v-chip>
+                    </template>
+                  </v-combobox>
+                </v-col>
+              </v-row>
+            </v-card-text>
+            <v-card-actions v-if="!job.answerd">
+              <v-spacer/>
+              <v-btn
+                      @click="
+                deleteTransactJob({
+                  username: job.to_user.username,
+                  year: job.date.getFullYear(),
+                  month: job.date.getMonth() + 1,
+                  day: job.date.getDate()
+                })
+              "
+              >Stornieren
+              </v-btn
+              >
+            </v-card-actions>
+          </v-card>
+        </v-expand-transition>
+      </div>
+    </v-card>
+    <v-divider />
+    <v-card tile flat>
+      <v-card-title>
+        Eingehende Anfragen
+      </v-card-title>
+      <v-progress-circular indeterminate v-if="requestJobsLoading" />
+      <div v-for="job in requestJobs" :key="requestJobs.indexOf(job)">
+        <v-card tile style="margin-top: 3px">
+          <v-card-text>
+            <v-row>
+              <v-col>
+                <v-combobox
+                  outlined
+                  label="Von"
+                  :value="
+                    job.from_user.firstname + ' ' + job.from_user.lastname
+                  "
+                  readonly
+                  append-icon
+                >
+                  <template v-slot:selection="data">
+                    <v-chip>
+                      {{ data.item }}
+                    </v-chip>
+                  </template>
+                </v-combobox>
+              </v-col>
+              <v-col>
+                <v-combobox
+                  outlined
+                  label="Datum"
+                  :value="
+                    job.date.getDate() +
+                      '.' +
+                      (job.date.getMonth() + 1) +
+                      '.' +
+                      job.date.getFullYear()
+                  "
+                  readonly
+                  append-icon
+                >
+                  <template v-slot:selection="data">
+                    <v-chip>
+                      {{ data.item }}
+                    </v-chip>
+                  </template>
+                </v-combobox>
+              </v-col>
+              <v-col>
+                <v-combobox
+                  outlined
+                  label="Status"
+                  :value="acceptedStatus(job)"
+                  readonly
+                  append-icon
+                >
+                  <template v-slot:selection="data">
+                    <v-chip :color="statusColor(job)">
+                      {{ data.item }}
+                    </v-chip>
+                  </template>
+                </v-combobox>
+              </v-col>
+            </v-row>
+          </v-card-text>
+          <v-expand-transition>
+            <v-card-actions v-if="!job.answerd">
+              <v-spacer />
+              <v-btn
+                color="red"
+                @click="
+                  answerJob({
+                    username: job.from_user.username,
+                    year: job.date.getFullYear(),
+                    month: job.date.getMonth() + 1,
+                    day: job.date.getDate(),
+                    answer: false
+                  })
+                "
+                >Ablehnen
+              </v-btn>
+              <v-btn
+                color="green"
+                @click="
+                  answerJob({
+                    username: job.from_user.username,
+                    year: job.date.getFullYear(),
+                    month: job.date.getMonth() + 1,
+                    day: job.date.getDate(),
+                    answer: true
+                  })
+                "
+                >Annehmen
+              </v-btn>
+            </v-card-actions>
+          </v-expand-transition>
+        </v-card>
+      </div>
+    </v-card>
+  </div>
+</template>
+
+<script>
+import { mapGetters, mapActions } from 'vuex'
+export default {
+  name: 'JobRequests',
+  methods: {
+    ...mapActions({
+      getTransactJobs: 'requestJobs/getTransactJobs',
+      getRequestJobs: 'requestJobs/getRequestJobs',
+      answerJob: 'requestJobs/answerTransactJob',
+      deleteTransactJob: 'requestJobs/deleteTransactJob'
+    })
+  },
+  computed: {
+    ...mapGetters({
+      transactJobs: 'requestJobs/transactJobs',
+      transactJobsLoading: 'requestJobs/transactJobsLoading',
+      requestJobs: 'requestJobs/requestJobs',
+      requestJobsLoading: 'requestJobs/requestJobsLoading'
+    }),
+    acceptedStatus() {
+      return job => {
+        if (!job.answerd) {
+          return 'gesendet'
+        }
+        if (job.answerd && job.accepted) {
+          return 'angenommen'
+        }
+        return 'abgelehnt'
+      }
+    },
+    statusColor() {
+      return job => {
+        if (!job.answerd) {
+          return
+        }
+        if (job.answerd && job.accepted) {
+          return 'green'
+        }
+        return 'red'
+      }
+    }
+  },
+  created() {
+    var now = new Date()
+    this.getTransactJobs({
+      year: now.getFullYear(),
+      month: now.getMonth() + 1,
+      day: now.getDate()
+    })
+    this.getRequestJobs({
+      year: now.getFullYear(),
+      month: now.getMonth() + 1,
+      day: now.getDate()
+    })
+  }
+}
+</script>
+
+<style scoped></style>
diff --git a/src/components/user/Jobs.vue b/src/components/user/Jobs.vue
index a50bef1..77e322d 100644
--- a/src/components/user/Jobs.vue
+++ b/src/components/user/Jobs.vue
@@ -73,10 +73,12 @@ export default {
   },
   created() {
     this.createMonth(this.date)
+    this.getAllUsers()
   },
   methods: {
     ...mapActions({
-      createMonth: 'jobs/createMonth'
+      createMonth: 'jobs/createMonth',
+      getAllUsers: 'jobs/getAllUsers'
     }),
     changeMonth(value) {
       if (value === -1) {
diff --git a/src/components/user/Jobs/Day.vue b/src/components/user/Jobs/Day.vue
index f14941a..7c14f9c 100644
--- a/src/components/user/Jobs/Day.vue
+++ b/src/components/user/Jobs/Day.vue
@@ -17,7 +17,7 @@
             <div v-for="worker in day.worker" :key="day.worker.indexOf(worker)">
               <v-chip
                 style="margin: 3px;"
-                :close="user(worker) && !day.locked"
+                :close="user(worker) && !day.locked || canDelete && user(worker)"
                 @click:close="
                   deleteJob({
                     year: day.date.getFullYear(),
@@ -31,6 +31,35 @@
           </div>
         </v-expand-transition>
       </v-card-text>
+      <div v-if="userInWorker">
+        <v-card-actions class="text--secondary">
+          <v-autocomplete
+            return-object
+            v-model="requestUser"
+            :items="specifiedUsers"
+            item-text="fullName"
+            label="Dienstanfrage"
+            filled
+            color="green"
+            @input="searchInput = null"
+            :search-input.sync="searchInput"
+          >
+            <template v-slot:prepend-inner>
+              <v-icon>{{ account_add }}</v-icon>
+            </template>
+            <template v-slot:item="data">
+              <v-list-item-content>
+                <v-list-item-title>
+                  {{ data.item.firstname }} {{ data.item.lastname }}
+                </v-list-item-title>
+              </v-list-item-content>
+            </template>
+          </v-autocomplete>
+        </v-card-actions>
+        <v-card-actions>
+          <v-btn text block @click="send">senden</v-btn>
+        </v-card-actions>
+      </div>
       <v-card-actions class="text--secondary">
         <div v-if="!userInWorker">
           <div v-if="day.locked">
@@ -45,7 +74,10 @@
         </div>
         <v-spacer />
         <v-btn
-          v-if="!day.locked && !day.loading && day.worker.length < 2"
+          v-if="!day.locked &&
+              !day.loading &&
+              day.worker.length < 2 &&
+              !userInWorker"
           @click="
             addJob({
               year: day.date.getFullYear(),
@@ -53,8 +85,8 @@
               day: day.date.getDate()
             })
           "
-          >Eintragen</v-btn
-        >
+          >Eintragen
+        </v-btn>
       </v-card-actions>
     </v-card>
   </div>
@@ -71,7 +103,8 @@ export default {
   data() {
     return {
       account_add: mdiAccountPlus,
-      searchInput: null
+      searchInput: null,
+      requestUser: null
     }
   },
   created() {
@@ -83,18 +116,36 @@ export default {
       month: this.day.date.getMonth() + 1,
       day: this.day.date.getDate()
     })
+    this.getTransactJobs({})
+    this.getTransactJobs({
+      year: this.day.date.getFullYear(),
+      month: this.day.date.getMonth() + 1,
+      day: this.day.date.getDate()
+    })
   },
   methods: {
     ...mapActions({
+      getTransactJobs: 'requestJobs/getTransactJobs',
       getUser: 'jobs/getUser',
       setLoading: 'jobs/setDayLoading',
       setNotLoading: 'jobs/setDayNotLoading',
       addJob: 'jobs/addJob',
-      deleteJob: 'jobs/deleteJob'
+      deleteJob: 'jobs/deleteJob',
+      transactJob: 'jobs/transactJob'
     }),
     test(event) {
       console.log('blur', event)
     },
+    send() {
+      this.transactJob({
+        user: this.requestUser.username,
+        year: this.day.date.getFullYear(),
+        month: this.day.date.getMonth() + 1,
+        day: this.day.date.getDate()
+      })
+      this.requestUser = null
+      this.searchInput = null
+    },
     color: day => {
       if (day) {
         if (day.date.getDay() === 0 || day.date.getDay() === 1) {
@@ -117,12 +168,38 @@ export default {
   computed: {
     ...mapGetters({
       disabled: 'jobs/disabled',
-      activeUser: 'user'
+      activeUser: 'user',
+      allUsers: 'jobs/allUsers',
+      transactJobs: 'requestJobs/transactJobs'
     }),
     userInWorker() {
       return this.day.worker.find(a => {
         return a.username === this.activeUser.username
       })
+    },
+    specifiedUsers() {
+      var users = [...this.allUsers]
+      for (var i in this.day.worker) {
+        var worker = users.find(a => {
+          return a.username === this.day.worker[i].username
+        })
+        var index = users.indexOf(worker)
+        if (worker) users.splice(index, 1)
+      }
+      return users
+    },
+    canDelete() {
+      console.log(this.day.date)
+      console.log(this.transactJobs)
+      var transactJob = this.transactJobs.filter(a => {
+        return a.date - this.day.date === 0
+      })
+      console.log('filter', transactJob)
+      var test = transactJob.find(a => {
+        return a.accepted && a.answerd
+      })
+      console.log('find', test)
+      return test
     }
   },
   watch: {
diff --git a/src/components/user/UserNavigation.vue b/src/components/user/UserNavigation.vue
index ade5ca4..a9aa1b0 100644
--- a/src/components/user/UserNavigation.vue
+++ b/src/components/user/UserNavigation.vue
@@ -2,7 +2,7 @@
   <v-list>
     <v-list-item link to="/main/user/add">
       <v-list-item-icon>
-        <v-icon>{{account}}</v-icon>
+        <v-icon>{{ account }}</v-icon>
       </v-list-item-icon>
       <v-list-item-title>
         Home
@@ -10,21 +10,29 @@
     </v-list-item>
     <v-list-item link to="/main/user/overview">
       <v-list-item-icon>
-        <v-icon>{{bank}}</v-icon>
+        <v-icon>{{ bank }}</v-icon>
       </v-list-item-icon>
       <v-list-item-title>Finanzübersicht</v-list-item-title>
     </v-list-item>
     <v-list-item link to="/main/user/jobs">
       <v-list-item-icon>
         <v-icon>
-          {{briefcase}}
+          {{ briefcase }}
         </v-icon>
       </v-list-item-icon>
       <v-list-item-title>Dienstübersicht</v-list-item-title>
     </v-list-item>
+    <v-list-item link to="/main/user/jobRequests">
+      <v-list-item-icon>
+        <v-icon>
+          {{ switchAccount }}
+        </v-icon>
+      </v-list-item-icon>
+      <v-list-item-title>Dienstanfragen</v-list-item-title>
+    </v-list-item>
     <v-list-item link to="/main/user/config">
       <v-list-item-icon>
-        <v-icon>{{account_card_details}}</v-icon>
+        <v-icon>{{ account_card_details }}</v-icon>
       </v-list-item-icon>
       <v-list-item-title>Einstellung</v-list-item-title>
     </v-list-item>
@@ -32,15 +40,22 @@
 </template>
 
 <script>
-  import {mdiAccountCardDetails, mdiHome, mdiBank, mdiBriefcase } from '@mdi/js'
+import {
+  mdiAccountCardDetails,
+  mdiHome,
+  mdiBank,
+  mdiBriefcase,
+  mdiAccountSwitch
+} from '@mdi/js'
 export default {
   name: 'UserNavigation',
-  data () {
+  data() {
     return {
       account_card_details: mdiAccountCardDetails,
       account: mdiHome,
       bank: mdiBank,
-      briefcase: mdiBriefcase
+      briefcase: mdiBriefcase,
+      switchAccount: mdiAccountSwitch
     }
   }
 }
diff --git a/src/plugins/routes.js b/src/plugins/routes.js
index d6e4439..c8ea406 100644
--- a/src/plugins/routes.js
+++ b/src/plugins/routes.js
@@ -32,7 +32,12 @@ const url = {
     config: main + 'user/saveConfig',
     job: main + 'user/job',
     addJob: main + 'user/addJob',
-    deleteJob: main + 'user/deleteJob'
+    deleteJob: main + 'user/deleteJob',
+    transactJob: main + 'user/transactJob',
+    answerTransactJob: main + 'user/answerTransactJob',
+    jobRequests: main + 'user/jobRequests',
+    getTransactJobs: main + 'user/getTransactJobs',
+    deleteTransactJobs: main + 'user/deleteTransactJob'
   },
   barU: {
     storno: main + 'bar/storno'
diff --git a/src/router/index.js b/src/router/index.js
index 6ab656a..8f46419 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -17,6 +17,7 @@ import User from '../components/finanzer/User'
 import ServiceManagement from '../components/vorstand/ServiceManagement'
 import Config from '@/components/user/Config'
 import Jobs from '@/components/user/Jobs'
+import JobRequests from '@/components/user/JobRequests'
 
 Vue.use(VueRouter)
 
@@ -55,6 +56,11 @@ const routes = [
             path: 'jobs',
             name: 'userJobs',
             component: Jobs
+          },
+          {
+            path: 'jobRequests',
+            name: 'jobRequests',
+            component: JobRequests
           }
         ]
       },
diff --git a/src/store/index.js b/src/store/index.js
index 66b5b99..2890a75 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -6,6 +6,7 @@ import barUsers from '@/store/modules/barUsers'
 import user from '@/store/modules/user'
 import sm from '@/store/modules/serviceManagement'
 import jobs from '@/store/modules/jobs'
+import requestJobs from '@/store/modules/jobRequests'
 
 Vue.use(Vuex)
 
@@ -16,6 +17,7 @@ export default new Vuex.Store({
     barUsers,
     user,
     sm,
-    jobs
+    jobs,
+    requestJobs
   }
 })
diff --git a/src/store/modules/jobRequests.js b/src/store/modules/jobRequests.js
new file mode 100644
index 0000000..02747ac
--- /dev/null
+++ b/src/store/modules/jobRequests.js
@@ -0,0 +1,161 @@
+import axios from 'axios'
+import url from '@/plugins/routes'
+
+const state = {
+  transactJobs: [],
+  transactJobsLoading: false,
+  requestJobs: [],
+  requestJobsLoading: false
+}
+
+const mutations = {
+  setTransactJobs: (state, data) => {
+    var list = []
+    for (var i in data) {
+      list.push({
+        date: new Date(
+          data[i].date.year,
+          data[i].date.month - 1,
+          data[i].date.day
+        ),
+        from_user: data[i].from_user,
+        to_user: data[i].to_user,
+        accepted: data[i].accepted,
+        answerd: data[i].answerd
+      })
+    }
+    state.transactJobs = list
+  },
+  setRequestJobs: (state, data) => {
+    var list = []
+    for (var i in data) {
+      list.push({
+        date: new Date(
+          data[i].date.year,
+          data[i].date.month - 1,
+          data[i].date.day
+        ),
+        from_user: data[i].from_user,
+        to_user: data[i].to_user,
+        accepted: data[i].accepted,
+        answerd: data[i].answerd
+      })
+    }
+    state.requestJobs = list
+  },
+  setTransactJobsLoading: (state, value) => {
+    state.transactJobsLoading = value
+  },
+  setRequestJobsLoading: (state, value) => {
+    state.requestJobsLoading = value
+  },
+  updateRequestJob: (state, data) => {
+    const date = new Date(data.date.year, data.date.month - 1, data.date.day)
+    for (var i in state.requestJobs) {
+      if (
+        state.requestJobs[i].date - date === 0 &&
+        state.requestJobs[i].from_user.username === data.from_user.username
+      ) {
+        state.requestJobs[i].accepted = data.accepted
+        state.requestJobs[i].answerd = data.answerd
+        break
+      }
+    }
+  },
+  deleteTransactJobactJob: (state, data) => {
+    const date = new Date(data.year, data.month - 1, data.day)
+    var job = state.transactJobs.find(a => {
+      console.log(a)
+      console.log(a.date, date)
+      return a.date - date === 0 && a.to_user.username === data.username
+    })
+    console.log(job)
+    var index = state.transactJobs.indexOf(job)
+    if (job)
+      state.transactJobs.splice(index, 1)
+  }
+}
+
+const actions = {
+  async getTransactJobs({ commit, rootState, dispatch }, data) {
+    commit('setTransactJobsLoading', true)
+    try {
+      const response = await axios.post(
+        url.user.getTransactJobs,
+        { ...data },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      commit('setTransactJobs', response.data)
+    } catch (e) {
+      if (e.response)
+        if (e.response.data === 401) dispatch('logout', null, { root: true })
+      commit('setTransactJobsLoading', false)
+    }
+    commit('setTransactJobsLoading', false)
+  },
+  async getRequestJobs({ commit, rootState, dispatch }, data) {
+    commit('setRequestJobsLoading', true)
+    try {
+      const response = await axios.post(
+        url.user.jobRequests,
+        { ...data },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      commit('setRequestJobs', response.data)
+    } catch (e) {
+      if (e.response)
+        if (e.response.data === 401) dispatch('logout', null, { root: true })
+      commit('setRequestJobsLoading', false)
+    }
+    commit('setRequestJobsLoading', false)
+  },
+  async answerTransactJob({ commit, rootState, dispatch }, data) {
+    try {
+      const response = await axios.post(
+        url.user.answerTransactJob,
+        { ...data },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      commit('updateRequestJob', response.data)
+    } catch (e) {
+      if (e.response)
+        if (e.response.data === 401) dispatch('logout', null, { root: true })
+    }
+  },
+  async deleteTransactJob({ commit, rootState, dispatch }, data) {
+    try {
+      await axios.post(
+        url.user.deleteTransactJobs,
+        { ...data },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      commit('deleteTransactJobactJob', data)
+    } catch (e) {
+      if (e.response)
+        if (e.response.data === 401) dispatch('logout', null, { root: true })
+    }
+  }
+}
+
+const getters = {
+  transactJobs: state => {
+    return state.transactJobs
+  },
+  transactJobsLoading: state => {
+    return state.transactJobsLoading
+  },
+  requestJobs: state => {
+    return state.requestJobs
+  },
+  requestJobsLoading: state => {
+    return state.requestJobsLoading
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+  getters
+}
diff --git a/src/store/modules/jobs.js b/src/store/modules/jobs.js
index d338af8..dc6435b 100644
--- a/src/store/modules/jobs.js
+++ b/src/store/modules/jobs.js
@@ -3,10 +3,23 @@ import url from '@/plugins/routes'
 
 const state = {
   month: [],
+  allUsers: [],
   disabled: false
 }
 
 const mutations = {
+  setAllUsers: (state, data) => {
+    state.allUsers = []
+    state.allUsers = data.users
+    const index = state.allUsers.indexOf(
+      state.allUsers.find(a => a.username === data.username)
+    )
+    state.allUsers.splice(index, 1)
+    for (let i = 0; i < state.allUsers.length; i++) {
+      state.allUsers[i].fullName =
+        state.allUsers[i].firstname + ' ' + state.allUsers[i].lastname
+    }
+  },
   createMonth: (state, date) => {
     let month = []
     let id = 0
@@ -189,6 +202,22 @@ const mutations = {
 }
 
 const actions = {
+  async getAllUsers({ commit, rootState, dispatch }) {
+    try {
+      const response = await axios.post(
+        url.searchUser,
+        { searchString: '' },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      commit('setAllUsers', {
+        users: response.data,
+        username: rootState.login.user.username
+      })
+    } catch (e) {
+      if (e.response)
+        if (e.response.data === 401) dispatch('logout', null, { root: true })
+    }
+  },
   createMonth({ commit }, date) {
     commit('setDisabled', true)
     commit('createMonth', date)
@@ -248,12 +277,28 @@ const actions = {
         { ...data },
         { headers: { Token: rootState.login.user.accessToken } }
       )
-      commit('updateMonth', {start: {...data}, user: rootState.login.user, com: 'delete'})
+      commit('updateMonth', {
+        start: { ...data },
+        user: rootState.login.user,
+        com: 'delete'
+      })
       console.log(response)
     } catch (e) {
       if (e.response)
         if (e.response.status === 401) dispatch('logout', null, { root: true })
     }
+  },
+  async transactJob({ rootState, dispatch }, data) {
+    try {
+      await axios.post(
+        url.user.transactJob,
+        { ...data },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
   }
 }
 
@@ -272,6 +317,9 @@ const getters = {
   },
   disabled: state => {
     return state.disabled
+  },
+  allUsers: state => {
+    return state.allUsers
   }
 }