From 17ef2f173b0aa9a381c8752a8b01b31ceb102d75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Thu, 6 Feb 2020 14:28:15 +0100 Subject: [PATCH] Fixed Error in Bewerberstatistik Excel Export --- content/statistik/bewerberstatistik.php | 30 +++++-------------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/content/statistik/bewerberstatistik.php b/content/statistik/bewerberstatistik.php index 766a7d143..932a8c6cb 100644 --- a/content/statistik/bewerberstatistik.php +++ b/content/statistik/bewerberstatistik.php @@ -288,13 +288,7 @@ if (isset($_GET['excel'])) WHERE person_id=tbl_prestudent.person_id AND tbl_reihungstest.studiensemester_kurzbz=tbl_prestudentstatus.studiensemester_kurzbz - AND ( - anmeldedatum<=".$db->db_add_param($datum)." - OR - (anmeldedatum is null - AND tbl_rt_person.insertamum<=".$db->db_add_param($datum).") - ) - /*AND tbl_studienordnung.studiengang_kz=tbl_prestudent.studiengang_kz*/ + AND tbl_studienordnung.studiengang_kz=tbl_prestudent.studiengang_kz ) ) AS interessentenrtanmeldung, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_person USING(person_id) @@ -310,13 +304,7 @@ if (isset($_GET['excel'])) WHERE person_id=tbl_prestudent.person_id AND tbl_reihungstest.studiensemester_kurzbz=tbl_prestudentstatus.studiensemester_kurzbz - AND ( - anmeldedatum<=".$db->db_add_param($datum)." - OR - (anmeldedatum is null - AND tbl_rt_person.insertamum<=".$db->db_add_param($datum).") - ) - /*AND tbl_studienordnung.studiengang_kz=tbl_prestudent.studiengang_kz*/ + AND tbl_studienordnung.studiengang_kz=tbl_prestudent.studiengang_kz ) ) AS interessentenrtanmeldung_m, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_person USING(person_id) @@ -332,13 +320,7 @@ if (isset($_GET['excel'])) WHERE person_id=tbl_prestudent.person_id AND tbl_reihungstest.studiensemester_kurzbz=tbl_prestudentstatus.studiensemester_kurzbz - AND ( - anmeldedatum<=".$db->db_add_param($datum)." - OR - (anmeldedatum is null - AND tbl_rt_person.insertamum<=".$db->db_add_param($datum).") - ) - /*AND tbl_studienordnung.studiengang_kz=tbl_prestudent.studiengang_kz*/ + AND tbl_studienordnung.studiengang_kz=tbl_prestudent.studiengang_kz ) ) AS interessentenrtanmeldung_w, @@ -841,7 +823,7 @@ if (isset($_GET['excel'])) WHERE person_id=tbl_prestudent.person_id AND tbl_reihungstest.studiensemester_kurzbz=tbl_prestudentstatus.studiensemester_kurzbz - /*AND tbl_studienordnung.studiengang_kz=tbl_prestudent.studiengang_kz*/ + AND tbl_studienordnung.studiengang_kz=tbl_prestudent.studiengang_kz AND ( anmeldedatum<=".$db->db_add_param($datum)." OR @@ -863,7 +845,7 @@ if (isset($_GET['excel'])) WHERE person_id=tbl_prestudent.person_id AND tbl_reihungstest.studiensemester_kurzbz=tbl_prestudentstatus.studiensemester_kurzbz - /*AND tbl_studienordnung.studiengang_kz=tbl_prestudent.studiengang_kz*/ + AND tbl_studienordnung.studiengang_kz=tbl_prestudent.studiengang_kz AND (anmeldedatum<=".$db->db_add_param($datum)." OR (anmeldedatum is null @@ -884,7 +866,7 @@ if (isset($_GET['excel'])) WHERE person_id=tbl_prestudent.person_id AND tbl_reihungstest.studiensemester_kurzbz=tbl_prestudentstatus.studiensemester_kurzbz - /*AND tbl_studienordnung.studiengang_kz=tbl_prestudent.studiengang_kz*/ + AND tbl_studienordnung.studiengang_kz=tbl_prestudent.studiengang_kz AND (anmeldedatum<=".$db->db_add_param($datum)." OR (anmeldedatum is null