Compare commits

..

No commits in common. "5f1e9d07d9da3d8650b3d1d6e1d943f8580a56f9" and "eb410082616f438502a88d3bc87da40f096e69d4" have entirely different histories.

2 changed files with 7 additions and 22 deletions

View file

@ -6,9 +6,6 @@
<h2><strong>Export lidí</strong></h2>
<p>Vyberte pole, které chcete exportovat</p>
<!-- for loop zde neni pouzit proto, aby se mohlo napsat
data-value="email telefon mesto"
a zabalit tak vice parametru do jednoho checkboxu -->
<p>
<label>( Jméno: <input class="field-check" data-value="jmeno" type="checkbox" checked>)</label>
<label>( Příjmení: <input class="field-check" data-value="prijmeni" type="checkbox" checked>)</label>
@ -92,20 +89,14 @@ a zabalit tak vice parametru do jednoho checkboxu -->
download_button.addEventListener('click', (e) => {
// uzivatele vybrana pole
fields = Array.from(document.getElementsByClassName('field-check'))
const fields = Array.from(document.getElementsByClassName('field-check'))
.filter(e => e.checked)
.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)
.map(e => e.getAttribute('data-value'))
console.log(fields)
if (select_two.innerHTML == '') {
window.location.href = "/profil/exporty_lidi/get_csv_only_one_step/" + select_one.value + "?fields=" + params
window.location.href = "/profil/exporty_lidi/get_csv_only_one_step/" + select_one.value + "?fields=" + fields.join(',')
} else {
window.location.href = "/profil/exporty_lidi/get_csv/" + select_one.value + "/" + select_two.value + "?fields=" + params
window.location.href = "/profil/exporty_lidi/get_csv/" + select_one.value + "/" + select_two.value + "?fields=" + fields.join(',')
}
})
</script>

View file

@ -171,14 +171,8 @@ 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 getFieldsForExport(request):
if 'fields' not in request.GET or request.GET.get('fields') == '':
return ["jmeno", "prijmeni", "email", "telefon"]
fields = request.GET.get('fields').split(',')
return fields
def download_export_csv_only_first_step(request, type):
fields = getFieldsForExport(request)
fields = request.GET.get('fields').split(',')
if type == 3:
resitele = tvorba_utils.resitele_co_neodmaturovali()
resiteleOsoby = Osoba.objects.filter(resitel__in=resitele)
@ -187,7 +181,7 @@ def download_export_csv_only_first_step(request, type):
return response
def download_export_csv(request, type, id):
fields = getFieldsForExport(request)
fields = request.GET.get('fields').split(',')
if type == PrvniTypExportu.CISLA.value:
resitele = tvorba_utils.resi_cislo(Cislo.objects.get(id=id))
resiteleOsoby = Osoba.objects.filter(resitel__in=resitele)