From 3ff9ce208a0b67144cbd7bb25f3d135ac97df26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Tue, 10 Apr 2018 12:45:10 +0200 Subject: [PATCH] =?UTF-8?q?Anzahl=20der=20Interessenten=20mit=20RT=20Anmel?= =?UTF-8?q?dung=20korrigiert=20in=20der=20R=C3=BCckschau=20f=C3=BCr=20das?= =?UTF-8?q?=20vorherige=20Semester?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/statistik/bewerberstatistik.php | 37 +++++++++++++++++++++---- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/content/statistik/bewerberstatistik.php b/content/statistik/bewerberstatistik.php index 99afa7d9b..252a565e5 100644 --- a/content/statistik/bewerberstatistik.php +++ b/content/statistik/bewerberstatistik.php @@ -824,7 +824,12 @@ if (isset($_GET['excel'])) 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 anmeldungreihungstest<=".$db->db_add_param($datum)." + AND ( + anmeldedatum<=".$db->db_add_param($datum)." + OR + (anmeldedatum is null + AND tbl_rt_person.insertamum<=".$db->db_add_param($datum).") + ) ) ) AS interessentenrtanmeldung, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_person USING(person_id) @@ -841,7 +846,11 @@ if (isset($_GET['excel'])) 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 anmeldungreihungstest<=".$db->db_add_param($datum)." + AND (anmeldedatum<=".$db->db_add_param($datum)." + OR + (anmeldedatum is null + AND tbl_rt_person.insertamum<=".$db->db_add_param($datum).") + ) ) ) AS interessentenrtanmeldung_m, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_person USING(person_id) @@ -858,7 +867,11 @@ if (isset($_GET['excel'])) 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 anmeldungreihungstest<=".$db->db_add_param($datum)." + AND (anmeldedatum<=".$db->db_add_param($datum)." + OR + (anmeldedatum is null + AND tbl_rt_person.insertamum<=".$db->db_add_param($datum).") + ) ) ) AS interessentenrtanmeldung_w, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) @@ -1908,7 +1921,11 @@ else 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 anmeldungreihungstest<=".$db->db_add_param($datum)." + AND (anmeldedatum<=".$db->db_add_param($datum)." + OR + (anmeldedatum is null + AND tbl_rt_person.insertamum<=".$db->db_add_param($datum).") + ) ) ) AS interessentenrtanmeldung, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_person USING(person_id) @@ -1925,7 +1942,11 @@ else 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 anmeldungreihungstest<=".$db->db_add_param($datum)." + AND (anmeldedatum<=".$db->db_add_param($datum)." + OR + (anmeldedatum is null + AND tbl_rt_person.insertamum<=".$db->db_add_param($datum).") + ) ) ) AS interessentenrtanmeldung_m, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_person USING(person_id) @@ -1942,7 +1963,11 @@ else 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 anmeldungreihungstest<=".$db->db_add_param($datum)." + AND (anmeldedatum<=".$db->db_add_param($datum)." + OR + (anmeldedatum is null + AND tbl_rt_person.insertamum<=".$db->db_add_param($datum).") + ) ) ) AS interessentenrtanmeldung_w,