From 521e05b7586cad1b67a9e8bb88c1cff4a2361767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 17 Mar 2008 08:12:47 +0000
Subject: [PATCH]

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

diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index 799b4c607..a24857d99 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -229,6 +229,10 @@ else
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#orgform" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
+	    				<treecol id="student-treecol-aufmerksamdurch" label="Aufmerksamdurch" flex="1" hidden="true" persist="hidden, width, ordinal"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#orgform" onclick="StudentTreeSort()"/>
+	    				<splitter class="tree-splitter"/>
 					</treecols>
 
 					<template>
@@ -259,6 +263,7 @@ else
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#anmerkungen" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#anmerkungpre" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#orgform" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#aufmerksamdurch_kurzbz" />
 	         						</treerow>
 	       						</treeitem>
 	      					</treechildren>
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 4593f3bf1..10224d2f4 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -132,8 +132,8 @@ function draw_content_liste($row)
 	global $rdf_url, $datum_obj, $conn, $stg_arr;
 	$status='';
 
-	$mail_privat = '';
-	/*$qry_mail = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id='$row->person_id' AND zustellung=true ORDER BY kontakt_id DESC LIMIT 1";
+	/*$mail_privat = '';
+	$qry_mail = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id='$row->person_id' AND zustellung=true ORDER BY kontakt_id DESC LIMIT 1";
 	if($result_mail = pg_query($conn, $qry_mail))
 	{
 		if($row_mail = pg_fetch_object($result_mail))
@@ -174,6 +174,7 @@ function draw_content_liste($row)
     		<STUDENT:studiengang_kz><![CDATA['.$row->studiengang_kz.']]></STUDENT:studiengang_kz>
 			<STUDENT:studiengang><![CDATA['.$stg_arr[$row->studiengang_kz].']]></STUDENT:studiengang>
 			<STUDENT:orgform><![CDATA['.$orgform.']]></STUDENT:orgform>
+			<STUDENT:aufmerksamdurch_kurzbz><![CDATA['.$row->aufmerksamdurch_kurzbz.']]></STUDENT:aufmerksamdurch_kurzbz>
       	</RDF:Description>
       </RDF:li>';
 }
@@ -184,14 +185,14 @@ function draw_content($row)
 	$status='';
 
 	$mail_privat = '';
-	/*$qry_mail = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id='$row->person_id' AND zustellung=true ORDER BY kontakt_id DESC LIMIT 1";
+	$qry_mail = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id='$row->person_id' AND zustellung=true ORDER BY kontakt_id DESC LIMIT 1";
 	if($result_mail = pg_query($conn, $qry_mail))
 	{
 		if($row_mail = pg_fetch_object($result_mail))
 		{
 			$mail_privat = $row_mail->kontakt;
 		}
-	}*/
+	}
 
 	if($row->prestudent_id!='')
 	{
@@ -367,7 +368,7 @@ if($xmlformat=='rdf')
 					SELECT p.person_id, tbl_student.prestudent_id, tbl_benutzer.uid, titelpre, titelpost,	vorname, vornamen,
 						nachname, gebdatum, tbl_prestudent.anmerkung,ersatzkennzeichen,svnr, tbl_student.matrikelnr, p.anmerkung as anmerkungen,
 						tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
-						tbl_studentlehrverband.studiengang_kz,
+						tbl_studentlehrverband.studiengang_kz, aufmerksamdurch_kurzbz, 
 						(	SELECT kontakt
 							FROM public.tbl_kontakt
 							WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung