From 95d89678556ead2dc46aa3d86d02dc59abff670a Mon Sep 17 00:00:00 2001
From: Robert Hofer <robert.hofer@technikum-wien.at>
Date: Tue, 24 Mar 2015 18:07:43 +0100
Subject: [PATCH] nation attribute for ZGV

---
 content/student/studentdetailoverlay.xul.php | 1246 +++++++++---------
 content/student/studentoverlay.js.php        |   10 +
 include/prestudent.class.php                 |   58 +-
 locale/de-AT/bewerbung.php                   |    2 +-
 rdf/prestudent.rdf.php                       |   10 +-
 rdf/student.rdf.php                          |    2 +
 system/checksystem.php                       |   13 +
 7 files changed, 709 insertions(+), 632 deletions(-)

diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index 318861910..ee879e4af 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -1,608 +1,638 @@
-<?php
-/* Copyright (C) 2006 fhcomplete.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
- *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
- *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
- */
-
-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("Pragma: no-cache");
-header("Content-type: application/vnd.mozilla.xul+xml");
-require_once('../../config/vilesci.config.inc.php');
-require_once('../../include/variable.class.php');
-require_once('../../include/functions.inc.php');
-$user=get_uid();
-$variable = new variable();
-if(!$variable->loadVariables($user))
-{
-	die('Fehler beim Laden der Variablen:'.$variable->errormsg);
-}
-echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
-?>
-<!DOCTYPE overlay [
-	<?php require('../../locale/'.$variable->variable->locale.'/fas.dtd'); ?>
-]>
-<overlay id="StudentDetailOverlay"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	>
-<!-- Student DETAILS -->
-<vbox id="student-detail" style="overflow:auto;margin:0px;" flex="1">
-		<vbox hidden="true">
-			<label value="Neu"/>
-			<checkbox id="student-detail-checkbox-new" checked="true" />      	
-			<label value="Person_id"/>
-      		<textbox id="student-detail-textbox-person_id" disabled="true"/>					
-		</vbox>
-		<vbox flex="1">
-		<groupbox id="student-detail-groupbox-person">
-			<caption label="Person" />
-			<grid id="student-detail-grid-person" style="margin:4px;" flex="1">
-				  	<columns  >
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>
-  					</columns>
-  					<rows>
-    					<row>
-      						<label value="Anrede" control="student-detail-textbox-anrede"/>
-      						<hbox><textbox id="student-detail-textbox-anrede" disabled="true" maxlength="16" size="16"/></hbox>
-      						<label value="TitelPre" control="student-detail-textbox-titelpre"/>
-      						<textbox id="student-detail-textbox-titelpre" disabled="true" maxlength="64"/>
-      						<label value="TitelPost" control="student-detail-textbox-titelpost"/>
-      						<textbox id="student-detail-textbox-titelpost" disabled="true" maxlength="32"/>
-    					</row>
-    					<row>
-    						<label value="Nachname" control="student-detail-textbox-nachname"/>
-      						<textbox id="student-detail-textbox-nachname" disabled="true" maxlength="64"/>
-      						<label value="Vorname" control="student-detail-textbox-vorname"/>
-      						<textbox id="student-detail-textbox-vorname" disabled="true" maxlength="32"/>
-      						<label value="Vornamen" control="student-detail-textbox-vornamen"/>
-      						<textbox id="student-detail-textbox-vornamen" disabled="true" maxlength="128"/>
-    					</row>
-    					<row>
-      						<label value="Geburtsdatum" control="student-detail-textbox-geburtsdatum"/>
-      						<hbox>
-      							<box class="Datum" id="student-detail-textbox-geburtsdatum" disabled="true"/>
-      							<!--<textbox id="student-detail-textbox-geburtsdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>-->
-      						</hbox>
-      						<label value="Geburtsort" control="student-detail-textbox-geburtsort"/>
-      						<textbox id="student-detail-textbox-geburtsort" disabled="true" maxlength="128"/>
-      						<label value="Geburtsnation" control="student-detail-menulist-geburtsnation"/>
-							<menulist id="student-detail-menulist-geburtsnation" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/nation/liste" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
-							        		      label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-      						
-    					</row>
-    					<row>
-      						<label value="SVNR" control="student-detail-textbox-svnr"/>
-      						<hbox><textbox id="student-detail-textbox-svnr" disabled="true" maxlength="10" size="10"/></hbox>
-      						<label value="Ersatzkennzeichen" control="student-detail-textbox-ersatzkennzeichen"/>
-      						<hbox><textbox id="student-detail-textbox-ersatzkennzeichen" disabled="true" maxlength="10" size="15"/></hbox>
-      						<label value="Geburtszeit" control="student-detail-textbox-geburtszeit" hidden="true"/>
-      						<hbox><textbox id="student-detail-textbox-geburtszeit" disabled="true" maxlength="5" size="5" tooltiptext="Format: hh:mm Beispiel: 10:30" hidden="true"/></hbox>
-    					</row>
-    					<row>
-							<label value="Staatsbuergerschaft" control="student-detail-menulist-staatsbuergerschaft"/>
-							<menulist id="student-detail-menulist-staatsbuergerschaft" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/nation/liste" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
-							        		      label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-							<label value="Matrikelnummer" control="student-detail-textbox-matr_nr"/>
-      						<hbox><textbox id="student-detail-textbox-matr_nr" disabled="true" maxlength="32" size="15"/></hbox>
-							<label value="Sprache" control="student-detail-menulist-sprache" />
-							<menulist id="student-detail-menulist-sprache" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/sprache.rdf.php" flex="1"
-						              ref="http://www.technikum-wien.at/sprachen/liste" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/sprachen/rdf#bezeichnung"
-							        		      label="rdf:http://www.technikum-wien.at/sprachen/rdf#bezeichnung"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-						</row>
-    					<row>
-      						<label value="Geschlecht" control="student-detail-menulist-geschlecht"/>
-      						<menulist id="student-detail-menulist-geschlecht" disabled="true">
-								<menupopup>
-										<menuitem value="m" label="maennlich"/>
-										<menuitem value="w" label="weiblich"/>
-										<menuitem value="u" label="unbekannt"/>
-								</menupopup>								
-							</menulist>
-							<label value="Familienstand" control="student-detail-menulist-familienstand"/>
-      						<menulist id="student-detail-menulist-familienstand" disabled="true">
-								<menupopup>
-										<menuitem value="" label="--keine Auswahl--"/>
-										<menuitem value="g" label="geschieden"/>
-										<menuitem value="l" label="ledig"/>
-										<menuitem value="v" label="verheiratet"/>
-										<menuitem value="w" label="verwitwet"/>
-								</menupopup>								
-							</menulist>
-							<label value="Anzahl der Kinder" control="student-detail-textbox-anzahlderkinder" hidden="true"/>
-      						<textbox id="student-detail-textbox-anzahlderkinder" disabled="true" maxlength="2" hidden="true"/>
-    					</row>
-    					<row>
-      						<vbox>
-      							<label value="Foto" />
-      							<hbox>
-      								<button id="student-detail-button-image-upload" label="Upload" oncommand="StudentImageUpload();" disabled="true"/>
-      								<button id="student-detail-button-image-delete" label="Delete" oncommand="StudentImageDelete();" disabled="true"/>
-      								<spacer flex="1" />
-      							</hbox>
-								<button id="student-detail-button-image-infomail" label="Infomail" oncommand="StudentImageInfomail();" disabled="true"/>      							
-      						</vbox>
-   							<hbox>
-   								<image src='' id="student-detail-image" style="margin-left:5px; width:90px; height:120px"/> <!--height="60" width="60"-->
-   								<spacer flex="1"/>
-   							</hbox>
-      						<label value="Anmerkung" control="student-detail-textbox-anmerkung"/>
-      						<textbox id="student-detail-textbox-anmerkung" disabled="true" multiline="true"/>
-      						<label value="Homepage" control="student-detail-textbox-homepage"/>
-      						<vbox><textbox id="student-detail-textbox-homepage" disabled="true" maxlength="256"/></vbox>
-    					</row>
-				</rows>
-			</grid>
-			</groupbox>
-			
-			<vbox flex="1" >
-				<groupbox id="student-detail-groupbox-student">
-				<caption label="Student" />
-				<grid id="student-detail-grid-student" style="margin:4px;">
-					  	<columns >
-	    					<column flex="1"/>
-	    					<column flex="5"/>
-	    					<column flex="1"/>
-	    					<column flex="5"/>
-	    					<column flex="1"/>
-	    					<column flex="5"/>
-	  					</columns>
-	  					<rows>
-	    					<row>
-	    						<label value="UID" control="student-detail-textbox-uid"/>
-	      						<hbox><textbox id="student-detail-textbox-uid" readonly="true" maxlength="16" size="16"/></hbox>
-	    						<hbox><label id="student-detail-label-matrikelnummer" value="Personenkennzeichen" control="student-detail-textbox-matrikelnummer"/></hbox>
-	      						<hbox><textbox id="student-detail-textbox-matrikelnummer" readonly="true" maxlength="15" size="15"/></hbox>
-	      						<!--<label value="Studiengang" control="student-detail-textbox-studiengang_kz"/>-->
-	      						<textbox id="student-detail-menulist-studiengang_kz" disabled="true" hidden="true" />
-	      						<!--
-	      						<menulist id="student-detail-menulist-studiengang_kz" disabled="true"
-								          datasources="<?php echo APP_ROOT ?>rdf/studiengang.rdf.php" flex="1"
-							              ref="http://www.technikum-wien.at/studiengang/liste" >
-									<template>
-										<menupopup>
-											<menuitem value="rdf:http://www.technikum-wien.at/studiengang/rdf#studiengang_kz"
-								        		      label="rdf:http://www.technikum-wien.at/studiengang/rdf#kuerzel - rdf:http://www.technikum-wien.at/studiengang/rdf#bezeichnung"
-											  		  uri="rdf:*"/>
-											</menupopup>
-									</template>
-								</menulist>-->
-	      						<label value="Aktiv" control="student-detail-checkbox-aktiv"/>
-      							<checkbox id="student-detail-checkbox-aktiv" checked="true" disabled="true"/>
-	    					</row>
-	    					<row>
-		    					<label value="Semester" control="student-detail-textbox-semester"/>
-	      						<hbox><textbox id="student-detail-textbox-semester" disabled="true" maxlength="2" size="1"/></hbox>
-	      						<label value="Verband" control="student-detail-textbox-verband"/>
-	      						<hbox><textbox id="student-detail-textbox-verband" disabled="true" maxlength="1" size="1"/></hbox>
-	      						<label value="Gruppe" control="student-detail-textbox-gruppe"/>
-	      						<hbox><textbox id="student-detail-textbox-gruppe" disabled="true" maxlength="1" size="1"/></hbox>
-	    					</row>
-	    					<row>
-	    						<label value="Alias" control="student-detail-textbox-alias" />
-	    						<textbox id="student-detail-textbox-alias" disabled="true" maxlength="256" />
-	    					</row>
-	    				</rows>
-	    		</grid>
-	    		</groupbox>
-	    		
-    			<hbox>
-    				<spacer flex="1" />
-    				<button id="student-detail-button-save" label="Speichern" oncommand="StudentDetailSave();" disabled="true"/>
-    			</hbox>
-    			
-    		</vbox>
-    		
-		</vbox>
-</vbox>
-
-<!-- STUDENT PREStudent -->
-<vbox id="student-prestudent" style="overflow:auto; margin:0px;" flex="1">
-<popupset>
-	<menupopup id="student-prestudent-rolle-tree-popup">
-		<menuitem label="Bearbeiten" oncommand="StudentRolleBearbeiten();" id="student-prestudent-rolle-tree-popup-edit" hidden="false"/>
-		<menuitem label="Status bestaetigen" oncommand="StudentPrestudentRolleBestaetigen();" id="student-prestudent-rolle-tree-popup-approve" hidden="false"/>		
-		<menuitem label="Neuen Status hinzufuegen" oncommand="StudentRolleAdd();" id="student-prestudent-rolle-tree-popup-add" hidden="false"/>
-		<menuitem label="Entfernen" oncommand="StudentPrestudentRolleDelete();" id="student-prestudent-rolle-tree-popup-delete" hidden="false"/>		
-		<menuitem label="Status vorrücken" oncommand="StudentPrestudentRolleVorruecken();" id="student-prestudent-rolle-tree-popup-move_forward" hidden="false"/>		
-	</menupopup>
-</popupset>
-		<vbox hidden="true">
-			<label value="Neu"/>
-			<checkbox id="student-prestudent-checkbox-new" checked="false" />      	
-			<label value="Person_id"/>
-      		<textbox id="student-prestudent-textbox-person_id" disabled="true"/>
-      		<label value="Prestudent_id"/>
-      		<textbox id="student-prestudent-textbox-prestudent_id" disabled="true"/>
-      		<label value="studiengang_kz"/>
-      		<textbox id="student-prestudent-textbox-studiengang_kz" disabled="true"/>
-		</vbox>
-		
-   			<groupbox id="student-detail-groupbox-zgv">
-			<caption id="student-detail-groupbox-caption" label="Zugangsvoraussetzung" />
-				<grid id="student-prestudent-grid-zgv" style="margin:4px;" flex="1">
-				  	<columns  >
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>    					
-  					</columns>
-  					<rows>
-    					<row>
-      						<label value="ZGV" control="student-prestudent-menulist-zgvcode"/>
-      						<menulist id="student-prestudent-menulist-zgvcode" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/zgv.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/zgv/alle" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/zgv/rdf#code"
-							        		      label="rdf:http://www.technikum-wien.at/zgv/rdf#kurzbz"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-							<label value="ZGV Ort" control="student-prestudent-textbox-zgvort"/>
-      						<textbox id="student-prestudent-textbox-zgvort" disabled="true" maxlength="64"/>
-      						<label value="ZGV Datum" control="student-prestudent-textbox-zgvdatum"/>
-      						<hbox>
-      							<box class='Datum' id="student-prestudent-textbox-zgvdatum" disabled="true"/>
-      							<!--<textbox id="student-prestudent-textbox-zgvdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>-->
-      						</hbox>
-    					</row>
-    					<row>
-      						<label value="ZGV Master" control="student-prestudent-menulist-zgvmastercode"/>
-      						<menulist id="student-prestudent-menulist-zgvmastercode" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/zgvmaster.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/zgvmaster/alle" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/zgvmaster/rdf#code"
-							        		      label="rdf:http://www.technikum-wien.at/zgvmaster/rdf#kurzbz"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-							<label value="ZGV Master Ort" control="student-prestudent-textbox-zgvmasterort"/>
-      						<textbox id="student-prestudent-textbox-zgvmasterort" disabled="true" maxlength="64"/>
-      						<label value="ZGV Master Datum" control="student-prestudent-textbox-zgvmasterdatum"/>
-      						<hbox>
-      							<box class='Datum' id="student-prestudent-textbox-zgvmasterdatum" disabled="true"/>
-      							<!--<textbox id="student-prestudent-textbox-zgvmasterdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>-->
-      						</hbox>
-    					</row>
-    					<row>
-    						<spacer />
-    						<spacer />
-			    			<label value="Ausstellungsstaat" control="student-prestudent-menulist-ausstellungsstaat"/>
-			    			<menulist id="student-prestudent-menulist-ausstellungsstaat" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/nation/liste" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
-							        		      label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>		
-    					</row>
-    				</rows>
-    			</grid>
-    			
-    		</groupbox>
-    		<groupbox id="student-detail-groupbox-reihungstest">
-			<caption label="&tab-prestudent-aufnahme.label;" />
-				<grid id="student-prestudent-grid-reihungstest" style="margin:4px;" flex="1">
-				  	<columns  >
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>    					
-  					</columns>
-  					<rows>
-    					<row>
-    						<label value="&tab-prestudent-aufnahme.anmeldung;" control="student-prestudent-textbox-anmeldungreihungstest"/>
-      						<hbox>
-      							<box class="Datum" id="student-prestudent-textbox-anmeldungreihungstest" disabled="true"/>
-      							<!--<textbox id="student-prestudent-textbox-zgvmasterdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>-->
-      							<button id="student-prestudent-button-anmeldungreihungstest-heute" label="Heute" oncommand="StudentAnmeldungreihungstestHeute()" disabled="true" style="margin:0px;"/>
-      						</hbox>
-      						<label value="&tab-prestudent-aufnahme.seminar;" control="student-prestudent-menulist-reihungstest"/>
-      						<hbox>
-<!--								          datasources="<?php echo APP_ROOT ?>rdf/reihungstest.rdf.php?optional=true" flex="1"-->
-	      						<menulist id="student-prestudent-menulist-reihungstest" disabled="true"
-								          datasources="rdf:null" flex="1"
-							              ref="http://www.technikum-wien.at/reihungstest/alle" 
-							              oncommand="StudentReihungstestDropDownSelect()">
-									<template>
-										<menupopup>
-											<menuitem value="rdf:http://www.technikum-wien.at/reihungstest/rdf#reihungstest_id"
-								        		      label="rdf:http://www.technikum-wien.at/reihungstest/rdf#bezeichnung"
-											  		  uri="rdf:*"/>
-										</menupopup>
-									</template>
-								</menulist>
-							
-								<toolbarbutton id="student-prestudent-button-reihungstest-refresh" image="../skin/images/refresh.png" tooltiptext="Liste neu laden" onclick="StudentReihungstestDropDownRefresh()"/>
-								
-							</hbox>
-    					</row>
-    					<row>
-      						<label value="&tab-prestudent-aufnahme.absolviert;" control="student-prestudent-checkbox-reihungstestangetreten"/>
-      						<checkbox id="student-prestudent-checkbox-reihungstestangetreten" checked="true" disabled="true"/>
-      						<hbox>
-      							<label value="Punkte1" control="student-prestudent-textbox-punkte1" />
-      							<toolbarbutton id="student-prestudent-button-reihungstest-punktesync" image="../skin/images/transmit.png" tooltiptext="Reihungstest Ergebnis holen" onclick="StudentReihungstestPunkteTransmit()"/>
-      						</hbox>
-      						<hbox>
-      						<textbox id="student-prestudent-textbox-punkte1" disabled="true" maxlength="9" size="9" onchange="StudentReihungstestPunkteChange();" oninput="StudentReihungstestPunkteSum();"/>
-      						<label value="Punkte2" control="student-prestudent-textbox-punkte2"/>
-      						<textbox id="student-prestudent-textbox-punkte2" disabled="true" maxlength="9" size="9" onchange="StudentReihungstestPunkteChange();" oninput="StudentReihungstestPunkteSum();"/>
-							<?php
-							// Das Eingebefeld fuer die 3. Reihungstestpunkte wird nur angezeigt, 
-							// wenn im dies im Config aktiviert wurde
-							if(defined('RT_PUNKTE3') && RT_PUNKTE3=='true')
-								$hidden='';
-							else
-								$hidden='hidden="true"';
-
-	      					echo '
-								<label value="Punkte3" control="student-prestudent-textbox-punkte3" '.$hidden.'/>
-    	  						<textbox id="student-prestudent-textbox-punkte3" disabled="true" maxlength="9" size="9" onchange="StudentReihungstestPunkteChange();" oninput="StudentReihungstestPunkteSum();" '.$hidden.'/>
-								';							
-							?>
-   	  						<label value="Gesamtpunkte" control="student-prestudent-textbox-punkte"/>
-      						<textbox id="student-prestudent-textbox-punkte" disabled="true" maxlength="9" size="9" onchange="StudentReihungstestPunkteChange();"/>
-      						</hbox>
-    					</row>
-    				</rows>
-    			</grid>
-    		</groupbox>
-    		<groupbox id="student-detail-groupbox-prestudent">
-		<caption label="Prestudent" />
-		<grid id="student-prestudent-grid-prestudent" style="margin:4px;" flex="1">
-				  	<columns  >
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>
-    					<column flex="1"/>
-    					<column flex="5"/>    					
-  					</columns>
-  					<rows>
-  						<row>
-      						<label value="Aufmerksam durch" control="student-prestudent-menulist-aufmerksamdurch"/>
-      						<menulist id="student-prestudent-menulist-aufmerksamdurch" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/aufmerksamdurch.rdf.php" flex="1"
-						              ref="http://www.technikum-wien.at/aufmerksamdurch/alle">
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/aufmerksamdurch/rdf#aufmerksamdurch_kurzbz"
-							        		      label="rdf:http://www.technikum-wien.at/aufmerksamdurch/rdf#beschreibung"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-							<label value="Berufstaetigkeit" control="student-prestudent-menulist-berufstaetigkeit"/>
-      						<menulist id="student-prestudent-menulist-berufstaetigkeit" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/berufstaetigkeit.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/berufstaetigkeit/alle" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/berufstaetigkeit/rdf#code"
-							        		      label="rdf:http://www.technikum-wien.at/berufstaetigkeit/rdf#bezeichnung"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-							<label value="Ausbildung" control="student-prestudent-menulist-ausbildung"/>
-      						<menulist id="student-prestudent-menulist-ausbildung" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/ausbildung.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/ausbildung/alle" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/ausbildung/rdf#code"
-							        		      label="rdf:http://www.technikum-wien.at/ausbildung/rdf#bezeichnung"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-    					</row>
-    					<row>
-      						<label value="Aufnahmeschluessel" control="student-prestudent-menulist-aufnahmeschluessel" hidden="true"/>
-      						<menulist id="student-prestudent-menulist-aufnahmeschluessel" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/aufnahmeschluessel.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/aufnahmeschluessel/alle" hidden="true">
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/aufnahmeschluessel/rdf#aufnahmeschluessel"
-							        		      label="rdf:http://www.technikum-wien.at/aufnahmeschluessel/rdf#bezeichnung"
-										  		  uri="rdf:*" hidden="true"/>
-										</menupopup>
-								</template>
-							</menulist>
-							<label value="Studiengang" control="student-prestudent-menulist-studiengang_kz"/>
-							<menulist id="student-prestudent-menulist-studiengang_kz" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/studiengang.rdf.php" flex="1"
-						              ref="http://www.technikum-wien.at/studiengang/liste" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/studiengang/rdf#studiengang_kz"
-							        		      label="rdf:http://www.technikum-wien.at/studiengang/rdf#kuerzel - rdf:http://www.technikum-wien.at/studiengang/rdf#bezeichnung"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-							
-							<label value="Facheinschlaegig berufstaetig" control="student-prestudent-checkbox-facheinschlberuf" hidden="true"/>
-							<checkbox id="student-prestudent-checkbox-facheinschlberuf" checked="true" disabled="true" hidden="true"/>
-							
-    					</row>
-    				</rows>
-    			</grid>
-    			<grid style="margin:4px;" flex="1">
-				  	<columns  >
-    					<column flex="1"/>
-    					<column flex="12"/>
-    					<column flex="3"/>
-    					<column flex="3"/>
-  					</columns>
-  					<rows>
-  						<row>
-		    				<label value="Anmerkung" control="student-prestudent-textbox-anmerkung"/>
-		      				<textbox id="student-prestudent-textbox-anmerkung" disabled="true"/>
-		      				<hbox>
-		      					<label value="Bismelden" control="student-prestudent-checkbox-bismelden"/>
-		      					<checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
-		      				</hbox>
-		      				<hbox>
-		      					<label value="Dual" control="student-prestudent-checkbox-dual"/>
-		      					<checkbox id="student-prestudent-checkbox-dual" checked="false" disabled="true"/>
-		      				</hbox>
-						</row>
-						<row id="student-prestudent-row-mentor">
-						<label value="Mentor" control="student-prestudent-textbox-mentor"/>
-						<hbox><textbox id="student-prestudent-textbox-mentor" disabled="true" size="40" maxlength="256"/></hbox>
-						</row>
-					</rows>
-				</grid>      			
-    		</groupbox>
-    		<groupbox id="student-detail-groupbox-rollen">
-			<caption label="Status" />
-					<tree id="student-prestudent-tree-rolle" seltype="single" hidecolumnpicker="false" flex="1"
-							datasources="rdf:null" ref="http://www.technikum-wien.at/prestudentrolle/liste"
-							style="margin-left:10px;margin-right:10px;margin-bottom:5px;" height="200px" enableColumnDrag="true"
-							flags="dont-build-content"
-							context="student-prestudent-rolle-tree-popup"
-							ondblclick="StudentRolleBearbeiten()"
-					>
-						<treecols>
-							<treecol id="student-prestudent-tree-rolle-status_kurzbz" label="Kurzbz" flex="2" hidden="false" primary="true" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#status_kurzbz"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-studiensemester_kurzbz" label="StSem" flex="3" hidden="false" persist="hidden, width, ordinal"
-							   class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-ausbildungssemester" label="Semester" flex="1" hidden="false" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester" 
-                                sorthints="integer"/>
-							<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" />									
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-orgform_kurzbz" label="Organisationsform" flex="2" hidden="true" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#orgform_kurzbz" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-prestudent_id" label="PrestudentID" flex="2" hidden="true" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-studienplan_id" label="StudienplanID" flex="2" hidden="true" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-studienplan_bezeichnung" label="Studienplan" flex="2" hidden="true" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-anmerkung" label="Anmerkung" flex="2" hidden="false" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#anmerkung" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-bestaetigt_von" label="BestaetigtVon" flex="1" hidden="true" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_von" />
-							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-bestaetigt_am" label="BestaetigtAm" flex="1" hidden="false" persist="hidden, width, ordinal"
-								class="sortDirectionIndicator"
-								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_Am" />
-							<splitter class="tree-splitter"/>
-						</treecols>
-			
-						<template>
-							<rule>
-								<treechildren flex="1" >
-				   					<treeitem uri="rdf:*">
-										<treerow>
-											<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#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"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id"/>
-											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung"/>
-											<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"/>
-										</treerow>
-									</treeitem>
-								</treechildren>
-							</rule>
-						</template>
-					</tree>
-			</groupbox>
-			<hbox>
-				<spacer flex="1" />
-				<button id="student-prestudent-button-save" label="Speichern" oncommand="StudentPrestudentSave();" disabled="true"/>
-			</hbox>
-</vbox>
-
-</overlay>
+<?php
+/* Copyright (C) 2006 fhcomplete.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+
+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("Pragma: no-cache");
+header("Content-type: application/vnd.mozilla.xul+xml");
+require_once('../../config/vilesci.config.inc.php');
+require_once('../../include/variable.class.php');
+require_once('../../include/functions.inc.php');
+$user=get_uid();
+$variable = new variable();
+if(!$variable->loadVariables($user))
+{
+	die('Fehler beim Laden der Variablen:'.$variable->errormsg);
+}
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
+?>
+<!DOCTYPE overlay [
+	<?php require('../../locale/'.$variable->variable->locale.'/fas.dtd'); ?>
+]>
+<overlay id="StudentDetailOverlay"
+	xmlns:html="http://www.w3.org/1999/xhtml"
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	>
+<!-- Student DETAILS -->
+<vbox id="student-detail" style="overflow:auto;margin:0px;" flex="1">
+		<vbox hidden="true">
+			<label value="Neu"/>
+			<checkbox id="student-detail-checkbox-new" checked="true" />      	
+			<label value="Person_id"/>
+      		<textbox id="student-detail-textbox-person_id" disabled="true"/>					
+		</vbox>
+		<vbox flex="1">
+		<groupbox id="student-detail-groupbox-person">
+			<caption label="Person" />
+			<grid id="student-detail-grid-person" style="margin:4px;" flex="1">
+				  	<columns  >
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>
+  					</columns>
+  					<rows>
+    					<row>
+      						<label value="Anrede" control="student-detail-textbox-anrede"/>
+      						<hbox><textbox id="student-detail-textbox-anrede" disabled="true" maxlength="16" size="16"/></hbox>
+      						<label value="TitelPre" control="student-detail-textbox-titelpre"/>
+      						<textbox id="student-detail-textbox-titelpre" disabled="true" maxlength="64"/>
+      						<label value="TitelPost" control="student-detail-textbox-titelpost"/>
+      						<textbox id="student-detail-textbox-titelpost" disabled="true" maxlength="32"/>
+    					</row>
+    					<row>
+    						<label value="Nachname" control="student-detail-textbox-nachname"/>
+      						<textbox id="student-detail-textbox-nachname" disabled="true" maxlength="64"/>
+      						<label value="Vorname" control="student-detail-textbox-vorname"/>
+      						<textbox id="student-detail-textbox-vorname" disabled="true" maxlength="32"/>
+      						<label value="Vornamen" control="student-detail-textbox-vornamen"/>
+      						<textbox id="student-detail-textbox-vornamen" disabled="true" maxlength="128"/>
+    					</row>
+    					<row>
+      						<label value="Geburtsdatum" control="student-detail-textbox-geburtsdatum"/>
+      						<hbox>
+      							<box class="Datum" id="student-detail-textbox-geburtsdatum" disabled="true"/>
+      							<!--<textbox id="student-detail-textbox-geburtsdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>-->
+      						</hbox>
+      						<label value="Geburtsort" control="student-detail-textbox-geburtsort"/>
+      						<textbox id="student-detail-textbox-geburtsort" disabled="true" maxlength="128"/>
+      						<label value="Geburtsnation" control="student-detail-menulist-geburtsnation"/>
+							<menulist id="student-detail-menulist-geburtsnation" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
+						              ref="http://www.technikum-wien.at/nation/liste" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+							        		      label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+      						
+    					</row>
+    					<row>
+      						<label value="SVNR" control="student-detail-textbox-svnr"/>
+      						<hbox><textbox id="student-detail-textbox-svnr" disabled="true" maxlength="10" size="10"/></hbox>
+      						<label value="Ersatzkennzeichen" control="student-detail-textbox-ersatzkennzeichen"/>
+      						<hbox><textbox id="student-detail-textbox-ersatzkennzeichen" disabled="true" maxlength="10" size="15"/></hbox>
+      						<label value="Geburtszeit" control="student-detail-textbox-geburtszeit" hidden="true"/>
+      						<hbox><textbox id="student-detail-textbox-geburtszeit" disabled="true" maxlength="5" size="5" tooltiptext="Format: hh:mm Beispiel: 10:30" hidden="true"/></hbox>
+    					</row>
+    					<row>
+							<label value="Staatsbuergerschaft" control="student-detail-menulist-staatsbuergerschaft"/>
+							<menulist id="student-detail-menulist-staatsbuergerschaft" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
+						              ref="http://www.technikum-wien.at/nation/liste" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+							        		      label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+							<label value="Matrikelnummer" control="student-detail-textbox-matr_nr"/>
+      						<hbox><textbox id="student-detail-textbox-matr_nr" disabled="true" maxlength="32" size="15"/></hbox>
+							<label value="Sprache" control="student-detail-menulist-sprache" />
+							<menulist id="student-detail-menulist-sprache" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/sprache.rdf.php" flex="1"
+						              ref="http://www.technikum-wien.at/sprachen/liste" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/sprachen/rdf#bezeichnung"
+							        		      label="rdf:http://www.technikum-wien.at/sprachen/rdf#bezeichnung"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+						</row>
+    					<row>
+      						<label value="Geschlecht" control="student-detail-menulist-geschlecht"/>
+      						<menulist id="student-detail-menulist-geschlecht" disabled="true">
+								<menupopup>
+										<menuitem value="m" label="maennlich"/>
+										<menuitem value="w" label="weiblich"/>
+										<menuitem value="u" label="unbekannt"/>
+								</menupopup>								
+							</menulist>
+							<label value="Familienstand" control="student-detail-menulist-familienstand"/>
+      						<menulist id="student-detail-menulist-familienstand" disabled="true">
+								<menupopup>
+										<menuitem value="" label="--keine Auswahl--"/>
+										<menuitem value="g" label="geschieden"/>
+										<menuitem value="l" label="ledig"/>
+										<menuitem value="v" label="verheiratet"/>
+										<menuitem value="w" label="verwitwet"/>
+								</menupopup>								
+							</menulist>
+							<label value="Anzahl der Kinder" control="student-detail-textbox-anzahlderkinder" hidden="true"/>
+      						<textbox id="student-detail-textbox-anzahlderkinder" disabled="true" maxlength="2" hidden="true"/>
+    					</row>
+    					<row>
+      						<vbox>
+      							<label value="Foto" />
+      							<hbox>
+      								<button id="student-detail-button-image-upload" label="Upload" oncommand="StudentImageUpload();" disabled="true"/>
+      								<button id="student-detail-button-image-delete" label="Delete" oncommand="StudentImageDelete();" disabled="true"/>
+      								<spacer flex="1" />
+      							</hbox>
+								<button id="student-detail-button-image-infomail" label="Infomail" oncommand="StudentImageInfomail();" disabled="true"/>      							
+      						</vbox>
+   							<hbox>
+   								<image src='' id="student-detail-image" style="margin-left:5px; width:90px; height:120px"/> <!--height="60" width="60"-->
+   								<spacer flex="1"/>
+   							</hbox>
+      						<label value="Anmerkung" control="student-detail-textbox-anmerkung"/>
+      						<textbox id="student-detail-textbox-anmerkung" disabled="true" multiline="true"/>
+      						<label value="Homepage" control="student-detail-textbox-homepage"/>
+      						<vbox><textbox id="student-detail-textbox-homepage" disabled="true" maxlength="256"/></vbox>
+    					</row>
+				</rows>
+			</grid>
+			</groupbox>
+			
+			<vbox flex="1" >
+				<groupbox id="student-detail-groupbox-student">
+				<caption label="Student" />
+				<grid id="student-detail-grid-student" style="margin:4px;">
+					  	<columns >
+	    					<column flex="1"/>
+	    					<column flex="5"/>
+	    					<column flex="1"/>
+	    					<column flex="5"/>
+	    					<column flex="1"/>
+	    					<column flex="5"/>
+	  					</columns>
+	  					<rows>
+	    					<row>
+	    						<label value="UID" control="student-detail-textbox-uid"/>
+	      						<hbox><textbox id="student-detail-textbox-uid" readonly="true" maxlength="16" size="16"/></hbox>
+	    						<hbox><label id="student-detail-label-matrikelnummer" value="Personenkennzeichen" control="student-detail-textbox-matrikelnummer"/></hbox>
+	      						<hbox><textbox id="student-detail-textbox-matrikelnummer" readonly="true" maxlength="15" size="15"/></hbox>
+	      						<!--<label value="Studiengang" control="student-detail-textbox-studiengang_kz"/>-->
+	      						<textbox id="student-detail-menulist-studiengang_kz" disabled="true" hidden="true" />
+	      						<!--
+	      						<menulist id="student-detail-menulist-studiengang_kz" disabled="true"
+								          datasources="<?php echo APP_ROOT ?>rdf/studiengang.rdf.php" flex="1"
+							              ref="http://www.technikum-wien.at/studiengang/liste" >
+									<template>
+										<menupopup>
+											<menuitem value="rdf:http://www.technikum-wien.at/studiengang/rdf#studiengang_kz"
+								        		      label="rdf:http://www.technikum-wien.at/studiengang/rdf#kuerzel - rdf:http://www.technikum-wien.at/studiengang/rdf#bezeichnung"
+											  		  uri="rdf:*"/>
+											</menupopup>
+									</template>
+								</menulist>-->
+	      						<label value="Aktiv" control="student-detail-checkbox-aktiv"/>
+      							<checkbox id="student-detail-checkbox-aktiv" checked="true" disabled="true"/>
+	    					</row>
+	    					<row>
+		    					<label value="Semester" control="student-detail-textbox-semester"/>
+	      						<hbox><textbox id="student-detail-textbox-semester" disabled="true" maxlength="2" size="1"/></hbox>
+	      						<label value="Verband" control="student-detail-textbox-verband"/>
+	      						<hbox><textbox id="student-detail-textbox-verband" disabled="true" maxlength="1" size="1"/></hbox>
+	      						<label value="Gruppe" control="student-detail-textbox-gruppe"/>
+	      						<hbox><textbox id="student-detail-textbox-gruppe" disabled="true" maxlength="1" size="1"/></hbox>
+	    					</row>
+	    					<row>
+	    						<label value="Alias" control="student-detail-textbox-alias" />
+	    						<textbox id="student-detail-textbox-alias" disabled="true" maxlength="256" />
+	    					</row>
+	    				</rows>
+	    		</grid>
+	    		</groupbox>
+	    		
+    			<hbox>
+    				<spacer flex="1" />
+    				<button id="student-detail-button-save" label="Speichern" oncommand="StudentDetailSave();" disabled="true"/>
+    			</hbox>
+    			
+    		</vbox>
+    		
+		</vbox>
+</vbox>
+
+<!-- STUDENT PREStudent -->
+<vbox id="student-prestudent" style="overflow:auto; margin:0px;" flex="1">
+<popupset>
+	<menupopup id="student-prestudent-rolle-tree-popup">
+		<menuitem label="Bearbeiten" oncommand="StudentRolleBearbeiten();" id="student-prestudent-rolle-tree-popup-edit" hidden="false"/>
+		<menuitem label="Status bestaetigen" oncommand="StudentPrestudentRolleBestaetigen();" id="student-prestudent-rolle-tree-popup-approve" hidden="false"/>		
+		<menuitem label="Neuen Status hinzufuegen" oncommand="StudentRolleAdd();" id="student-prestudent-rolle-tree-popup-add" hidden="false"/>
+		<menuitem label="Entfernen" oncommand="StudentPrestudentRolleDelete();" id="student-prestudent-rolle-tree-popup-delete" hidden="false"/>		
+		<menuitem label="Status vorrücken" oncommand="StudentPrestudentRolleVorruecken();" id="student-prestudent-rolle-tree-popup-move_forward" hidden="false"/>		
+	</menupopup>
+</popupset>
+		<vbox hidden="true">
+			<label value="Neu"/>
+			<checkbox id="student-prestudent-checkbox-new" checked="false" />      	
+			<label value="Person_id"/>
+      		<textbox id="student-prestudent-textbox-person_id" disabled="true"/>
+      		<label value="Prestudent_id"/>
+      		<textbox id="student-prestudent-textbox-prestudent_id" disabled="true"/>
+      		<label value="studiengang_kz"/>
+      		<textbox id="student-prestudent-textbox-studiengang_kz" disabled="true"/>
+		</vbox>
+		
+   			<groupbox id="student-detail-groupbox-zgv">
+			<caption id="student-detail-groupbox-caption" label="Zugangsvoraussetzung" />
+				<grid id="student-prestudent-grid-zgv" style="margin:4px;" flex="1">
+				  	<columns  >
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>
+                        <column flex="1"/>
+                        <column flex="5"/>
+                    </columns>
+  					<rows>
+    					<row>
+      						<label value="ZGV" control="student-prestudent-menulist-zgvcode"/>
+      						<menulist id="student-prestudent-menulist-zgvcode" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/zgv.rdf.php?optional=true" flex="1"
+						              ref="http://www.technikum-wien.at/zgv/alle" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/zgv/rdf#code"
+							        		      label="rdf:http://www.technikum-wien.at/zgv/rdf#kurzbz"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+							<label value="ZGV Ort" control="student-prestudent-textbox-zgvort"/>
+      						<textbox id="student-prestudent-textbox-zgvort" disabled="true" maxlength="64"/>
+      						<label value="ZGV Datum" control="student-prestudent-textbox-zgvdatum"/>
+      						<hbox>
+      							<box class='Datum' id="student-prestudent-textbox-zgvdatum" disabled="true"/>
+      							<!--<textbox id="student-prestudent-textbox-zgvdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>-->
+      						</hbox>
+                            <label value="Land" control="student-prestudent-menulist-zgvnation"/>
+                            <hbox>
+                                <menulist id="student-prestudent-menulist-zgvnation" disabled="true"
+                                          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
+                                          ref="http://www.technikum-wien.at/nation/liste">
+                                    <template>
+                                        <menupopup>
+                                            <menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+                                                      label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+                                                      uri="rdf:*"/>
+                                        </menupopup>
+                                    </template>
+                                </menulist>
+                            </hbox>
+    					</row>
+    					<row>
+      						<label value="ZGV Master" control="student-prestudent-menulist-zgvmastercode"/>
+      						<menulist id="student-prestudent-menulist-zgvmastercode" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/zgvmaster.rdf.php?optional=true" flex="1"
+						              ref="http://www.technikum-wien.at/zgvmaster/alle" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/zgvmaster/rdf#code"
+							        		      label="rdf:http://www.technikum-wien.at/zgvmaster/rdf#kurzbz"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+							<label value="ZGV Master Ort" control="student-prestudent-textbox-zgvmasterort"/>
+      						<textbox id="student-prestudent-textbox-zgvmasterort" disabled="true" maxlength="64"/>
+      						<label value="ZGV Master Datum" control="student-prestudent-textbox-zgvmasterdatum"/>
+      						<hbox>
+      							<box class='Datum' id="student-prestudent-textbox-zgvmasterdatum" disabled="true"/>
+      							<!--<textbox id="student-prestudent-textbox-zgvmasterdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>-->
+      						</hbox>
+                            <label value="Land" control="student-prestudent-menulist-zgvmasternation"/>
+                            <hbox>
+                                <menulist id="student-prestudent-menulist-zgvmasternation" disabled="true"
+                                          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
+                                          ref="http://www.technikum-wien.at/nation/liste" >
+                                    <template>
+                                        <menupopup>
+                                            <menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+                                                      label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+                                                      uri="rdf:*"/>
+                                        </menupopup>
+                                    </template>
+                                </menulist>
+                            </hbox>
+                        </row>
+    					<row>
+    						<spacer />
+    						<spacer />
+			    			<label value="Ausstellungsstaat" control="student-prestudent-menulist-ausstellungsstaat"/>
+			    			<menulist id="student-prestudent-menulist-ausstellungsstaat" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
+						              ref="http://www.technikum-wien.at/nation/liste" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+							        		      label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>		
+    					</row>
+    				</rows>
+    			</grid>
+    			
+    		</groupbox>
+    		<groupbox id="student-detail-groupbox-reihungstest">
+			<caption label="&tab-prestudent-aufnahme.label;" />
+				<grid id="student-prestudent-grid-reihungstest" style="margin:4px;" flex="1">
+				  	<columns  >
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>    					
+  					</columns>
+  					<rows>
+    					<row>
+    						<label value="&tab-prestudent-aufnahme.anmeldung;" control="student-prestudent-textbox-anmeldungreihungstest"/>
+      						<hbox>
+      							<box class="Datum" id="student-prestudent-textbox-anmeldungreihungstest" disabled="true"/>
+      							<!--<textbox id="student-prestudent-textbox-zgvmasterdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>-->
+      							<button id="student-prestudent-button-anmeldungreihungstest-heute" label="Heute" oncommand="StudentAnmeldungreihungstestHeute()" disabled="true" style="margin:0px;"/>
+      						</hbox>
+      						<label value="&tab-prestudent-aufnahme.seminar;" control="student-prestudent-menulist-reihungstest"/>
+      						<hbox>
+<!--								          datasources="<?php echo APP_ROOT ?>rdf/reihungstest.rdf.php?optional=true" flex="1"-->
+	      						<menulist id="student-prestudent-menulist-reihungstest" disabled="true"
+								          datasources="rdf:null" flex="1"
+							              ref="http://www.technikum-wien.at/reihungstest/alle" 
+							              oncommand="StudentReihungstestDropDownSelect()">
+									<template>
+										<menupopup>
+											<menuitem value="rdf:http://www.technikum-wien.at/reihungstest/rdf#reihungstest_id"
+								        		      label="rdf:http://www.technikum-wien.at/reihungstest/rdf#bezeichnung"
+											  		  uri="rdf:*"/>
+										</menupopup>
+									</template>
+								</menulist>
+							
+								<toolbarbutton id="student-prestudent-button-reihungstest-refresh" image="../skin/images/refresh.png" tooltiptext="Liste neu laden" onclick="StudentReihungstestDropDownRefresh()"/>
+								
+							</hbox>
+    					</row>
+    					<row>
+      						<label value="&tab-prestudent-aufnahme.absolviert;" control="student-prestudent-checkbox-reihungstestangetreten"/>
+      						<checkbox id="student-prestudent-checkbox-reihungstestangetreten" checked="true" disabled="true"/>
+      						<hbox>
+      							<label value="Punkte1" control="student-prestudent-textbox-punkte1" />
+      							<toolbarbutton id="student-prestudent-button-reihungstest-punktesync" image="../skin/images/transmit.png" tooltiptext="Reihungstest Ergebnis holen" onclick="StudentReihungstestPunkteTransmit()"/>
+      						</hbox>
+      						<hbox>
+      						<textbox id="student-prestudent-textbox-punkte1" disabled="true" maxlength="9" size="9" onchange="StudentReihungstestPunkteChange();" oninput="StudentReihungstestPunkteSum();"/>
+      						<label value="Punkte2" control="student-prestudent-textbox-punkte2"/>
+      						<textbox id="student-prestudent-textbox-punkte2" disabled="true" maxlength="9" size="9" onchange="StudentReihungstestPunkteChange();" oninput="StudentReihungstestPunkteSum();"/>
+							<?php
+							// Das Eingebefeld fuer die 3. Reihungstestpunkte wird nur angezeigt, 
+							// wenn im dies im Config aktiviert wurde
+							if(defined('RT_PUNKTE3') && RT_PUNKTE3=='true')
+								$hidden='';
+							else
+								$hidden='hidden="true"';
+
+	      					echo '
+								<label value="Punkte3" control="student-prestudent-textbox-punkte3" '.$hidden.'/>
+    	  						<textbox id="student-prestudent-textbox-punkte3" disabled="true" maxlength="9" size="9" onchange="StudentReihungstestPunkteChange();" oninput="StudentReihungstestPunkteSum();" '.$hidden.'/>
+								';							
+							?>
+   	  						<label value="Gesamtpunkte" control="student-prestudent-textbox-punkte"/>
+      						<textbox id="student-prestudent-textbox-punkte" disabled="true" maxlength="9" size="9" onchange="StudentReihungstestPunkteChange();"/>
+      						</hbox>
+    					</row>
+    				</rows>
+    			</grid>
+    		</groupbox>
+    		<groupbox id="student-detail-groupbox-prestudent">
+		<caption label="Prestudent" />
+		<grid id="student-prestudent-grid-prestudent" style="margin:4px;" flex="1">
+				  	<columns  >
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>    					
+  					</columns>
+  					<rows>
+  						<row>
+      						<label value="Aufmerksam durch" control="student-prestudent-menulist-aufmerksamdurch"/>
+      						<menulist id="student-prestudent-menulist-aufmerksamdurch" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/aufmerksamdurch.rdf.php" flex="1"
+						              ref="http://www.technikum-wien.at/aufmerksamdurch/alle">
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/aufmerksamdurch/rdf#aufmerksamdurch_kurzbz"
+							        		      label="rdf:http://www.technikum-wien.at/aufmerksamdurch/rdf#beschreibung"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+							<label value="Berufstaetigkeit" control="student-prestudent-menulist-berufstaetigkeit"/>
+      						<menulist id="student-prestudent-menulist-berufstaetigkeit" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/berufstaetigkeit.rdf.php?optional=true" flex="1"
+						              ref="http://www.technikum-wien.at/berufstaetigkeit/alle" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/berufstaetigkeit/rdf#code"
+							        		      label="rdf:http://www.technikum-wien.at/berufstaetigkeit/rdf#bezeichnung"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+							<label value="Ausbildung" control="student-prestudent-menulist-ausbildung"/>
+      						<menulist id="student-prestudent-menulist-ausbildung" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/ausbildung.rdf.php?optional=true" flex="1"
+						              ref="http://www.technikum-wien.at/ausbildung/alle" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/ausbildung/rdf#code"
+							        		      label="rdf:http://www.technikum-wien.at/ausbildung/rdf#bezeichnung"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+    					</row>
+    					<row>
+      						<label value="Aufnahmeschluessel" control="student-prestudent-menulist-aufnahmeschluessel" hidden="true"/>
+      						<menulist id="student-prestudent-menulist-aufnahmeschluessel" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/aufnahmeschluessel.rdf.php?optional=true" flex="1"
+						              ref="http://www.technikum-wien.at/aufnahmeschluessel/alle" hidden="true">
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/aufnahmeschluessel/rdf#aufnahmeschluessel"
+							        		      label="rdf:http://www.technikum-wien.at/aufnahmeschluessel/rdf#bezeichnung"
+										  		  uri="rdf:*" hidden="true"/>
+										</menupopup>
+								</template>
+							</menulist>
+							<label value="Studiengang" control="student-prestudent-menulist-studiengang_kz"/>
+							<menulist id="student-prestudent-menulist-studiengang_kz" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/studiengang.rdf.php" flex="1"
+						              ref="http://www.technikum-wien.at/studiengang/liste" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/studiengang/rdf#studiengang_kz"
+							        		      label="rdf:http://www.technikum-wien.at/studiengang/rdf#kuerzel - rdf:http://www.technikum-wien.at/studiengang/rdf#bezeichnung"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+							
+							<label value="Facheinschlaegig berufstaetig" control="student-prestudent-checkbox-facheinschlberuf" hidden="true"/>
+							<checkbox id="student-prestudent-checkbox-facheinschlberuf" checked="true" disabled="true" hidden="true"/>
+							
+    					</row>
+    				</rows>
+    			</grid>
+    			<grid style="margin:4px;" flex="1">
+				  	<columns  >
+    					<column flex="1"/>
+    					<column flex="12"/>
+    					<column flex="3"/>
+    					<column flex="3"/>
+  					</columns>
+  					<rows>
+  						<row>
+		    				<label value="Anmerkung" control="student-prestudent-textbox-anmerkung"/>
+		      				<textbox id="student-prestudent-textbox-anmerkung" disabled="true"/>
+		      				<hbox>
+		      					<label value="Bismelden" control="student-prestudent-checkbox-bismelden"/>
+		      					<checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
+		      				</hbox>
+		      				<hbox>
+		      					<label value="Dual" control="student-prestudent-checkbox-dual"/>
+		      					<checkbox id="student-prestudent-checkbox-dual" checked="false" disabled="true"/>
+		      				</hbox>
+						</row>
+						<row id="student-prestudent-row-mentor">
+						<label value="Mentor" control="student-prestudent-textbox-mentor"/>
+						<hbox><textbox id="student-prestudent-textbox-mentor" disabled="true" size="40" maxlength="256"/></hbox>
+						</row>
+					</rows>
+				</grid>      			
+    		</groupbox>
+    		<groupbox id="student-detail-groupbox-rollen">
+			<caption label="Status" />
+					<tree id="student-prestudent-tree-rolle" seltype="single" hidecolumnpicker="false" flex="1"
+							datasources="rdf:null" ref="http://www.technikum-wien.at/prestudentrolle/liste"
+							style="margin-left:10px;margin-right:10px;margin-bottom:5px;" height="200px" enableColumnDrag="true"
+							flags="dont-build-content"
+							context="student-prestudent-rolle-tree-popup"
+							ondblclick="StudentRolleBearbeiten()"
+					>
+						<treecols>
+							<treecol id="student-prestudent-tree-rolle-status_kurzbz" label="Kurzbz" flex="2" hidden="false" primary="true" persist="hidden, width, ordinal"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#status_kurzbz"/>
+							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-studiensemester_kurzbz" label="StSem" flex="3" hidden="false" persist="hidden, width, ordinal"
+							   class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
+							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-ausbildungssemester" label="Semester" flex="1" hidden="false" persist="hidden, width, ordinal"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester" 
+                                sorthints="integer"/>
+							<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" />									
+							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-orgform_kurzbz" label="Organisationsform" flex="2" hidden="true" persist="hidden, width, ordinal"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#orgform_kurzbz" />
+							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-prestudent_id" label="PrestudentID" flex="2" hidden="true" persist="hidden, width, ordinal"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id" />
+							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-studienplan_id" label="StudienplanID" flex="2" hidden="true" persist="hidden, width, ordinal"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id" />
+							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-studienplan_bezeichnung" label="Studienplan" flex="2" hidden="true" persist="hidden, width, ordinal"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung" />
+							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-anmerkung" label="Anmerkung" flex="2" hidden="false" persist="hidden, width, ordinal"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#anmerkung" />
+							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-bestaetigt_von" label="BestaetigtVon" flex="1" hidden="true" persist="hidden, width, ordinal"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_von" />
+							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-bestaetigt_am" label="BestaetigtAm" flex="1" hidden="false" persist="hidden, width, ordinal"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_Am" />
+							<splitter class="tree-splitter"/>
+						</treecols>
+			
+						<template>
+							<rule>
+								<treechildren flex="1" >
+				   					<treeitem uri="rdf:*">
+										<treerow>
+											<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#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"/>
+											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id"/>
+											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung"/>
+											<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"/>
+										</treerow>
+									</treeitem>
+								</treechildren>
+							</rule>
+						</template>
+					</tree>
+			</groupbox>
+			<hbox>
+				<spacer flex="1" />
+				<button id="student-prestudent-button-save" label="Speichern" oncommand="StudentPrestudentSave();" disabled="true"/>
+			</hbox>
+</vbox>
+
+</overlay>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 7d717759d..70b47b9e2 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -1023,9 +1023,11 @@ function StudentAuswahl()
 	ausbildungcode = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ausbildungcode" ));
 	zgv_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgv_code" ));
 	zgvort = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvort" ));
+	zgvnation = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvnation" ));
 	zgvdatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvdatum" ));
 	zgvmaster_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmas_code" ));
 	zgvmasterort = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmaort" ));
+	zgvmasternation = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmanation" ));
 	zgvmasterdatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmadatum" ));
 	ausstellungsstaat = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ausstellungsstaat" ));
 	aufnahmeschluessel = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#aufnahmeschluessel" ));
@@ -1047,9 +1049,11 @@ function StudentAuswahl()
 	document.getElementById('student-prestudent-menulist-ausbildung').value=ausbildungcode;
 	document.getElementById('student-prestudent-menulist-zgvcode').value=zgv_code;
 	document.getElementById('student-prestudent-textbox-zgvort').value=zgvort;
+	document.getElementById('student-prestudent-menulist-zgvnation').value=zgvnation;
 	document.getElementById('student-prestudent-textbox-zgvdatum').value=zgvdatum;
 	document.getElementById('student-prestudent-menulist-zgvmastercode').value=zgvmaster_code;
 	document.getElementById('student-prestudent-textbox-zgvmasterort').value=zgvmasterort;
+	document.getElementById('student-prestudent-menulist-zgvmasternation').value=zgvmasternation;
 	document.getElementById('student-prestudent-textbox-zgvmasterdatum').value=zgvmasterdatum;
 	document.getElementById('student-prestudent-menulist-ausstellungsstaat').value=ausstellungsstaat;
 	document.getElementById('student-prestudent-menulist-aufnahmeschluessel').value=aufnahmeschluessel;
@@ -1547,9 +1551,11 @@ function StudentPrestudentDisableFields(val)
 	document.getElementById('student-prestudent-menulist-ausbildung').disabled=val;
 	document.getElementById('student-prestudent-menulist-zgvcode').disabled=val;
 	document.getElementById('student-prestudent-textbox-zgvort').disabled=val;
+	document.getElementById('student-prestudent-menulist-zgvnation').disabled=val;
 	document.getElementById('student-prestudent-textbox-zgvdatum').disabled=val;
 	document.getElementById('student-prestudent-menulist-zgvmastercode').disabled=val;
 	document.getElementById('student-prestudent-textbox-zgvmasterort').disabled=val;
+	document.getElementById('student-prestudent-menulist-zgvmasternation').disabled=val;
 	document.getElementById('student-prestudent-textbox-zgvmasterdatum').disabled=val;
 	document.getElementById('student-prestudent-menulist-ausstellungsstaat').disabled=val;
 	document.getElementById('student-prestudent-menulist-aufnahmeschluessel').disabled=val;
@@ -1599,9 +1605,11 @@ function StudentPrestudentSave()
 	ausbildungcode = document.getElementById('student-prestudent-menulist-ausbildung').value;
 	zgv_code = document.getElementById('student-prestudent-menulist-zgvcode').value;
 	zgvort = document.getElementById('student-prestudent-textbox-zgvort').value;
+	zgvnation = document.getElementById('student-prestudent-menulist-zgvnation').value;
 	zgvdatum = document.getElementById('student-prestudent-textbox-zgvdatum').value;
 	zgvmaster_code = document.getElementById('student-prestudent-menulist-zgvmastercode').value;
 	zgvmasterort = document.getElementById('student-prestudent-textbox-zgvmasterort').value;
+	zgvmasternation = document.getElementById('student-prestudent-menulist-zgvmasternation').value;
 	zgvmasterdatum = document.getElementById('student-prestudent-textbox-zgvmasterdatum').value;
 	ausstellungsstaat = document.getElementById('student-prestudent-menulist-ausstellungsstaat').value;
 	aufnahmeschluessel = document.getElementById('student-prestudent-menulist-aufnahmeschluessel').value;
@@ -1654,9 +1662,11 @@ function StudentPrestudentSave()
 	req.add('ausbildungcode', ausbildungcode);
 	req.add('zgv_code', zgv_code);
 	req.add('zgvort', zgvort);
+	req.add('zgvnation', zgvnation);
 	req.add('zgvdatum', ConvertDateToISO(zgvdatum));
 	req.add('zgvmas_code', zgvmaster_code);
 	req.add('zgvmaort', zgvmasterort);
+	req.add('zgvmanation', zgvmasternation);
 	req.add('zgvmadatum', ConvertDateToISO(zgvmasterdatum));
 	req.add('ausstellungsstaat', ausstellungsstaat);
 	req.add('aufnahmeschluessel', aufnahmeschluessel);
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 5596fdb7c..da4db9140 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -32,9 +32,11 @@ class prestudent extends person
 	public $zgv_code;
 	public $zgvort;
 	public $zgvdatum;
+	public $zgvnation;
 	public $zgvmas_code;
 	public $zgvmaort;
 	public $zgvmadatum;
+	public $zgvmanation;
 	public $ausstellungsstaat;
 	public $aufnahmeschluessel;
 	public $facheinschlberuf;
@@ -44,17 +46,18 @@ class prestudent extends person
 	public $punkte; //rt_gesamtpunkte
 	public $rt_punkte1;
 	public $rt_punkte2;
-	public $rt_punkte3=0;
-	public $bismelden=true;
+    public $rt_punkte3 = 0;
+    public $bismelden = true;
 	public $anmerkung;
 	public $anmerkung_status;
 	public $mentor;
 	public $ext_id_prestudent;
-	public $dual=false;
+    public $dual = false;
     public $zgvdoktor_code; 
     public $zgvdoktorort; 
     public $zgvdoktordatum; 
-    
+    public $zgvdoktornation;
+
 	public $status_kurzbz;
 	public $studiensemester_kurzbz;
 	public $ausbildungssemester;
@@ -68,13 +71,13 @@ class prestudent extends person
 	public $studienplan_bezeichnung;
 	public $bestaetigtam;
 	public $bestaetigtvon;
-	
-	public $studiensemester_old='';
-	public $ausbildungssemester_old='';
-	
-	// ErgebnisArray
-	public $result=array();
-	public $num_rows=0;
+
+    public $studiensemester_old = '';
+    public $ausbildungssemester_old = '';
+
+    // ErgebnisArray
+    public $result = array();
+    public $num_rows = 0;
 		
 	/**
 	 * Konstruktor - Uebergibt die Connection und laedt optional einen Prestudent
@@ -116,10 +119,12 @@ class prestudent extends person
 				$this->zgv_code = $row->zgv_code;
 				$this->zgvort = $row->zgvort;
 				$this->zgvdatum = $row->zgvdatum;
+				$this->zgvnation = $row->zgvnation;
 				$this->zgvmas_code = $row->zgvmas_code;
 				$this->zgvmaort = $row->zgvmaort;
-				$this->zgvmadatum = $row->zgvmadatum;
-				$this->aufnahmeschluessel = $row->aufnahmeschluessel;
+                $this->zgvmadatum = $row->zgvmadatum;
+                $this->zgvmanation = $row->zgvmanation;
+                $this->aufnahmeschluessel = $row->aufnahmeschluessel;
 				$this->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
 				$this->anmeldungreihungstest = $row->anmeldungreihungstest;
 				$this->reihungstestangetreten = $this->db_parse_bool($row->reihungstestangetreten);
@@ -136,10 +141,11 @@ class prestudent extends person
 				$this->dual = $this->db_parse_bool($row->dual);
 				$this->ausstellungsstaat = $row->ausstellungsstaat;
                 $this->zgvdoktor_code = $row->zgvdoktor_code; 
-                $this->zgvdoktorort = $row->zgvdoktorort; 
-                $this->zgvdoktordatum = $row->zgvdoktordatum; 
-				
-				if(!person::load($row->person_id))
+                $this->zgvdoktorort = $row->zgvdoktorort;
+                $this->zgvdoktordatum = $row->zgvdoktordatum;
+                $this->zgvdoktornation = $row->zgvdoktornation;
+
+                if(!person::load($row->person_id))
 					return false;
 				else 
 					return true;
@@ -207,8 +213,8 @@ class prestudent extends person
 		if($this->new) //Wenn new true ist dann ein INSERT absetzen ansonsten ein UPDATE
 		{
 			$qry = 'BEGIN;INSERT INTO public.tbl_prestudent (aufmerksamdurch_kurzbz, person_id, 
-					studiengang_kz, berufstaetigkeit_code, ausbildungcode, zgv_code, zgvort, zgvdatum, 
-					zgvmas_code, zgvmaort, zgvmadatum, aufnahmeschluessel, facheinschlberuf, 
+					studiengang_kz, berufstaetigkeit_code, ausbildungcode, zgv_code, zgvort, zgvdatum, zgvnation,
+					zgvmas_code, zgvmaort, zgvmadatum, zgvmanation, aufnahmeschluessel, facheinschlberuf,
 					reihungstest_id, anmeldungreihungstest, reihungstestangetreten, rt_gesamtpunkte, 
 					rt_punkte1, rt_punkte2, rt_punkte3, bismelden, insertamum, insertvon, 
 					updateamum, updatevon, ext_id, anmerkung, dual, ausstellungsstaat, mentor) VALUES('.
@@ -220,9 +226,11 @@ class prestudent extends person
 			       $this->db_add_param($this->zgv_code).",".
 			       $this->db_add_param($this->zgvort).",".
 			       $this->db_add_param($this->zgvdatum).",".
+			       $this->db_add_param($this->zgvnation).",".
 			       $this->db_add_param($this->zgvmas_code).",".
 			       $this->db_add_param($this->zgvmaort).",".
 			       $this->db_add_param($this->zgvmadatum).",".
+                   $this->db_add_param($this->zgvmanation).",".
 			       $this->db_add_param($this->aufnahmeschluessel).",".
 			       $this->db_add_param($this->facheinschlberuf, FHC_BOOLEAN).",".
 			       $this->db_add_param($this->reihungstest_id).",".
@@ -254,9 +262,11 @@ class prestudent extends person
 			       ' zgv_code='.$this->db_add_param($this->zgv_code).",".
 			       ' zgvort='.$this->db_add_param($this->zgvort).",".
 			       ' zgvdatum='.$this->db_add_param($this->zgvdatum).",".
+			       ' zgvnation='.$this->db_add_param($this->zgvnation).",".
 			       ' zgvmas_code='.$this->db_add_param($this->zgvmas_code).",".
 			       ' zgvmaort='.$this->db_add_param($this->zgvmaort).",".
 			       ' zgvmadatum='.$this->db_add_param($this->zgvmadatum).",".
+			       ' zgvmanation='.$this->db_add_param($this->zgvmanation).",".
 			       ' aufnahmeschluessel='.$this->db_add_param($this->aufnahmeschluessel).",".
 			       ' facheinschlberuf='.$this->db_add_param($this->facheinschlberuf, FHC_BOOLEAN).",".
 			       ' reihungstest_id='.$this->db_add_param($this->reihungstest_id).",".
@@ -372,9 +382,11 @@ class prestudent extends person
 			$ps->zgv_code = $row->zgv_code;
 			$ps->zgvort = $row->zgvort;
 			$ps->zgvdatum = $row->zgvdatum;
+			$ps->zgvnation = $row->zgvnation;
 			$ps->zgvmas_code = $row->zgvmas_code;
 			$ps->zgvmaort = $row->zgvmaort;
 			$ps->zgvmadatum = $row->zgvmadatum;
+			$ps->zgvmanation = $row->zgvmanation;
 			$ps->aufnahmeschluessel = $row->aufnahmeschluessel;
 			$ps->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
 			$ps->anmeldungreihungstest = $row->anmeldungreihungstest;
@@ -631,9 +643,11 @@ class prestudent extends person
 				$ps->zgv_code = $row->zgv_code;
 				$ps->zgvort = $row->zgvort;
 				$ps->zgvdatum = $row->zgvdatum;
+				$ps->zgvnation = $row->zgvnation;
 				$ps->zgvmas_code = $row->zgvmas_code;
 				$ps->zgvmaort = $row->zgvmaort;
 				$ps->zgvmadatum = $row->zgvmadatum;
+				$ps->zgvmanation = $row->zgvmanation;
 				$ps->ausstellungsstaat = $row->ausstellungsstaat;
 				$ps->aufnahmeschluessel = $row->aufnahmeschluessel;
 				$ps->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
@@ -1046,9 +1060,11 @@ class prestudent extends person
 				$obj->zgv_code = $row->zgv_code;
 				$obj->zgvort = $row->zgvort;
 				$obj->zgvdatum = $row->zgvdatum;
+				$obj->zgvnation = $row->zgvnation;
 				$obj->zgvmas_code = $row->zgvmas_code;
 				$obj->zgvmaort = $row->zgvmaort;
 				$obj->zgvmadatum = $row->zgvmadatum;
+				$obj->zgvmanation = $row->zgvmanation;
 				$obj->aufnahmeschluessel = $row->aufnahmeschluessel;
 				$obj->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
 				$obj->anmeldungreihungstest = $row->anmeldungreihungstest;
@@ -1095,17 +1111,21 @@ class prestudent extends person
             'art',
             'ort',
             'datum',
+            'nation',
         );
         $db_attribute = array(
             'zgv_code',
             'zgvort',
             'zgvdatum',
+            'zgvnation',
             'zgvmas_code',
             'zgvmaort',
             'zgvmadatum',
+            'zgvmanation',
             'zgvdoktor_code',
             'zgvdoktorort',
             'zgvdoktordatum',
+            'zgvdoktornation',
         );
 
         foreach($this->result as $prestudent) {
diff --git a/locale/de-AT/bewerbung.php b/locale/de-AT/bewerbung.php
index 03d5f283d..254968ed0 100755
--- a/locale/de-AT/bewerbung.php
+++ b/locale/de-AT/bewerbung.php
@@ -12,7 +12,7 @@ $this->phrasen['bewerbung/mailtextHtml']='Bitte sehen Sie sich die Nachricht in
 $this->phrasen['bewerbung/mailtext']='Sehr geehrteR Herr/Frau %1$s %2$s.<br><br>
         Vielen Dank für Ihr Interesse an einem Studiengang der '.CAMPUS_NAME.'. <br> 
         Um sich für einen Studiengang zu bewerben verwenden Sie bitte folgenden Link und Zugangscode: <br><br>
-        <a href="'.APP_ROOT.'cis/public/registration.php">Link zur Bewerbung</a><br>
+        <a href="'.APP_ROOT.'addons/bewerbung/cis/registration.php">Link zur Bewerbung</a><br>
         Zugangscode: %3$s <br><br>
         Mit freundlichen Grüßen, <br>
         '.CAMPUS_NAME;
diff --git a/rdf/prestudent.rdf.php b/rdf/prestudent.rdf.php
index e59561644..7fc3ae7a3 100644
--- a/rdf/prestudent.rdf.php
+++ b/rdf/prestudent.rdf.php
@@ -66,12 +66,14 @@ if(isset($_GET['prestudent_id']) && is_numeric($_GET['prestudent_id']))
 				<PRESTD:zgv_code><![CDATA[<?php echo $prestd->zgv_code;  ?>]]></PRESTD:zgv_code>
 				<PRESTD:zgvort><![CDATA[<?php echo $prestd->zgvort;  ?>]]></PRESTD:zgvort>
 				<PRESTD:zgvdatum_iso><![CDATA[<?php echo $prestd->zgvdatum;  ?>]]></PRESTD:zgvdatum_iso>
-				<PRESTD:zgvdatum><![CDATA[<?php echo $datum->convertISODate($prestd->zgvdatum);  ?>]]></PRESTD:zgvdatum>
-				<PRESTD:zgvmas_code><![CDATA[<?php echo $prestd->zgvmas_code;  ?>]]></PRESTD:zgvmas_code>
+                <PRESTD:zgvdatum><![CDATA[<?php echo $datum->convertISODate($prestd->zgvdatum);  ?>]]></PRESTD:zgvdatum>
+                <PRESTD:zgvnation><![CDATA[<?php echo $prestd->zgvnation;  ?>]]></PRESTD:zgvnation>
+                <PRESTD:zgvmas_code><![CDATA[<?php echo $prestd->zgvmas_code;  ?>]]></PRESTD:zgvmas_code>
 				<PRESTD:zgvmaort><![CDATA[<?php echo $prestd->zgvmaort;  ?>]]></PRESTD:zgvmaort>
 				<PRESTD:zgvmadatum_iso><![CDATA[<?php echo $prestd->zgvmadatum;  ?>]]></PRESTD:zgvmadatum_iso>
-				<PRESTD:zgvmadatum><![CDATA[<?php echo $datum->convertISODate($prestd->zgvmadatum);  ?>]]></PRESTD:zgvmadatum>
-				<PRESTD:aufnahmeschluessel><![CDATA[<?php echo $prestd->aufnahmeschluessel;  ?>]]></PRESTD:aufnahmeschluessel>
+                <PRESTD:zgvmadatum><![CDATA[<?php echo $datum->convertISODate($prestd->zgvmadatum);  ?>]]></PRESTD:zgvmadatum>
+                <PRESTD:zgvmanation><![CDATA[<?php echo $prestd->zgvmanation;  ?>]]></PRESTD:zgvmanation>
+                <PRESTD:aufnahmeschluessel><![CDATA[<?php echo $prestd->aufnahmeschluessel;  ?>]]></PRESTD:aufnahmeschluessel>
 				<PRESTD:facheinschlberuf><![CDATA[<?php echo ($prestd->facheinschlberuf?'true':'false');  ?>]]></PRESTD:facheinschlberuf>
 				<PRESTD:reihungstest_id><![CDATA[<?php echo $prestd->reihungstest_id;  ?>]]></PRESTD:reihungstest_id>
 				<PRESTD:anmeldungreihungstest_iso><![CDATA[<?php echo $prestd->anmeldungreihungstest;  ?>]]></PRESTD:anmeldungreihungstest_iso>
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 85e2da333..d3a963488 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -294,10 +294,12 @@ function draw_prestudent($row)
 			<STUDENT:zgvort><![CDATA['.$row->zgvort.']]></STUDENT:zgvort>
 			<STUDENT:zgvdatum><![CDATA['.$datum_obj->convertISODate($row->zgvdatum).']]></STUDENT:zgvdatum>
 			<STUDENT:zgvdatum_iso><![CDATA['.$row->zgvdatum.']]></STUDENT:zgvdatum_iso>
+			<STUDENT:zgvnation><![CDATA['.$row->zgvnation.']]></STUDENT:zgvnation>
 			<STUDENT:zgvmas_code><![CDATA['.$row->zgvmas_code.']]></STUDENT:zgvmas_code>
 			<STUDENT:zgvmaort><![CDATA['.$row->zgvmaort.']]></STUDENT:zgvmaort>
 			<STUDENT:zgvmadatum><![CDATA['.$datum_obj->convertISODate($row->zgvmadatum).']]></STUDENT:zgvmadatum>
 			<STUDENT:zgvmadatum_iso><![CDATA['.$row->zgvmadatum.']]></STUDENT:zgvmadatum_iso>
+			<STUDENT:zgvmanation><![CDATA['.$row->zgvmanation.']]></STUDENT:zgvmanation>
 			<STUDENT:ausstellungsstaat><![CDATA['.$row->ausstellungsstaat.']]></STUDENT:ausstellungsstaat>
 			<STUDENT:aufnahmeschluessel><![CDATA['.$row->aufnahmeschluessel.']]></STUDENT:aufnahmeschluessel>
 			<STUDENT:facheinschlberuf><![CDATA['.($row->facheinschlberuf?'true':'false').']]></STUDENT:facheinschlberuf>
diff --git a/system/checksystem.php b/system/checksystem.php
index 2f27b9e28..32617e700 100644
--- a/system/checksystem.php
+++ b/system/checksystem.php
@@ -2620,6 +2620,19 @@ if(!$result = @$db->db_query("SELECT pflicht FROM public.tbl_dokumentstudiengang
 		echo 'public.tbl_dokumentstudiengang: Spalte "pflicht" hinzugefuegt!<br>';
 }
 
+// Spalten zgvnation, zgvmanation, zgvdoktornation in public.tbl_prestudent
+if(!$result = @$db->db_query("SELECT pflicht FROM public.tbl_prestudent LIMIT 1"))
+{
+	$qry = "ALTER TABLE public.tbl_prestudent ADD COLUMN zgvnation character varying(3);
+            ALTER TABLE public.tbl_prestudent ADD COLUMN zgvmanation character varying(3) ;
+            ALTER TABLE public.tbl_prestudent ADD COLUMN zgvdoktornation character varying(3);";
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_prestudent '.$db->db_last_error().'</strong><br>';
+	else
+		echo 'public.tbl_prestudent: Spalten "zgvnation", "zgvmanation", "zgvdoktornation" hinzugefuegt!<br>';
+}
+
 // Anrechnungen
 if(!$result = @$db->db_query("SELECT 1 FROM lehre.tbl_anrechnung LIMIT 1;"))
 {