From 3a95c4f22fe6d4cf7ab6015df4e0dd653aebcdb0 Mon Sep 17 00:00:00 2001
From: Unknown <kindlm@technikum-wien.at>
Date: Wed, 30 Oct 2019 22:19:11 +0100
Subject: [PATCH] Lehrverband in PreStudentstatus

---
 content/student/studentdetailoverlay.xul.php | 13 ++++++++++++
 rdf/prestudentrolle.rdf.php                  | 21 ++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index be31a147c..2b1acc5bd 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -515,6 +515,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"
 								sorthints="integer"/>
 							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-lehrverband" label="Lehrverband" flex="1" hidden="false" persist="hidden, width, ordinal"
+									 class="sortDirectionIndicator"
+									 sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#lehrverband" />
+							<splitter class="tree-splitter"/>
 							<treecol id="student-prestudent-tree-rolle-datum" label="Datum" flex="2" hidden="false" persist="hidden, width, ordinal"
 								class="sortDirectionIndicator"
 								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum" />
@@ -555,6 +559,14 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 								class="sortDirectionIndicator"
 								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#statusgrund" />
 							<splitter class="tree-splitter"/>
+							<!--<treecol id="student-prestudent-tree-rolle-slv_verband" label="Verband" flex="1" hidden="false" persist="hidden, width, ordinal"
+									 class="sortDirectionIndicator"
+									 sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#slv_verband" />
+							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-slv_gruppe" label="Gruppe" flex="1" hidden="false" persist="hidden, width, ordinal"
+									 class="sortDirectionIndicator"
+									 sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#slv_gruppe" />
+							<splitter class="tree-splitter"/>-->
 						</treecols>
 
 						<template>
@@ -565,6 +577,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#status_kurzbz"/>
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"/>
+											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#lehrverband"/>
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum"/>
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#orgform_kurzbz"/>
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id"/>
diff --git a/rdf/prestudentrolle.rdf.php b/rdf/prestudentrolle.rdf.php
index 764970557..f60b93050 100644
--- a/rdf/prestudentrolle.rdf.php
+++ b/rdf/prestudentrolle.rdf.php
@@ -34,6 +34,7 @@ require_once('../include/person.class.php');
 require_once('../include/prestudent.class.php');
 require_once('../include/datum.class.php');
 require_once('../include/statusgrund.class.php');
+require_once('../include/student.class.php');
 
 $rdf_url='http://www.technikum-wien.at/prestudentrolle';
 $datum = new datum();
@@ -76,8 +77,27 @@ $statusgrund_arr = array();
 foreach($statusgrund->result as $row)
 	$statusgrund_arr[$row->statusgrund_id]=$row->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE];
 
+$studentlehrverband = new student();
+$uid = $studentlehrverband->getUid($prestudent_id);
+
 foreach($ps->result as $row)
 {
+	$lehrverband = '-';
+	if ($row->status_kurzbz == 'Student'
+		|| $row->status_kurzbz == 'Diplomand'
+		|| $row->status_kurzbz == 'Abbrecher'
+		|| $row->status_kurzbz == 'Absolvent'
+		|| $row->status_kurzbz == 'Ausserodentlicher'
+		|| $row->status_kurzbz == 'Incoming'
+		|| $row->status_kurzbz == 'Outgoing'
+		|| $row->status_kurzbz == 'Unterbrecher')
+	{
+		if ($uid != '')
+		{
+			$studentlehrverband->load_studentlehrverband($uid, $row->studiensemester_kurzbz);
+			$lehrverband = $studentlehrverband->semester.$studentlehrverband->verband.$studentlehrverband->gruppe;
+		}
+	}
 
 	echo '
 	  <RDF:li>
@@ -98,6 +118,7 @@ foreach($ps->result as $row)
 			<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>
+			<ROLLE:lehrverband><![CDATA['.$lehrverband.']]></ROLLE:lehrverband>
       	</RDF:Description>
       </RDF:li>
 	';