diff --git a/src/components/baruser/CreditLists.vue b/src/components/baruser/CreditLists.vue
index 35bff87..03db226 100644
--- a/src/components/baruser/CreditLists.vue
+++ b/src/components/baruser/CreditLists.vue
@@ -1,90 +1,116 @@
-
-
-
- {{user.firstname}} {{user.lastname}}
-
-
-
-
-
-
- 2 €
-
-
- 1 €
-
-
- 0,50 €
-
-
-
-
- 0,40 €
-
-
- 0,20 €
-
-
- 0,10 €
-
-
-
-
-
-
- {{(user.amount/100).toFixed(2)}} €
-
-
-
-
- {{user.firstname}} darf nicht mehr anschreiben. {{user.firstname}} sollte sich lieber mal beim Finanzer melden.
-
-
-
+
+
+
+
+ {{ user.firstname }} {{ user.lastname }}
+
+
+
+
+
+
+ 2 €
+
+
+ 1 €
+
+
+ 0,50 €
+
+
+
+
+ 0,40 €
+
+
+ 0,20 €
+
+
+ 0,10 €
+
+
+
+
+
+
+ {{
+ (user.amount / 100).toFixed(2)
+ }}
+ €
+
+
+
+
+ {{ user.firstname }} darf nicht mehr anschreiben.
+ {{ user.firstname }} sollte sich lieber mal beim Finanzer
+ melden.
+
+
+
+
@@ -102,8 +128,6 @@ export default {
},
created() {
this.getUsers()
- // eslint-disable-next-line no-console
- console.log(this.users)
},
methods: {
...mapActions({
@@ -112,10 +136,23 @@ export default {
}),
getColor(type) {
return type === 'credit' ? 'title green--text' : 'title red--text'
+ },
+ isFiltered(user) {
+ try {
+ return (
+ user.firstname.toLowerCase().includes(this.filter.toLowerCase()) ||
+ user.lastname.toLowerCase().includes(this.filter.toLowerCase())
+ )
+ } catch (e) {
+ return true
+ }
}
},
computed: {
- ...mapGetters({ users: 'barUsers/users' })
+ ...mapGetters({
+ users: 'barUsers/users',
+ filter: 'barUsers/filter'
+ })
}
}
diff --git a/src/components/baruser/SearchBar.vue b/src/components/baruser/SearchBar.vue
index c1abe10..58efddf 100644
--- a/src/components/baruser/SearchBar.vue
+++ b/src/components/baruser/SearchBar.vue
@@ -13,6 +13,7 @@
item-text="fullName"
prepend-inner-icon="search"
full-width
+ :search-input.sync="filter"
/>
Hinzufügen
@@ -28,7 +29,8 @@ export default {
props: {},
data() {
return {
- user: null
+ user: null,
+ filter: ''
}
},
created() {
@@ -37,7 +39,8 @@ export default {
methods: {
...mapActions({
getAllUsers: 'barUsers/getAllUsers',
- addCreditList: 'barUsers/addCreditList'
+ addCreditList: 'barUsers/addCreditList',
+ setFilter: 'barUsers/setFilter'
}),
addUser() {
this.addCreditList(this.user)
@@ -46,9 +49,13 @@ export default {
},
computed: {
...mapGetters({ allUsers: 'barUsers/allUsers' })
+ },
+ watch: {
+ filter(val) {
+ this.setFilter(val)
+ }
}
}
-
+
diff --git a/src/components/finanzer/Overview.vue b/src/components/finanzer/Overview.vue
index 37da410..ec0c0ae 100644
--- a/src/components/finanzer/Overview.vue
+++ b/src/components/finanzer/Overview.vue
@@ -8,7 +8,7 @@
keyboard_arrow_left
- {{year}}
+ {{ year }}
keyboard_arrow_right
@@ -17,7 +17,12 @@
Emails senden
-
+
@@ -28,7 +33,7 @@
text
icon
style="margin-right: 5px"
- @click="errorExpand ? errorExpand = false : errorExpand = true"
+ @click="errorExpand ? (errorExpand = false) : (errorExpand = true)"
>
$expand
@@ -40,14 +45,18 @@
:key="errorMails.indexOf(error)"
dense
:type="computeError(error.error)"
- >{{errorMessage(error)}}
+ >{{ errorMessage(error) }}
-
- {{user.lastname}}, {{user.firstname}}
+
+ {{ user.lastname }}, {{ user.firstname }}
@@ -60,7 +69,10 @@
{{(user.creditList[year][1].last / 100).toFixed(2)}}
+ >{{
+ (user.creditList[year][1].last / 100).toFixed(2)
+ }}
@@ -71,10 +83,23 @@
- {{(getAllSum(user.creditList[year][2].sum ,user.creditList[year][1].last) /
- 100).toFixed(2)}}
+ {{
+ (
+ getAllSum(
+ user.creditList[year][2].sum,
+ user.creditList[year][1].last
+ ) / 100
+ ).toFixed(2)
+ }}
@@ -85,18 +110,26 @@
Status:
- {{user.locked ? 'Gesperrt': 'nicht Gesperrt'}}
+ {{
+ user.locked ? 'Gesperrt' : 'nicht Gesperrt'
+ }}
- Geld transferieren
+ Geld transferieren
-
- $expand
+
+ $expand
@@ -104,14 +137,21 @@
-
+
@@ -191,10 +231,7 @@ export default {
}
}
},
- created() {
- // eslint-disable-next-line no-console
- console.log(this.getData(this.createYears()))
- },
+ created() {},
methods: {
...mapActions({
createYears: 'finanzerUsers/createYears',
diff --git a/src/store/modules/barUsers.js b/src/store/modules/barUsers.js
index ed4186a..6dab54b 100644
--- a/src/store/modules/barUsers.js
+++ b/src/store/modules/barUsers.js
@@ -3,7 +3,8 @@ import url from '@/plugins/routes'
const state = {
users: [],
- allUsers: []
+ allUsers: [],
+ filter: ''
}
const mutations = {
@@ -16,11 +17,7 @@ const mutations = {
}
},
setUsers: (state, users) => {
- // eslint-disable-next-line no-console
- console.log(users)
for (let user in users) {
- // eslint-disable-next-line no-console
- console.log(user)
let existuser = state.users.find(a => {
return user === a.username
})
@@ -43,8 +40,6 @@ const mutations = {
})
}
}
- // eslint-disable-next-line no-console
- console.log(state.users)
mutations.sortUsers(state)
},
sortUsers: state => {
@@ -55,6 +50,9 @@ const mutations = {
if (a.firstname < b.firstname) return -1
return 0
})
+ },
+ setFilter: (state, filter) => {
+ state.filter = filter
}
}
@@ -65,8 +63,6 @@ const actions = {
const response = await axios.get(url.bar, {
headers: { Token: rootState.login.user.accessToken }
})
- // eslint-disable-next-line no-console
- console.log(response.data)
commit('setUsers', response.data)
} catch (e) {
if (e.response)
@@ -100,23 +96,20 @@ const actions = {
}
},
async getAllUsers({ commit, rootState, dispatch }) {
- // eslint-disable-next-line no-console
- console.log('hier bin ich')
try {
const response = await axios.post(
url.searchUser,
{ searchString: '' },
{ headers: { Token: rootState.login.user.accessToken } }
)
- // eslint-disable-next-line no-console
- console.log(response)
commit('setAllUsers', response.data)
} catch (e) {
- // eslint-disable-next-line no-console
- console.log(e)
if (e.response)
if (e.response.data === 401) dispatch('logout', null, { root: true })
}
+ },
+ setFilter({ commit }, data) {
+ commit('setFilter', data)
}
}
@@ -126,6 +119,9 @@ const getters = {
},
allUsers: state => {
return state.allUsers
+ },
+ filter: state => {
+ return state.filter
}
}
diff --git a/src/store/modules/finanzerUsers.js b/src/store/modules/finanzerUsers.js
index d379a36..766f0f6 100644
--- a/src/store/modules/finanzerUsers.js
+++ b/src/store/modules/finanzerUsers.js
@@ -47,11 +47,7 @@ const mutations = {
state.errorMail = null
},
setUsers: (state, users) => {
- // eslint-disable-next-line no-console
- console.log('users', users)
for (let user in users) {
- // eslint-disable-next-line no-console
- console.log('user', user)
let list = {}
for (let creditList in users[user]['creditList']) {
let amount = mutations.createAmount(
@@ -67,9 +63,6 @@ const mutations = {
let existUser = state.users.find(a => {
return a.username === user
})
-
- // eslint-disable-next-line no-console
- console.log(existUser)
if (existUser) {
existUser.username = users[user].username
existUser.firstname = users[user].firstname
@@ -92,9 +85,6 @@ const mutations = {
}
}
mutations.sortUsers(state)
-
- // eslint-disable-next-line no-console
- console.log(state.users)
},
createAmount(creditList) {
let amount = {
@@ -240,8 +230,6 @@ const mutations = {
const actions = {
// eslint-disable-next-line no-unused-vars
async getAllUsers({ commit, rootState, dispatch }) {
- // eslint-disable-next-line no-console
- console.log(rootState)
try {
const response = await axios.post(
url.searchUser,
@@ -261,12 +249,8 @@ const actions = {
const response = await axios.get(url.getFinanzerMain, {
headers: { Token: rootState.login.user.accessToken }
})
- // eslint-disable-next-line no-console
- console.log('response', response.data)
commit('setUsers', response.data)
} catch (err) {
- // eslint-disable-next-line no-console
- console.log(err)
if (err.response)
if (err.response.status === 401)
dispatch('logout', null, { root: true })