From 586e1fdf6453c8cc41d8876a8ee8c5f889a338f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Wed, 4 Mar 2020 21:12:08 +0100
Subject: [PATCH] finished ##213

---
 src/components/TitleBar.vue            |  2 +-
 src/components/user/Jobs.vue           | 14 +++++++++++++-
 src/components/user/Jobs/Day.vue       |  7 -------
 src/plugins/routes.js                  |  7 ++++---
 src/router/index.js                    |  2 ++
 src/store/modules/barUsers.js          |  3 +--
 src/store/modules/finanzerUsers.js     |  3 +--
 src/store/modules/jobs.js              |  3 +--
 src/store/modules/login.js             | 11 ++++++++++-
 src/store/modules/serviceManagement.js |  5 ++---
 src/views/MainView.vue                 |  9 +++++++++
 11 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/src/components/TitleBar.vue b/src/components/TitleBar.vue
index 3876b0c..9757a3e 100644
--- a/src/components/TitleBar.vue
+++ b/src/components/TitleBar.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-app-bar app clipped-left clipped-right hide-on-scroll color="blue accent-4" class="elevation-4" dark>
+  <v-app-bar app clipped-left clipped-right color="blue accent-4" class="elevation-4" dark dense>
     <v-btn icon to="/">
       <v-img src="@/assets/logo-big.png" contain height="40"></v-img>
     </v-btn>
