From 36fc09b48b21b171f8b06ccd5972a575448a6782 Mon Sep 17 00:00:00 2001 From: oesi Date: Tue, 8 Nov 2016 15:16:17 +0100 Subject: [PATCH] =?UTF-8?q?-=20GSProgrammCode=20auf=204=20Stellen=20aufgef?= =?UTF-8?q?=C3=BCllt=20-=20Outgoing=20werden=20in=20der=20Personenliste=20?= =?UTF-8?q?markiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vilesci/bis/studentenmeldung.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/vilesci/bis/studentenmeldung.php b/vilesci/bis/studentenmeldung.php index bc2ea4d24..33883a46d 100644 --- a/vilesci/bis/studentenmeldung.php +++ b/vilesci/bis/studentenmeldung.php @@ -909,7 +909,7 @@ function GenerateXMLStudentBlock($row) $gsblock.=" ".$rowgs->mobilitaetsprogramm_code." - ".$rowgs->programm_code." + ".sprintf('%04s',$rowgs->programm_code)." ".$studtyp." ".$rowgs->partner_code." ".$rowgs->ausbildungssemester." @@ -1060,6 +1060,7 @@ function GenerateXMLStudentBlock($row) $qryio="SELECT * FROM bis.tbl_bisio WHERE student_uid=".$db->db_add_param($row->student_uid)." AND (von>".$db->db_add_param($bisprevious)." OR bis IS NULL OR bis>".$db->db_add_param($bisprevious).") AND von<=".$db->db_add_param($bisdatum).";"; + $is_a_outgoing=false; if($resultio = $db->db_query($qryio)) { while($rowio = $db->db_fetch_object($resultio)) @@ -1090,6 +1091,7 @@ function GenerateXMLStudentBlock($row) $iosem[$storgform][$sem]=0; } $iosem[$storgform][$sem]++; + $is_a_outgoing=true; } else { @@ -1141,6 +1143,14 @@ function GenerateXMLStudentBlock($row) if(!in_array($storgform, $verwendete_orgformen)) $verwendete_orgformen[]=$storgform; + $status = ''; + if($gsstatus!='') + $status = $gsstatus; + else + $status = $aktstatus; + if($is_a_outgoing) + $status .= ' (Outgoing)'; + //Studentenliste $stlist.=" @@ -1148,7 +1158,7 @@ function GenerateXMLStudentBlock($row) ".trim($row->matrikelnr)." ".trim($row->nachname)." ".trim($row->vorname)." - ".($gsstatus!=''?$gsstatus:trim($aktstatus))." + ".$status." ".trim($sem)." ".trim($storgform)." ";