From 9de2f61da5b6a90f5daf79fe8bbf3ece80fdfd49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Tue, 1 Mar 2011 09:31:40 +0000 Subject: [PATCH] Incoming/Outgoing Zusammenfassung im FAS als eigener Verband --- rdf/lehrverbandsgruppe.rdf.php | 49 ++++++++++++++++++++++++++++++++++ rdf/student.rdf.php | 25 +++++++++++++++-- 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/rdf/lehrverbandsgruppe.rdf.php b/rdf/lehrverbandsgruppe.rdf.php index db8d89972..f1613df3c 100644 --- a/rdf/lehrverbandsgruppe.rdf.php +++ b/rdf/lehrverbandsgruppe.rdf.php @@ -34,6 +34,7 @@ $berechtigt_studiengang=array(); $uid=''; $berechtigung=new benutzerberechtigung(); $dbo = new basis_db(); +$show_inout_block=false; // Berechtigungen ermitteln if(!isset($_SERVER['REMOTE_USER'])) @@ -52,6 +53,8 @@ else $uid=get_uid(); $berechtigung->getBerechtigungen($uid); $berechtigt_studiengang=$berechtigung->getStgKz('admin'); + if($berechtigung->isBerechtigt('inout/uebersicht')) + $show_inout_block=true; } $orgform_sequence=array(); @@ -596,6 +599,39 @@ while ($row=$dbo->db_fetch_object()) + International + IO + + + + Incoming + + + + + + + incoming + + + Outgoing + + + + + + + outgoing + + '; +} + draw_orgformpart($stg_kz); ?> @@ -711,6 +747,19 @@ draw_orgformpart($stg_kz); //Studiengang echo "\t\t\n\t\n"; } + + //Incoming/Outgoing + if($show_inout_block) + { + echo ' + + + + + + '; + } + ?> diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php index 4fae83735..344fa231a 100644 --- a/rdf/student.rdf.php +++ b/rdf/student.rdf.php @@ -416,9 +416,30 @@ if($xmlformat=='rdf') } } } - elseif($typ=='incoming') + elseif($typ=='incoming' || $typ=='outgoing') { - $qry = "SELECT prestudent_id FROM public.tbl_prestudentstatus WHERE status_kurzbz='Incoming' AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'"; + if($studiensemester_kurzbz=='') + $studiensemester_kurzbz=$semester_aktuell; + if($typ=='incoming') + { + $qry = "SELECT prestudent_id FROM public.tbl_prestudentstatus WHERE status_kurzbz='Incoming' AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'"; + } + else + { + $stsem_obj = new studiensemester(); + $stsem_obj->load($studiensemester_kurzbz); + $qry = "SELECT prestudent_id + FROM + bis.tbl_bisio JOIN public.tbl_student USING(student_uid) + WHERE + ( + (tbl_bisio.von>='".$stsem_obj->start."' AND tbl_bisio.von<='".$stsem_obj->ende."') + OR + (tbl_bisio.bis>='".$stsem_obj->start."' AND tbl_bisio.bis<='".$stsem_obj->ende."') + ) + AND NOT EXISTS(SELECT 1 FROM public.tbl_prestudentstatus WHERE status_kurzbz='Incoming' AND prestudent_id=tbl_student.prestudent_id) + "; + } if($db->db_query($qry)) { while($row = $db->db_fetch_object())