diff --git a/src/components/user/Jobs.vue b/src/components/user/Jobs.vue
index bedfa10..0f9f119 100644
--- a/src/components/user/Jobs.vue
+++ b/src/components/user/Jobs.vue
@@ -73,15 +73,27 @@ export default {
   },
   created() {
     for (let intDate = 1; intDate < 7; intDate++) {
-      if (new Date(this.date.getFullYear(), this.date.getMonth(), intDate).getDay() === 3)
+      if (
+        new Date(
+          this.date.getFullYear(),
+          this.date.getMonth(),
+          intDate
+        ).getDay() === 3
+      )
         if (this.date.getDate() < intDate)
           this.date = new Date(this.date.getFullYear(), this.date.getMonth(), 0)
     }
     this.createMonth(this.date)
     this.getAllUsers()
+    this.getTransactJobs({
+      year: this.date.getFullYear(),
+      month: this.date.getMonth() + 1,
+      day: 1
+    })
   },
   methods: {
     ...mapActions({
+      getTransactJobs: 'requestJobs/getTransactJobs',
       createMonth: 'jobs/createMonth',
       getAllUsers: 'jobs/getAllUsers'
     }),
diff --git a/src/components/user/Jobs/Day.vue b/src/components/user/Jobs/Day.vue
index 7c14f9c..f322de8 100644
--- a/src/components/user/Jobs/Day.vue
+++ b/src/components/user/Jobs/Day.vue
@@ -116,16 +116,9 @@ 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',
diff --git a/src/plugins/routes.js b/src/plugins/routes.js
index 5353996..06f86a8 100644
--- a/src/plugins/routes.js
+++ b/src/plugins/routes.js
@@ -1,6 +1,6 @@
 //const main = 'https://192.168.5.128:5000/'
-//const main = 'http://localhost:5000/'
-const main = 'http://192.168.5.118:5000/'
+const main = 'http://localhost:5000/'
+//const main = 'http://192.168.5.118:5000/'
 //const main = 'https://groeger-clan.duckdns.org:5000/'
 
 const url = {
@@ -28,7 +28,8 @@ const url = {
       addUser: main + 'sm/addUser',
       deleteUser: main + 'sm/deleteUser',
       getUser: main + 'sm/getUser',
-      lockDay: main + 'sm/lockDay'
+      lockDay: main + 'sm/lockDay',
+      searchUser: main + 'sm/searchWithExtern'
     },
     um: {
       setStatus: main + 'um/setStatus',
diff --git a/src/router/index.js b/src/router/index.js
index 1f27c0e..ee29103 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -176,6 +176,8 @@ router.beforeEach((to, from, next) => {
         next('/main/bar/geruecht')
       } else if (store.state.login.user.group.includes('user')) {
         next('/main/user/add')
+      } else if (store.state.login.user.group.includes('extern')) {
+        next('/main')
       }
     }
   }
diff --git a/src/store/modules/barUsers.js b/src/store/modules/barUsers.js
index 9c8bea1..b48afef 100644
--- a/src/store/modules/barUsers.js
+++ b/src/store/modules/barUsers.js
@@ -194,9 +194,8 @@ const actions = {
   async getAllUsers({ commit, rootState, dispatch }) {
     commit('setAllUsersLoading', true)
     try {
-      const response = await axios.post(
+      const response = await axios.get(
         url.searchUser,
-        { searchString: '' },
         { headers: { Token: rootState.login.user.accessToken } }
       )
       commit('setAllUsers', response.data)
diff --git a/src/store/modules/finanzerUsers.js b/src/store/modules/finanzerUsers.js
index 8d20843..6a92bc9 100644
--- a/src/store/modules/finanzerUsers.js
+++ b/src/store/modules/finanzerUsers.js
@@ -243,9 +243,8 @@ const actions = {
   async getAllUsers({ commit, rootState, dispatch }) {
     commit('setAllUsersLoading', true)
     try {
-      const response = await axios.post(
+      const response = await axios.get(
         url.searchUser,
-        { searchString: '' },
         { headers: { Token: rootState.login.user.accessToken } }
       )
       commit('setAllUsers', response.data)
diff --git a/src/store/modules/jobs.js b/src/store/modules/jobs.js
index dc6435b..99a8cfc 100644
--- a/src/store/modules/jobs.js
+++ b/src/store/modules/jobs.js
@@ -204,9 +204,8 @@ const mutations = {
 const actions = {
   async getAllUsers({ commit, rootState, dispatch }) {
     try {
-      const response = await axios.post(
+      const response = await axios.get(
         url.searchUser,
-        { searchString: '' },
         { headers: { Token: rootState.login.user.accessToken } }
       )
       commit('setAllUsers', {
diff --git a/src/store/modules/login.js b/src/store/modules/login.js
index 2575952..e1207cd 100644
--- a/src/store/modules/login.js
+++ b/src/store/modules/login.js
@@ -69,6 +69,8 @@ const actions = {
         router.push('/main/bar/geruecht')
       } else if (state.user.group.includes('user')) {
         router.push('/main/user/add')
+      } else if (state.user.group.includes('extern')) {
+        router.push('/main')
       }
     } catch (err) {
       commit('loginStop', err.response.data.error)
@@ -141,9 +143,16 @@ const getters = {
       return false
     }
   },
+  isExtern: state => {
+    try {
+      return state.user.group.includes('extern')
+    } catch (e) {
+      return false
+    }
+  },
   isManagement: state => {
     try {
-      return state.user.group.includes('management') || state.user.group.includes('gastro') || state.user.group.includes('moneymaster')
+      return state.user.group.includes('vorstand') || state.user.group.includes('gastro') || state.user.group.includes('moneymaster')
     } catch (e) {
       return false
     }
diff --git a/src/store/modules/serviceManagement.js b/src/store/modules/serviceManagement.js
index cb530da..c78d7e9 100644
--- a/src/store/modules/serviceManagement.js
+++ b/src/store/modules/serviceManagement.js
@@ -200,9 +200,8 @@ const actions = {
   },
   async getAllUsers({ commit, rootState, dispatch }) {
     try {
-      const response = await axios.post(
-        url.searchUser,
-        { searchString: '' },
+      const response = await axios.get(
+        url.vorstand.sm.searchUser,
         { headers: { Token: rootState.login.user.accessToken } }
       )
       commit('setAllUsers', response.data)
diff --git a/src/views/MainView.vue b/src/views/MainView.vue
index 482c4ed..5540f2a 100644
--- a/src/views/MainView.vue
+++ b/src/views/MainView.vue
@@ -10,6 +10,14 @@
       overflow
     >
       <v-list>
+        <v-list-item v-if="isExtern" class="title">
+          <v-list-item-icon>
+            <v-icon>{{person}}</v-icon>
+          </v-list-item-icon>
+          <v-list-item-title>
+            {{user.firstname}} {{user.lastname}}
+          </v-list-item-title>
+        </v-list-item>
         <v-list-item v-if="isUser" class="title" link to="/main/user/add">
           <v-list-item-icon>
             <v-icon>{{person}}</v-icon>
@@ -98,6 +106,7 @@ export default {
       isGastro: 'isGastro',
       isManagement: 'isManagement',
       isLoggedIn: 'isLoggedIn',
+      isExtern: 'isExtern',
       user: 'user'
     })
   }