frontend/pages/settings/admin/ledenlijst.vue

@@ -92,57 +92,31 @@ const csvToJson = (csv) => {
     result.push(obj);
   }
 
-    /*
-    let array = csv.split("\n")
-    let result = [];
-
-    let headers = array[0].split(",")
-
-    for (let i = 1; i < array.length - 1; i++) {
-        let obj = {}
-    
-        let str = array[i]
-        let s = ''
-    
-        let flag = 0
-        for (let ch of str) {
-            if (ch === '"' && flag === 0) {
-                flag = 1
-            }
-            else if (ch === '"' && flag == 1) flag = 0
-            if (ch === ',' && flag === 0) ch = '|'
-            if (ch !== '"') s += ch
-        }
-    
-        let properties = s.split("|")
-    
-        for (let j in headers) {
-            if (properties[j].includes(",")) {
-                obj[headers[j]] = properties[j]
-                .split(",").map(item => item.trim())
-            }
-            else obj[headers[j]] = properties[j]
-        }
-        result.push(obj)
-    }
-    */ 
   if (!Object.hasOwn(result[0], 'Relatiecode') || !Object.hasOwn(result[0], 'Volledige naam (1)') || !Object.hasOwn(result[0], 'E-mail') || !Object.hasOwn(result[0], '2e E-mail') || !Object.hasOwn(result[0], 'Verenigingssporten') || !Object.hasOwn(result[0], 'Diploma dropdown 1')) return toast.error('Missing properties')
 
   ledenlijst.value = []
 
   for (let i in result) {
     let groups = []
-        const correctGroups = result[i].Verenigingssporten.replace(/,/g, " -")
+    let correctGroups = null 
+    if (result[i].Verenigingssporten.includes(',')) correctGroups = result[i].Verenigingssporten.split(',')    
+    else correctGroups = [result[i].Verenigingssporten] 
+    
+    correctGroups.forEach(group => {
+      const x = group.split(' - ')
+
+      if (x[2] === 'Week') groups.push('Vrijdag') 
+      else if (x[2] === 'Zaterdag' && x[1] !== 'Wedstrijd') groups.push('Zaterdag')
+
+      groups.push(x[1])
+    })
 
-        console.log(correctGroups)
-        groups = correctGroups.split(' - ')
     if (groups[2] === 'Week') groups[2] = 'Vrijdag'
     
     groups = groups.filter((item) => item !== "Groep")
 
     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'] })
   }
-
   uploadLedenlijst()
 }