From faf368de46c79b4b1f9b741808d43d27c93e38d4 Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Thu, 23 Feb 2017 18:49:48 +0100
Subject: [PATCH] Statusgrund wird im Statustree als Spalte angezeigt

---
 content/student/studentdetailoverlay.xul.php |  5 +++++
 rdf/prestudentrolle.rdf.php                  | 11 +++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index c1fc6cbf1..32bce8b56 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -514,6 +514,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 								class="sortDirectionIndicator"
 								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_Am" />
 							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-statusgrund" label="Statusgrund" flex="1" hidden="false" persist="hidden, width, ordinal"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#statusgrund" />
+							<splitter class="tree-splitter"/>
 						</treecols>
 
 						<template>
@@ -532,6 +536,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#anmerkung"/>
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_von"/>
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_am"/>
+											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#statusgrund"/>
 										</treerow>
 									</treeitem>
 								</treechildren>
diff --git a/rdf/prestudentrolle.rdf.php b/rdf/prestudentrolle.rdf.php
index 2dd5b512b..0a3ba87af 100644
--- a/rdf/prestudentrolle.rdf.php
+++ b/rdf/prestudentrolle.rdf.php
@@ -22,7 +22,7 @@
 // header für no cache
 header("Cache-Control: no-cache");
 header("Cache-Control: post-check=0, pre-check=0",false);
-header("Expires Mon, 26 Jul 1997 05:00:00 GMT");
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
 header("Pragma: no-cache");
 // content type setzen
 header("Content-type: application/xhtml+xml");
@@ -33,6 +33,7 @@ require_once('../config/vilesci.config.inc.php');
 require_once('../include/person.class.php');
 require_once('../include/prestudent.class.php');
 require_once('../include/datum.class.php');
+require_once('../include/statusgrund.class.php');
 
 $rdf_url='http://www.technikum-wien.at/prestudentrolle';
 $datum = new datum();
@@ -43,7 +44,6 @@ echo '
 	xmlns:ROLLE="'.$rdf_url.'/rdf#"
 >
 
-
   <RDF:Seq about="'.$rdf_url.'/liste">
 ';
 
@@ -70,6 +70,12 @@ else
 $ps = new prestudent();
 $ps->getPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, 'datum desc, insertamum desc', $ausbildungssemester);
 
+$statusgrund = new statusgrund();
+$statusgrund->getAll();
+$statusgrund_arr = array();
+foreach($statusgrund->result as $row)
+	$statusgrund_arr[$row->statusgrund_id]=$row->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE];
+
 foreach($ps->result as $row)
 {
 
@@ -90,6 +96,7 @@ foreach($ps->result as $row)
         	<ROLLE:anmerkung><![CDATA['.$row->anmerkung_status.']]></ROLLE:anmerkung>
 			<ROLLE:rt_stufe><![CDATA['.$row->rt_stufe.']]></ROLLE:rt_stufe>
 			<ROLLE:statusgrund_id><![CDATA['.$row->statusgrund_id.']]></ROLLE:statusgrund_id>
+			<ROLLE:statusgrund><![CDATA['.(isset($statusgrund_arr[$row->statusgrund_id])?$statusgrund_arr[$row->statusgrund_id]:'').']]></ROLLE:statusgrund>
       	</RDF:Description>
       </RDF:li>
 	';