diff --git a/personalni/templates/personalni/profil/export_lidi.html b/personalni/templates/personalni/profil/export_lidi.html index 3b0d7896..2a269f3e 100644 --- a/personalni/templates/personalni/profil/export_lidi.html +++ b/personalni/templates/personalni/profil/export_lidi.html @@ -6,6 +6,9 @@

Export lidí

Vyberte pole, které chcete exportovat

+

@@ -89,14 +92,20 @@ download_button.addEventListener('click', (e) => { // uzivatele vybrana pole - const fields = Array.from(document.getElementsByClassName('field-check')) + fields = Array.from(document.getElementsByClassName('field-check')) .filter(e => e.checked) - .map(e => e.getAttribute('data-value')) - console.log(fields) + .map(e => e.getAttribute('data-value')); + params = "" + for (let val of fields) { + for(let s of val.split(' ')) { + params += s + "," + } + } + params = params.slice(0, -1) if (select_two.innerHTML == '') { - window.location.href = "/profil/exporty_lidi/get_csv_only_one_step/" + select_one.value + "?fields=" + fields.join(',') + window.location.href = "/profil/exporty_lidi/get_csv_only_one_step/" + select_one.value + "?fields=" + params } else { - window.location.href = "/profil/exporty_lidi/get_csv/" + select_one.value + "/" + select_two.value + "?fields=" + fields.join(',') + window.location.href = "/profil/exporty_lidi/get_csv/" + select_one.value + "/" + select_two.value + "?fields=" + params } }) diff --git a/personalni/views.py b/personalni/views.py index a302e5d2..da98e365 100644 --- a/personalni/views.py +++ b/personalni/views.py @@ -171,8 +171,14 @@ def get_export_options(request, type): data = [{"id": s.id, "display": str(s)} for s in Soustredeni.objects.all()] return HttpResponse(json.dumps(data), content_type='application/json') -def download_export_csv_only_first_step(request, type): +def getFieldsForExport(request): fields = request.GET.get('fields').split(',') + if fields == ['']: + return ["jmeno", "prijmeni", "email", "telefon"] + return fields + +def download_export_csv_only_first_step(request, type): + fields = getFieldsForExport(request) if type == 3: resitele = tvorba_utils.resitele_co_neodmaturovali() resiteleOsoby = Osoba.objects.filter(resitel__in=resitele) @@ -181,7 +187,7 @@ def download_export_csv_only_first_step(request, type): return response def download_export_csv(request, type, id): - fields = request.GET.get('fields').split(',') + fields = getFieldsForExport(request) if type == PrvniTypExportu.CISLA.value: resitele = tvorba_utils.resi_cislo(Cislo.objects.get(id=id)) resiteleOsoby = Osoba.objects.filter(resitel__in=resitele)