From cd17190244750790238be72c3117e730881ed27e Mon Sep 17 00:00:00 2001 From: Manfred Kindl Date: Wed, 23 Jul 2014 08:15:36 +0000 Subject: [PATCH] Korrektur bei Spalte "1.S" und"3.S". Benutzer.aktiv entfernt --- content/statistik/bewerberstatistik.php | 50 ++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/content/statistik/bewerberstatistik.php b/content/statistik/bewerberstatistik.php index f500f3f0b..138b6a0a5 100644 --- a/content/statistik/bewerberstatistik.php +++ b/content/statistik/bewerberstatistik.php @@ -135,10 +135,10 @@ if(isset($_GET['excel'])) $worksheet->write(1,$i,"Aufgenommene bereinigt", $format_bold); $worksheet->mergeCells(1,$i,1,$i+2); $i=$i+3; - $worksheet->write(1,$i,"StudentIn 1S", $format_bold); + $worksheet->write(1,$i,"StudentIn 1.S", $format_bold); $worksheet->mergeCells(1,$i,1,$i+2); $i=$i+3; - $worksheet->write(1,$i,"StudentIn 3S", $format_bold); + $worksheet->write(1,$i,"StudentIn 3.S", $format_bold); $worksheet->mergeCells(1,$i,1,$i+2); //Überschriften 2.Zeile @@ -294,22 +294,22 @@ if(isset($_GET['excel'])) $qry.=") AS aufgenommenerber_w, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_student USING(prestudent_id) JOIN public.tbl_benutzer ON(uid=student_uid) - WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=1 AND tbl_benutzer.aktiv + WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=1 ) AS student1sem, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_person USING(person_id) JOIN public.tbl_student USING(prestudent_id) JOIN public.tbl_benutzer ON(uid=student_uid) - WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=1 AND geschlecht='m' AND tbl_benutzer.aktiv + WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=1 AND geschlecht='m' ) AS student1sem_m, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_person USING(person_id) JOIN public.tbl_student USING(prestudent_id) JOIN public.tbl_benutzer ON(uid=student_uid) - WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=1 AND geschlecht='w' AND tbl_benutzer.aktiv + WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=1 AND geschlecht='w' ) AS student1sem_w, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_student USING(prestudent_id) JOIN public.tbl_benutzer ON(uid=student_uid) - WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=3 AND tbl_benutzer.aktiv + WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=3 ) AS student3sem, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_person USING(person_id) JOIN public.tbl_student USING(prestudent_id) JOIN public.tbl_benutzer ON(uid=student_uid) - WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=3 AND geschlecht='m' AND tbl_benutzer.aktiv + WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=3 AND geschlecht='m' ) AS student3sem_m, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_person USING(person_id) JOIN public.tbl_student USING(prestudent_id) JOIN public.tbl_benutzer ON(student_uid=uid) - WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=3 AND geschlecht='w' AND tbl_benutzer.aktiv + WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=3 AND geschlecht='w' ) AS student3sem_w FROM @@ -720,10 +720,10 @@ if(isset($_GET['excel'])) $worksheet->write($zeile,$i,"Aufgenommene bereinigt", $format_bold); $worksheet->mergeCells($zeile,$i,$zeile,$i+3); $i=$i+4; - $worksheet->write($zeile,$i,"StudentIn 1S", $format_bold); + $worksheet->write($zeile,$i,"StudentIn 1.S", $format_bold); $worksheet->mergeCells($zeile,$i,$zeile,$i+3); $i=$i+4; - $worksheet->write($zeile,$i,"StudentIn 3S", $format_bold); + $worksheet->write($zeile,$i,"StudentIn 3.S", $format_bold); $worksheet->mergeCells($zeile,$i,$zeile,$i+3); //Überschriften 2.Zeile @@ -1336,10 +1336,10 @@ if(isset($_GET['excel'])) $worksheet2->write(1,$i,"Aufgenommene bereinigt", $format_bold); $worksheet2->mergeCells(1,$i,1,$i+2); $i=$i+3; - $worksheet2->write(1,$i,"StudentIn 1S", $format_bold); + $worksheet2->write(1,$i,"StudentIn 1.S", $format_bold); $worksheet2->mergeCells(1,$i,1,$i+2); $i=$i+3; - $worksheet2->write(1,$i,"StudentIn 3S", $format_bold); + $worksheet2->write(1,$i,"StudentIn 3.S", $format_bold); $worksheet2->mergeCells(1,$i,1,$i+2); //Überschriften 2.Zeile @@ -1922,22 +1922,22 @@ else $qry.=") AS aufgenommenerber_w, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_student USING(prestudent_id) JOIN public.tbl_benutzer ON(uid=student_uid) - WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=1 AND tbl_benutzer.aktiv + WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=1 ) AS student1sem, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_person USING(person_id) JOIN public.tbl_student USING(prestudent_id) JOIN public.tbl_benutzer ON(uid=student_uid) - WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=1 AND geschlecht='m' AND tbl_benutzer.aktiv + WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=1 AND geschlecht='m' ) AS student1sem_m, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_person USING(person_id) JOIN public.tbl_student USING(prestudent_id) JOIN public.tbl_benutzer ON(uid=student_uid) - WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=1 AND geschlecht='w' AND tbl_benutzer.aktiv + WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=1 AND geschlecht='w' ) AS student1sem_w, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_student USING(prestudent_id) JOIN public.tbl_benutzer ON(uid=student_uid) - WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=3 AND tbl_benutzer.aktiv + WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=3 ) AS student3sem, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_person USING(person_id) JOIN public.tbl_student USING(prestudent_id) JOIN public.tbl_benutzer ON(uid=student_uid) - WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=3 AND geschlecht='m' AND tbl_benutzer.aktiv + WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=3 AND geschlecht='m' ) AS student3sem_m, (SELECT count(*) FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id) JOIN public.tbl_person USING(person_id) JOIN public.tbl_student USING(prestudent_id) JOIN public.tbl_benutzer ON(student_uid=uid) - WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=3 AND geschlecht='w' AND tbl_benutzer.aktiv + WHERE tbl_prestudent.studiengang_kz=stg.studiengang_kz AND status_kurzbz='Student' AND studiensemester_kurzbz='$stsem' AND ausbildungssemester=3 AND geschlecht='w' ) AS student3sem_w FROM @@ -1958,8 +1958,8 @@ else BewerberIn (m/w) Aufgenommene (m/w) Aufgenommene bereinigt (m/w) - StudentIn 1S (m/w) - StudentIn 3S (m/w) + StudentIn 1.S (m/w) + StudentIn 3.S (m/w) @@ -2215,11 +2215,11 @@ else InteressentInnen VZ / BB / DL / DDP InteressentInnen mit ZGV VZ / BB / DL / DDP InteressentInnen mit RT Anmeldung VZ / BB / DL / DDP - BewerberInnen 1S VZ / BB / DL / DDP + BewerberInnen 1.S VZ / BB / DL / DDP Aufgenommene VZ / BB / DL / DDP Aufgenommene bereinigt VZ / BB / DL / DDP - StudentIn 1S VZ / BB / DL / DDP - StudentIn 3S VZ / BB / DL / DDP + StudentIn 1.S VZ / BB / DL / DDP + StudentIn 3.S VZ / BB / DL / DDP @@ -2528,8 +2528,8 @@ else BewerberIn (m/w) Aufgenommene (m/w) Aufgenommene bereinigt(m/w) - StudentIn 1S (m/w) - StudentIn 3S (m/w) + StudentIn 1.S (m/w) + StudentIn 3.S (m/w)