xeovalyte/wrbapp
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fixed some small issues
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse Source
This commit is contained in:
xeovalyte 2023-01-07 20:09:18 +01:00
parent f5fca416a9
commit 8bbf4016da
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/app.vue
View File

@ -70,6 +70,8 @@ onMounted(() => {
const data = docSnap.data() const data = docSnap.data()
userData.value = data userData.value = data
getPersons(userData.value.relatiecodes) getPersons(userData.value.relatiecodes)
} else {
setTimeout(() => window.location.reload(true), 1000)
} }
if (!userData.value.sendNews && route.path === '/news/newmessage') navigateTo('/') if (!userData.value.sendNews && route.path === '/news/newmessage') navigateTo('/')

20
frontend/pages/settings/admin/ledenlijst.vue
View File

@ -132,18 +132,14 @@ const csvToJson = (csv) => {
for (let i in result) { for (let i in result) {
let groups = [] let groups = []
if (Array.isArray(result[i].Verenigingssporten)) { const correctGroups = result[i].Verenigingssporten.replace(/,/g, " -")
for (let j = 0; j < result[i].Verenigingssporten.length; j++ ) {
let tmp = result[i].Verenigingssporten[j].split(' - ') console.log(correctGroups)
tmp.shift() groups = correctGroups.split(' - ')
if (tmp[1] === 'Week') tmp[1] = 'Vrijdag' if (groups[2] === 'Week') groups[2] = 'Vrijdag'
groups.push(...tmp)
} groups = groups.filter((item) => item !== "Groep")
} else {
groups = result[i].Verenigingssporten.split(' - ')
groups.shift()
if (groups[1] === 'Week') groups[1] = 'Vrijdag'
}
ledenlijst.value.push({ relatiecode: result[i].Relatiecode, fullName: result[i]['Volledige naam (1)'], email: [result[i]['E-mail'], result[i]['2e E-mail']], groups: [...new Set(groups)], diploma: result[i]['Diploma dropdown 1'] }) ledenlijst.value.push({ relatiecode: result[i].Relatiecode, fullName: result[i]['Volledige naam (1)'], email: [result[i]['E-mail'], result[i]['2e E-mail']], groups: [...new Set(groups)], diploma: result[i]['Diploma dropdown 1'] })
} }