diff --git a/cis/public/kollegium.html b/cis/public/kollegium.html
index a09aff0ff..8953b2592 100644
--- a/cis/public/kollegium.html
+++ b/cis/public/kollegium.html
@@ -52,16 +52,15 @@ Teschl Susanne<br>
 Lehner Martin<br>
 Sommer Thomas<br>
 Paminger Christian<br>
-Schweiger Sven<br>
 Hofmann Alexander<br>
 Neubauer Ulrike<br>
+Harald Wahl<br>
             <br>
             <br>
             <b>Ersatzmitglieder der Lehrenden</b> (werden in dieser
 Reihenfolge bei langfristigem Ausfall oder Ausscheidens eines
 Kollegiumsmitgliedes der Lehrenden ins Kollegium entsandt)<br>
             <br>
-Wahl Harald<br>
 Rössler Peter<br>
 Kittenberger Thomas<br>
 Höller Roland<br>
diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php
index ab43b5426..8bb26e0a5 100644
--- a/content/fasoverlay.js.php
+++ b/content/fasoverlay.js.php
@@ -7,6 +7,7 @@ var LvTreeDatasource;
 var LektorTreeDatasource;
 var LektorTreeOpenStudiengang;
 var StudentTreeDatasource;
+var InteressentTreeDatasource;
 
 // ****
 // * initialisiert den Lektor Tree
@@ -224,6 +225,35 @@ function onVerbandSelect(event)
 	{
 		debug(e);
 	}
+	
+	// Interessenten / Bewerber
+	try
+	{
+		url = "<?php echo APP_ROOT; ?>rdf/interessentenbewerber.rdf.php?"+"studiengang_kz="+stg_kz+"&semester="+sem+"&"+gettimestamp();
+		var treeInt=document.getElementById('interessent-tree');
+		
+		//Alte DS entfernen
+		var oldDatasources = treeInt.database.GetDataSources();
+		while(oldDatasources.hasMoreElements())
+		{
+			treeInt.database.RemoveDataSource(oldDatasources.getNext());
+		}
+
+		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+		InteressentTreeDatasource = rdfService.GetDataSource(url);
+		InteressentTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+		InteressentTreeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
+		treeInt.database.AddDataSource(InteressentTreeDatasource);
+		InteressentTreeDatasource.addXMLSinkObserver(InteressentTreeSinkObserver);
+		treeInt.builder.addListener(InteressentTreeListener);
+		InteressentDetailReset();
+		InteressentDetailDisableFields(true);
+		InteressentPrestudentDisableFields(true);
+	}
+	catch(e)
+	{
+		debug(e);
+	}
 
 	// Lehrveranstaltung
 	try
diff --git a/content/fasoverlay.xul.php b/content/fasoverlay.xul.php
index 540639247..f45c140d9 100644
--- a/content/fasoverlay.xul.php
+++ b/content/fasoverlay.xul.php
@@ -6,6 +6,7 @@ include('../vilesci/config.inc.php');
 
 echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentenoverlay.xul.php"?>';
 echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/lehrveranstaltungoverlay.xul.php"?>';
+echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentenoverlay.xul.php"?>';
 /*echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/stpl-week-overlay.xul.php"?>';
 echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/stpl-semester-overlay.xul.php"?>';
 echo '<?xml-stylesheet href="'.APP_ROOT.'skin/tempus.css" type="text/css"?>';*/
@@ -146,16 +147,13 @@ echo '<?xml-stylesheet href="'.APP_ROOT.'skin/tempus.css" type="text/css"?>';*/
 </popupset>
 	<tabbox id="tabbox-main" flex="3" orient="vertical">
 		<tabs orient="horizontal">
-			<!-- <tab id="tab-week" label="Wochenplan" />  -->
-			<!-- <tab id="tab-semester" label="Semesterplan" />  -->
-			<tab id="tab-studenten" label="Studenten" />
-			<tab id="tab-lfvt" label="Lehrveranstaltung" />
+			<tab id="tab-interessenten" label="Interessenten"/>
+			<tab id="tab-studenten" label="Studenten"/>
+			<tab id="tab-lfvt" label="Lehrveranstaltungen" />
 		</tabs>
 		<tabpanels id="tabpanels-main" flex="1">
-			<!--  Wochenplan
-			<hbox id="hboxTimeTableWeek" />  -->
-			<!--  Semesterplan
-			<vbox id="vboxTimeTableSemester" />  -->
+			<!--  Interessenten  -->
+			<vbox id="InteressentenEditor" />
 			<!--  Studenten  -->
 			<vbox id="studentenEditor" />
 			<!-- Lehrfachverteilung -->
diff --git a/content/lvplanung/lehrveranstaltungoverlay.xul.php b/content/lvplanung/lehrveranstaltungoverlay.xul.php
index 34c7514f9..1ad031105 100644
--- a/content/lvplanung/lehrveranstaltungoverlay.xul.php
+++ b/content/lvplanung/lehrveranstaltungoverlay.xul.php
@@ -49,7 +49,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/lehrveranstaltungdetailo
 			<toolbar id="nav-toolbar">
 			<toolbarbutton id="lehrveranstaltung-toolbar-neu" label="Neue Lehreinheit" oncommand="LeNeu();" disabled="true" image="../skin/images/NeuDokument.png" tooltiptext="Neue Lehreinheit anlegen" />
 			<toolbarbutton id="lehrveranstaltung-toolbar-del" label="Löschen" oncommand="LeDelete();" disabled="true" image="../skin/images/DeleteIcon.png" tooltiptext="Lehreinheiten löschen"/>
-			<toolbarbutton id="lehrveranstaltung-toolbar-refresh" label="Neu laden" oncommand="LvTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
+			<toolbarbutton id="lehrveranstaltung-toolbar-refresh" label="Aktualisieren" oncommand="LvTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
 			<toolbarbutton id="lehrveranstaltung-toolbar-lehrauftrag" label="Lehrauftrag" oncommand="LvCreateLehrauftrag()" disabled="false" image="../skin/images/person.gif" tooltiptext="Lehrauftrag ausdrucken" hidden="true"/>
 			<!--<toolbarbutton id="lehrveranstaltung-toolbar-refresh" label="Load" oncommand="debugload()" disabled="false"/>-->
 			</toolbar>
diff --git a/content/student/interessentdetailoverlay.xul.php b/content/student/interessentdetailoverlay.xul.php
new file mode 100644
index 000000000..82b89342c
--- /dev/null
+++ b/content/student/interessentdetailoverlay.xul.php
@@ -0,0 +1,411 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * 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('../../vilesci/config.inc.php');
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
+
+?>
+
+<overlay id="interessentDetailOverlay"
+	xmlns:html="http://www.w3.org/1999/xhtml"
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	>
+<!-- Interessent DETAILS -->
+<vbox id="interessent-detail" style="margin:0px;" flex="1">
+		<vbox hidden="true">
+			<label value="Neu"/>
+			<checkbox id="interessent-detail-checkbox-new" checked="true" />      	
+			<label value="Person_id"/>
+      		<textbox id="interessent-detail-textbox-person_id" disabled="true"/>					
+      		<label value="Prestudent_id"/>
+      		<textbox id="interessent-detail-textbox-prestudent_id" disabled="true"/>					
+		</vbox>
+		<vbox flex="1">
+		<groupbox id="interessent-detail-groupbox-person">
+			<caption label="Person" />
+			<grid id="interessent-detail-grid-person" style="overflow:auto;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="interessent-detail-textbox-anrede"/>
+      						<hbox><textbox id="interessent-detail-textbox-anrede" disabled="true" maxlength="16" size="16"/></hbox>
+      						<label value="TitelPre" control="interessent-detail-textbox-titelpre"/>
+      						<textbox id="interessent-detail-textbox-titelpre" disabled="true" maxlength="64"/>
+      						<label value="TitelPost" control="interessent-detail-textbox-titelpost"/>
+      						<textbox id="interessent-detail-textbox-titelpost" disabled="true" maxlength="32"/>
+    					</row>
+    					<row>
+    						<label value="Nachname" control="interessent-detail-textbox-nachname"/>
+      						<textbox id="interessent-detail-textbox-nachname" disabled="true" maxlength="64"/>
+      						<label value="Vorname" control="interessent-detail-textbox-vorname"/>
+      						<textbox id="interessent-detail-textbox-vorname" disabled="true" maxlength="32"/>
+      						<label value="Vornamen" control="interessent-detail-textbox-vornamen"/>
+      						<textbox id="interessent-detail-textbox-vornamen" disabled="true" maxlength="128"/>
+    					</row>
+    					<row>
+      						<label value="Geburtsdatum" control="interessent-detail-textbox-geburtsdatum"/>
+      						<hbox><textbox id="interessent-detail-textbox-geburtsdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/></hbox>
+      						<label value="Geburtsort" control="interessent-detail-textbox-geburtsort"/>
+      						<textbox id="interessent-detail-textbox-geburtsort" disabled="true" maxlength="128"/>
+      						<label value="Geburtszeit" control="interessent-detail-textbox-geburtszeit"/>
+      						<hbox><textbox id="interessent-detail-textbox-geburtszeit" disabled="true" maxlength="5" size="5" tooltiptext="Format: hh:mm Beispiel: 10:30"/></hbox>
+    					</row>
+    					<row>
+      						<label value="SVNR" control="interessent-detail-textbox-svnr"/>
+      						<hbox><textbox id="interessent-detail-textbox-svnr" disabled="true" maxlength="10" size="10"/></hbox>
+      						<label value="Ersatzkennzeichen" control="interessent-detail-textbox-ersatzkennzeichen"/>
+      						<hbox><textbox id="interessent-detail-textbox-ersatzkennzeichen" disabled="true" maxlength="10" size="10"/></hbox>
+      						<label value="Aktiv" control="interessent-detail-checkbox-aktiv"/>
+      						<checkbox id="interessent-detail-checkbox-aktiv" checked="true" disabled="true"/>
+    					</row>
+    					<row>
+							<label value="Staatsbuergerschaft" control="interessent-detail-menulist-staatsbuergerschaft"/>
+							<menulist id="interessent-detail-menulist-staatsbuergerschaft" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php" 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="Geburtsnation" control="interessent-detail-menulist-geburtsnation"/>
+							<menulist id="interessent-detail-menulist-geburtsnation" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php" 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="Sprache" control="interessent-detail-menulist-sprache" />
+							<menulist id="interessent-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="interessent-detail-menulist-geschlecht"/>
+      						<menulist id="interessent-detail-menulist-geschlecht" disabled="true">
+								<menupopup>
+										<menuitem value="m" label="maennlich"/>
+										<menuitem value="w" label="weiblich"/>
+								</menupopup>								
+							</menulist>
+							<label value="Familienstand" control="interessent-detail-menulist-familienstand"/>
+      						<menulist id="interessent-detail-menulist-familienstand" disabled="true">
+								<menupopup>
+										<menuitem value="g" label="geschieden"/>
+										<menuitem value="l" label="ledig"/>
+										<menuitem value="v" label="verheiratet"/>
+										<menuitem value="w" label="verwittwet"/>
+								</menupopup>								
+							</menulist>
+							<label value="Anzahl der Kinder" control="interessent-detail-textbox-anzahlderkinder"/>
+      						<textbox id="interessent-detail-textbox-anzahlderkinder" disabled="true" maxlength="2"/>
+    					</row>
+    					<row>
+      						<vbox>
+      							<label value="Foto" />
+      							<hbox>
+      								<button id="interessent-detail-button-image-upload" label="Upload" oncommand="InteressentImageUpload();" disabled="true"/>
+      								<spacer flex="1" />
+      							</hbox>
+      						</vbox>
+   							<hbox>
+   								<image src='' id="interessent-detail-image" width="60" height="60" style="margin-left:5px;"/>
+   								<spacer flex="1"/>
+   							</hbox>
+      						<label value="Anmerkung" control="interessent-detail-textbox-anmerkung"/>
+      						<textbox id="interessent-detail-textbox-anmerkung" disabled="true"/>
+      						<label value="Homepage" control="interessent-detail-textbox-homepage"/>
+      						<vbox><textbox id="interessent-detail-textbox-homepage" disabled="true" maxlength="256"/></vbox>
+    					</row>
+				</rows>
+			</grid>
+			</groupbox>
+    		<hbox>
+    			<spacer flex="1" />
+    			<button id="interessent-detail-button-save" label="Speichern" oncommand="InteressentDetailSave();" disabled="true"/>
+    		</hbox>
+		</vbox>
+</vbox>
+
+<!-- interessent PREStudent -->
+<vbox id="interessent-prestudent" style="margin:0px;" flex="1">
+		
+		<vbox hidden="true">
+			<label value="Neu"/>
+			<checkbox id="interessent-prestudent-checkbox-new" checked="false" />      	
+			<label value="Person_id"/>
+      		<textbox id="interessent-prestudent-textbox-person_id" disabled="true"/>
+      		<label value="Prestudent_id"/>
+      		<textbox id="interessent-prestudent-textbox-prestudent_id" disabled="true"/>
+      		<label value="studiengang_kz"/>
+      		<textbox id="interessent-prestudent-textbox-studiengang_kz" disabled="true"/>
+		</vbox>
+		<groupbox id="interessent-detail-groupbox-prestudent">
+		<caption label="Prestudent" />
+		<grid id="interessent-prestudent-grid-prestudent" style="overflow:auto;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="interessent-prestudent-menulist-aufmerksamdurch"/>
+      						<menulist id="interessent-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#aufmerksamdurch_kurzbz"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+							<label value="Berufstaetigkeit" control="interessent-prestudent-menulist-berufstaetigkeit"/>
+      						<menulist id="interessent-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="interessent-prestudent-menulist-ausbildung"/>
+      						<menulist id="interessent-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="interessent-prestudent-menulist-aufnahmeschluessel"/>
+      						<menulist id="interessent-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" >
+								<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:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+							<label value="Studiengang" control="interessent-prestudent-menulist-studiengang_kz"/>
+							<menulist id="interessent-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>
+						</row>
+						<row>
+							<label value="Facheinschlaegig berufstaetig" control="interessent-prestudent-checkbox-facheinschlberuf"/>
+      						<checkbox id="interessent-prestudent-checkbox-facheinschlberuf" checked="true" disabled="true"/>
+      						<label value="Bismelden" control="interessent-prestudent-checkbox-bismelden"/>
+      						<checkbox id="interessent-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
+    					</row>
+    				</rows>
+    			</grid>
+    		</groupbox>
+   			<groupbox id="interessent-detail-groupbox-zgv">
+			<caption label="Zugangsvoraussetzung" />
+				<grid id="interessent-prestudent-grid-zgv" style="overflow:auto;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="interessent-prestudent-menulist-zgvcode"/>
+      						<menulist id="interessent-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="interessent-prestudent-textbox-zgvort"/>
+      						<textbox id="interessent-prestudent-textbox-zgvort" disabled="true" maxlength="64"/>
+      						<label value="ZGV Datum" control="interessent-prestudent-textbox-zgvdatum"/>
+      						<hbox><textbox id="interessent-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="interessent-prestudent-menulist-zgvmastercode"/>
+      						<menulist id="interessent-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="interessent-prestudent-textbox-zgvmasterort"/>
+      						<textbox id="interessent-prestudent-textbox-zgvmasterort" disabled="true" maxlength="64"/>
+      						<label value="ZGV Master Datum" control="interessent-prestudent-textbox-zgvmasterdatum"/>
+      						<hbox><textbox id="interessent-prestudent-textbox-zgvmasterdatum" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/></hbox>
+    					</row>
+    				</rows>
+    			</grid>
+    		</groupbox>
+    		<groupbox id="interessent-detail-groupbox-reihungstest">
+			<caption label="Reihungstest" />
+				<grid id="interessent-prestudent-grid-reihungstest" style="overflow:auto;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="Anmeldung zum Reihungstest am" control="interessent-prestudent-textbox-anmeldungreihungstest"/>
+      						<hbox>
+      							<textbox id="interessent-prestudent-textbox-anmeldungreihungstest" disabled="true" maxlength="10" size="10" tooltiptext="Format: JJJJ-MM-DD Beispiel: 1970-01-31"/>
+      							<button id="interessent-prestudent-button-anmeldungreihungstest-heute" label="Heute" oncommand="InteressentAnmeldungreihungstestHeute()" disabled="true" style="margin:0px;"/>
+      						</hbox>
+      						<label value="Reihungstest" control="interessent-prestudent-menulist-reihungstest"/>
+      						<menulist id="interessent-prestudent-menulist-reihungstest" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/reihungstest.rdf.php?optional=true" flex="1"
+						              ref="http://www.technikum-wien.at/reihungstest/alle" >
+								<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>
+    					</row>
+    					<row>
+      						<label value="Zum Reihungstest angetreten" control="interessent-prestudent-checkbox-reihungstestangetreten"/>
+      						<checkbox id="interessent-prestudent-checkbox-reihungstestangetreten" checked="true" disabled="true"/>
+      						<label value="Reihungstestpunkte" control="interessent-prestudent-textbox-punkte"/>
+      						<hbox><textbox id="interessent-prestudent-textbox-punkte" disabled="true" maxlength="9" size="9"/></hbox>
+    					</row>
+    				</rows>
+    			</grid>
+    		</groupbox>
+    		<groupbox id="interessent-detail-groupbox-rollen">
+			<caption label="Rollen" />
+					<tree id="interessent-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="100px" enableColumnDrag="true"
+					>
+						<treecols>
+							<treecol id="interessent-prestudent-tree-rolle-rolle_kurzbz" label="Kurzbz" flex="2" hidden="false" primary="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#rolle_kurzbz"/>
+							<splitter class="tree-splitter"/>
+							<treecol id="interessent-prestudent-tree-rolle-studiensemester_kurzbz" label="StSem" flex="5" hidden="false"
+							   class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
+							<splitter class="tree-splitter"/>
+							<treecol id="interessent-prestudent-tree-rolle-ausbildungssemester" label="Semester" flex="2" hidden="false"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester" />
+							<splitter class="tree-splitter"/>
+							<treecol id="interessent-prestudent-tree-rolle-datum" label="Datum" flex="2" hidden="false"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum" />									
+							<splitter class="tree-splitter"/>
+						</treecols>
+			
+						<template>
+							<treechildren flex="1" >
+			   					<treeitem uri="rdf:*">
+									<treerow>
+										<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#rolle_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"/>
+									</treerow>
+								</treeitem>
+							</treechildren>
+						</template>
+					</tree>
+			</groupbox>
+			<hbox>
+				<spacer flex="1" />
+				<button id="interessent-prestudent-button-save" label="Speichern" oncommand="InteressentPrestudentSave();" disabled="true"/>
+			</hbox>
+</vbox>
+
+</overlay>
\ No newline at end of file
diff --git a/content/student/interessentenoverlay.xul.php b/content/student/interessentenoverlay.xul.php
new file mode 100644
index 000000000..2ab6402f2
--- /dev/null
+++ b/content/student/interessentenoverlay.xul.php
@@ -0,0 +1,171 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * 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('../../vilesci/config.inc.php');
+echo '<?xml version="1.0" encoding="ISO-8859-15" standalone="yes" ?>';
+
+echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdetailoverlay.xul.php"?>';
+?>
+<!DOCTYPE overlay >
+
+<overlay id="InteressentenOverlay"
+	xmlns:html="http://www.w3.org/1999/xhtml"
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	>
+
+<script type="application/x-javascript" src="<?php echo APP_ROOT; ?>content/student/interessentoverlay.js.php" />
+
+			<!-- ******************* -->
+			<!-- *  Interessenten  * -->
+			<!-- ******************* -->
+			<vbox id="InteressentenEditor" persist="height">
+				<hbox>
+					<toolbox flex="1">
+						<toolbar id="nav-toolbar">
+						<toolbarbutton id="interessent-toolbar-neu" label="Neu" oncommand="" disabled="true" image="../skin/images/NeuDokument.png" tooltiptext="Interessent neu anlegen" />
+						<toolbarbutton id="interessent-toolbar-zubewerber" label="-> Bewerber" oncommand="" disabled="true" tooltiptext="Interessent zum Bewerber machen" />
+						<toolbarbutton id="interessent-toolbar-zustudent" label="-> Student" oncommand="" disabled="true" tooltiptext="Bewerber zu Studenten machen" />
+						<toolbarbutton id="interessent-toolbar-refresh" label="Aktualisieren" oncommand="InteressentTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
+						<spacer flex="1"/>
+						<label id="interessent-toolbar-label-anzahl"/>
+						</toolbar>
+					</toolbox>
+				</hbox>
+
+				<!-- ************* -->
+				<!-- *  Auswahl  * -->
+				<!-- ************* -->
+				<tree id="interessent-tree" seltype="single" hidecolumnpicker="false" flex="1"
+						datasources="rdf:null" ref="http://www.technikum-wien.at/interessent/alle"
+						onselect="InteressentAuswahl();"
+						flags="dont-build-content"
+						enableColumnDrag="true"
+						style="margin:0px;"
+						persist="hidden, height"
+				>
+					<treecols>
+	    				<treecol id="interessent-treecol-titelpre" label="TitelPre" flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#titelpre"/>
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="interessent-treecol-anrede" label="Anrede" flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#anrede"/>
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="interessent-treecol-vorname" label="Vorname" flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#vorname" />
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="interessent-treecol-vornamen" label="Vornamen" flex="1" hidden="true"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#vornamen" />
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="interessent-treecol-nachname" label="Nachname" flex="2" hidden="false" primary="true"
+	    					sortActive="true"
+	    					sortDirection="ascending"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#nachname" />
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="interessent-treecol-titelpost" label="TitelPost" flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#titelpost"/>
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="interessent-treecol-geburtsdatum" label="Geburtsdatum" flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#geburtsdatum" />
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="interessent-treecol-svnr" label="SVNR" flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#svnr"/>
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="interessent-treecol-ersatzkennzeichen" label="ErsatzKz" flex="1" hidden="false"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#ersazkennzeichen"/>
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="interessent-treecol-geschlecht" label="Geschlecht" flex="1" hidden="true"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#geschlecht" />
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="interessent-treecol-studiengang_kz" label="StudiengangKz" flex="1" hidden="true"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#studiengang_kz" />
+	    				<splitter class="tree-splitter"/>
+	    				<treecol id="interessent-treecol-prestudent_id" label="PreStudentID" flex="1" hidden="true"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#prestudent_id" />
+	    				<treecol id="interessent-treecol-person_id" label="PersonID" flex="1" hidden="true"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/interessent/rdf#person_id" />
+					</treecols>
+
+					<template>
+						<rule>
+	      					<treechildren>
+	       						<treeitem uri="rdf:*">
+	         						<treerow>
+	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#titelpre" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#anrede" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#vorname" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#vornamen" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#nachname" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#titelpost" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#geburtsdatum" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#svnr" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#ersatzkennzeichen" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#geschlecht" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#studiengang_kz" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#prestudent_id" />
+	           							<treecell label="rdf:http://www.technikum-wien.at/interessent/rdf#person_id" />
+	         						</treerow>
+	       						</treeitem>
+	      					</treechildren>
+	      				</rule>
+  					</template>
+				</tree>
+
+				<splitter collapse="after" persist="state">
+					<grippy />
+				</splitter>
+
+				<!-- ************ -->
+				<!-- *  Detail  * -->
+				<!-- ************ -->
+				<vbox flex="1"  style="overflow:auto;margin:0px;" persist="height">
+					<tabbox id="interessent-tabbox" flex="3" orient="vertical">
+						<tabs orient="horizontal" id="interessent-tabs">
+							<tab id="interessent-tab-detail" label="Details" />
+							<tab id="interessent-tab-prestudent" label="PreStudent" />
+						</tabs>
+						<tabpanels id="interessent-tabpanels-main" flex="1">
+							<vbox id="interessent-detail"  style="margin-top:10px;" />
+							<vbox id="interessent-prestudent"  style="margin-top:10px;" />
+						</tabpanels>
+					</tabbox>				
+				</vbox>
+			</vbox>
+</overlay>
diff --git a/content/student/interessentoverlay.js.php b/content/student/interessentoverlay.js.php
new file mode 100644
index 000000000..b26dd05b8
--- /dev/null
+++ b/content/student/interessentoverlay.js.php
@@ -0,0 +1,581 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * 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>.
+ */
+
+require_once('../../vilesci/config.inc.php');
+require_once('../../include/functions.inc.php');
+
+$conn = pg_pconnect(CONN_STRING);
+
+$user = get_uid();
+loadVariables($conn, $user);
+?>
+// *********** Globale Variablen *****************//
+var InteressentSelectId=null; //Interessent der nach dem Refresh markiert werden soll
+
+// ********** Observer und Listener ************* //
+
+// ****
+// * Observer fuer Interessenten Tree
+// * startet Rebuild nachdem das Refresh
+// * der datasource fertig ist
+// ****
+var InteressentTreeSinkObserver =
+{
+	onBeginLoad : function(pSink) {},
+	onInterrupt : function(pSink) {},
+	onResume : function(pSink) {},
+	onError : function(pSink, pStatus, pError) {},
+	onEndLoad : function(pSink)
+	{
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		document.getElementById('interessent-tree').builder.rebuild();
+	}
+};
+
+// ****
+// * Nach dem Rebuild wird der Interessent wieder
+// * markiert
+// ****
+var InteressentTreeListener =
+{
+  willRebuild : function(builder) {  },
+  didRebuild : function(builder)
+  {
+  	  //timeout nur bei Mozilla notwendig da sonst die rows
+  	  //noch keine values haben. Ab Seamonkey funktionierts auch
+  	  //ohne dem setTimeout
+      window.setTimeout(InteressentTreeSelectInteressent,10);
+  }
+};
+
+// ***************** KEY Events ************************* //
+
+// ****
+// * Wird ausgefuehrt wenn eine Taste gedrueckt wird und der Focus
+// * im Interessent-tree ist
+// * Beim Druecken von F5 wird der Studententree aktualisiert
+// ****
+function InteressentTreeKeyPress(event)
+{
+	if(event.keyCode==116) // F5
+		InteressentTreeRefresh();
+}
+
+// ****************** FUNKTIONEN ************************** //
+
+// ****
+// * Asynchroner (Nicht blockierender) Refresh des InteressentenTrees
+// ****
+function InteressentTreeRefresh()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	
+	//markierten Interessenten global speichern damit dieser Interessent nach dem
+	//refresh wieder markiert werden kann.
+	var tree = document.getElementById('interessent-tree');
+	var col = tree.columns ? tree.columns["interessent-treecol-prestudent_id"] : "interessent-treecol-prestudent_id";
+	try
+	{
+		InteressentSelectId=tree.view.getCellText(tree.currentIndex,col);
+		InteressentTreeDatasource.Refresh(false); //non blocking
+	}
+	catch(e)
+	{}
+}
+
+// ****
+// * neuen Interessenten anlegen
+// ****
+function InteressentNeu()
+{
+	
+}
+
+// ****
+// * Selectiert den Interessenten nachdem der Tree
+// * rebuildet wurde.
+// ****
+function InteressentTreeSelectInteressent()
+{
+	var tree=document.getElementById('interessent-tree');
+	var items = tree.view.rowCount; //Anzahl der Zeilen ermitteln
+
+	//In der globalen Variable ist der zu selektierende Interessent gespeichert
+	if(InteressentSelectId!=null)
+	{		
+	   	for(var i=0;i<items;i++)
+	   	{
+	   		//Id der row holen
+			col = tree.columns ? tree.columns["interessent-treecol-prestudent_id"] : "interessent-treecol-prestudent_id";
+			prestudent_id=tree.view.getCellText(i,col);
+						
+			if(prestudent_id == InteressentSelectId)
+			{
+				//Zeile markieren
+				tree.view.selection.select(i);
+				//Sicherstellen, dass die Zeile im sichtbaren Bereich liegt
+				tree.treeBoxObject.ensureRowIsVisible(i);
+				return true;
+			}
+	   	}
+	}
+	document.getElementById('interessent-toolbar-label-anzahl').value='Anzahl: '+items;
+}
+
+// ****
+// * Interessent loeschen
+// ****
+function InteressentDelete()
+{
+}
+
+// ****
+// * Leert alle Eingabe- und Auswahlfelder
+// ****
+function InteressentDetailReset()
+{
+	document.getElementById('interessent-detail-textbox-anrede').value='';
+	document.getElementById('interessent-detail-textbox-titelpre').value='';
+	document.getElementById('interessent-detail-textbox-titelpost').value='';
+	document.getElementById('interessent-detail-textbox-vorname').value='';
+	document.getElementById('interessent-detail-textbox-vornamen').value='';
+	document.getElementById('interessent-detail-textbox-nachname').value='';
+	document.getElementById('interessent-detail-textbox-geburtsdatum').value='';
+	document.getElementById('interessent-detail-textbox-geburtsort').value='';
+	document.getElementById('interessent-detail-textbox-geburtszeit').value='';
+	document.getElementById('interessent-detail-textbox-anmerkung').value='';
+	document.getElementById('interessent-detail-textbox-homepage').value='';
+	document.getElementById('interessent-detail-textbox-svnr').value='';
+	document.getElementById('interessent-detail-textbox-ersatzkennzeichen').value='';
+	document.getElementById('interessent-detail-menulist-familienstand').value='l';
+	document.getElementById('interessent-detail-menulist-geschlecht').value='m';
+	document.getElementById('interessent-detail-checkbox-aktiv').checked=true;
+	document.getElementById('interessent-detail-textbox-anzahlderkinder').value='';
+	document.getElementById('interessent-detail-menulist-staatsbuergerschaft').value='A';
+	document.getElementById('interessent-detail-menulist-geburtsnation').value='A';
+	document.getElementById('interessent-detail-menulist-sprache').value='German';
+	document.getElementById('interessent-detail-image').src='';
+}
+
+// ****
+// * Deaktiviert alle Eingabe- und Auswahlfelder
+// ****
+function InteressentDetailDisableFields(val)
+{
+	document.getElementById('interessent-detail-textbox-anrede').disabled=val;
+	document.getElementById('interessent-detail-textbox-titelpre').disabled=val;
+	document.getElementById('interessent-detail-textbox-titelpost').disabled=val;
+	document.getElementById('interessent-detail-textbox-vorname').disabled=val;
+	document.getElementById('interessent-detail-textbox-vornamen').disabled=val;
+	document.getElementById('interessent-detail-textbox-nachname').disabled=val;
+	document.getElementById('interessent-detail-textbox-geburtsdatum').disabled=val;
+	document.getElementById('interessent-detail-textbox-geburtsort').disabled=val;
+	document.getElementById('interessent-detail-textbox-geburtszeit').disabled=val;
+	document.getElementById('interessent-detail-textbox-anmerkung').disabled=val;
+	document.getElementById('interessent-detail-textbox-homepage').disabled=val;
+	document.getElementById('interessent-detail-textbox-svnr').disabled=val;
+	document.getElementById('interessent-detail-textbox-ersatzkennzeichen').disabled=val;
+	document.getElementById('interessent-detail-menulist-familienstand').disabled=val;
+	document.getElementById('interessent-detail-menulist-geschlecht').disabled=val;
+	document.getElementById('interessent-detail-checkbox-aktiv').disabled=val;
+	document.getElementById('interessent-detail-textbox-anzahlderkinder').disabled=val;
+	document.getElementById('interessent-detail-menulist-staatsbuergerschaft').disabled=val;
+	document.getElementById('interessent-detail-menulist-geburtsnation').disabled=val;
+	document.getElementById('interessent-detail-menulist-sprache').disabled=val;
+	document.getElementById('interessent-detail-button-image-upload').disabled=val;
+}
+
+// ****
+// * Speichert die Details
+// ****
+function InteressentDetailSave()
+{
+	//Werte holen
+	anrede = document.getElementById('interessent-detail-textbox-anrede').value;
+	titelpre = document.getElementById('interessent-detail-textbox-titelpre').value;
+	titelpost = document.getElementById('interessent-detail-textbox-titelpost').value;
+	vorname = document.getElementById('interessent-detail-textbox-vorname').value;
+	vornamen = document.getElementById('interessent-detail-textbox-vornamen').value;
+	nachname = document.getElementById('interessent-detail-textbox-nachname').value;
+	geburtsdatum = document.getElementById('interessent-detail-textbox-geburtsdatum').value;
+	geburtsort = document.getElementById('interessent-detail-textbox-geburtsort').value;
+	geburtszeit = document.getElementById('interessent-detail-textbox-geburtszeit').value;
+	anmerkung = document.getElementById('interessent-detail-textbox-anmerkung').value;
+	homepage = document.getElementById('interessent-detail-textbox-homepage').value;
+	svnr = document.getElementById('interessent-detail-textbox-svnr').value;
+	ersatzkennzeichen = document.getElementById('interessent-detail-textbox-ersatzkennzeichen').value;
+	familienstand = document.getElementById('interessent-detail-menulist-familienstand').value;
+	geschlecht = document.getElementById('interessent-detail-menulist-geschlecht').value;
+	aktiv = document.getElementById('interessent-detail-checkbox-aktiv').checked;
+	anzahlderkinder = document.getElementById('interessent-detail-textbox-anzahlderkinder').value;
+	staatsbuergerschaft = document.getElementById('interessent-detail-menulist-staatsbuergerschaft').value;
+	geburtsnation = document.getElementById('interessent-detail-menulist-geburtsnation').value;
+	sprache = document.getElementById('interessent-detail-menulist-sprache').value;
+	person_id = document.getElementById('interessent-detail-textbox-person_id').value;
+	prestudent_id = document.getElementById('interessent-detail-textbox-prestudent_id').value
+			
+	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
+	var req = new phpRequest(url,'','');
+
+	req.add('type', 'saveperson');
+		
+	req.add('person_id', person_id);
+	req.add('anrede', anrede);
+	req.add('titelpre', titelpre);
+	req.add('titelpost', titelpost);
+	req.add('vorname', vorname);
+	req.add('vornamen', vornamen);
+	req.add('nachname', nachname);
+	req.add('geburtsdatum', geburtsdatum);
+	req.add('geburtsort', geburtsort);
+	req.add('geburtszeit', geburtszeit);
+	req.add('anmerkung', anmerkung);
+	req.add('homepage', homepage);
+	req.add('svnr', svnr);
+	req.add('ersatzkennzeichen', ersatzkennzeichen);
+	req.add('familienstand', familienstand);
+	req.add('geschlecht', geschlecht);
+	req.add('aktiv', aktiv);
+	req.add('anzahlderkinder', anzahlderkinder);
+	req.add('staatsbuergerschaft', staatsbuergerschaft);
+	req.add('geburtsnation', geburtsnation);
+	req.add('sprache', sprache);
+		
+	var response = req.executePOST();
+
+	var val =  new ParseReturnValue(response)
+	
+	if (!val.dbdml_return)
+	{
+		if(val.dbdml_errormsg=='')
+			alert(response)
+		else
+			alert(val.dbdml_errormsg)
+	}
+	else
+	{
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+				
+		InteressentSelectId=prestudent_id;
+		InteressentTreeDatasource.Refresh(false); //non blocking
+		SetStatusBarText('Daten wurden gespeichert');
+	}
+}
+
+function InteressentImageUpload()
+{
+	person_id = document.getElementById('interessent-detail-textbox-person_id').value;
+	if(person_id!='')
+	{
+		window.open('<?php echo APP_ROOT; ?>content/bildupload.php?person_id='+person_id,'Bild Upload', 'height=10,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
+	}
+	else
+		alert('Es wurde keine Person ausgewaehlt');
+}
+
+// ****
+// * Auswahl eines Interessenten
+// * bei Auswahl eines Interessenten wird dieser geladen
+// * und die Daten unten angezeigt
+// ****
+function InteressentAuswahl()
+{
+	
+	// Trick 17	(sonst gibt's ein Permission denied)
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var tree = document.getElementById('interessent-tree');
+
+	if (tree.currentIndex==-1) return;
+	
+	try
+	{
+		//Ausgewaehlte ID holen
+        var col = tree.columns ? tree.columns["interessent-treecol-prestudent_id"] : "interessent-treecol-prestudent_id";
+		var prestudent_id=tree.view.getCellText(tree.currentIndex,col);
+		if(prestudent_id!='')
+		{
+			//Interessent wurde markiert
+			//loeschen button aktivieren
+			InteressentDetailDisableFields(false);
+			InteressentPrestudentDisableFields(false);
+			document.getElementById('interessent-detail-button-save').disabled=false;
+		}
+		else
+		{
+			return false;
+		}	
+	}
+	catch(e)
+	{
+		alert(e);
+		return false;
+	}
+
+	var url = '<?php echo APP_ROOT ?>rdf/interessentenbewerber.rdf.php?prestudent_id='+prestudent_id+'&'+gettimestamp();
+	
+	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].
+                   getService(Components.interfaces.nsIRDFService);
+    
+    var dsource = rdfService.GetDataSourceBlocking(url);
+    
+	var subject = rdfService.GetResource("http://www.technikum-wien.at/interessent/" + prestudent_id);
+
+	var predicateNS = "http://www.technikum-wien.at/interessent/rdf";
+
+	//Daten holen
+
+	anrede = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anrede" ));
+	titelpre=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#titelpre" ));
+	titelpost=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#titelpost" ));
+	vorname=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#vorname" ));
+	vornamen=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#vornamen" ));
+	nachname=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#nachname" ));
+	geburtsdatum=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#geburtsdatum" ));
+	geburtsort=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#gebort" ));
+	geburtszeit=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#gebzeit" ));
+	anmerkung=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkungen" ));
+	homepage=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#homepage" ));
+	svnr=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#svnr" ));
+	ersatzkennzeichen=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ersatzkennzeichen" ));
+	familienstand=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#familienstand" ));
+	geschlecht=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#geschlecht" ));
+	aktiv=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#aktiv" ));	
+	anzahlderkinder=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anzahlkinder" ));
+	staatsbuergerschaft=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#staatsbuergerschaft" ));
+	geburtsnation=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#geburtsnation" ));
+	sprache=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#sprache" ));
+	person_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#person_id" ));
+		
+	//Daten den Feldern zuweisen
+
+	document.getElementById('interessent-detail-textbox-prestudent_id').value=prestudent_id;
+	document.getElementById('interessent-detail-textbox-anrede').value=anrede;
+	document.getElementById('interessent-detail-textbox-titelpre').value=titelpre;
+	document.getElementById('interessent-detail-textbox-titelpost').value=titelpost;
+	document.getElementById('interessent-detail-textbox-vorname').value=vorname;
+	document.getElementById('interessent-detail-textbox-vornamen').value=vornamen;
+	document.getElementById('interessent-detail-textbox-nachname').value=nachname;
+	document.getElementById('interessent-detail-textbox-geburtsdatum').value=geburtsdatum;
+	document.getElementById('interessent-detail-textbox-geburtsort').value=geburtsort;
+	document.getElementById('interessent-detail-textbox-geburtszeit').value=geburtszeit;
+	document.getElementById('interessent-detail-textbox-anmerkung').value=anmerkung;
+	document.getElementById('interessent-detail-textbox-homepage').value=homepage;
+	document.getElementById('interessent-detail-textbox-svnr').value=svnr;
+	document.getElementById('interessent-detail-textbox-ersatzkennzeichen').value=ersatzkennzeichen;
+	document.getElementById('interessent-detail-menulist-familienstand').value=familienstand;
+	document.getElementById('interessent-detail-menulist-geschlecht').value=geschlecht;
+	if(aktiv=='true')
+		document.getElementById('interessent-detail-checkbox-aktiv').checked=true;
+	else
+		document.getElementById('interessent-detail-checkbox-aktiv').checked=false;
+	document.getElementById('interessent-detail-textbox-anzahlderkinder').value=anzahlderkinder;
+	document.getElementById('interessent-detail-menulist-staatsbuergerschaft').value=staatsbuergerschaft;
+	document.getElementById('interessent-detail-menulist-geburtsnation').value=geburtsnation;
+	document.getElementById('interessent-detail-menulist-sprache').value=sprache;
+	document.getElementById('interessent-detail-image').src='<?php echo APP_ROOT?>content/bild.php?src=person&person_id='+person_id+'&'+gettimestamp();
+	document.getElementById('interessent-detail-textbox-person_id').value=person_id;
+		
+	//Prestudent Daten holen
+
+	aufmerksamdurch_kurzbz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#aufmerksamdurch_kurzbz" ));
+	studiengang_kz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studiengang_kz" ));
+	berufstaetigkeit_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#berufstaetigkeit_code" ));
+	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" ));
+	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" ));
+	zgvmasterdatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmadatum" ));
+	aufnahmeschluessel = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#aufnahmeschluessel" ));
+	facheinschlberuf = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#facheinschlberuf" ));
+	reihungstest_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#reihungstest_id" ));
+	anmeldungreihungstest = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmeldungreihungstest" ));
+	reihungstestangetreten = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#reihungstestangetreten" ));
+	punkte = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte" ));
+	bismelden = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bismelden" ));
+	
+	document.getElementById('interessent-prestudent-menulist-aufmerksamdurch').value=aufmerksamdurch_kurzbz;
+	document.getElementById('interessent-prestudent-menulist-berufstaetigkeit').value=berufstaetigkeit_code;
+	document.getElementById('interessent-prestudent-menulist-ausbildung').value=ausbildungcode;
+	document.getElementById('interessent-prestudent-menulist-zgvcode').value=zgv_code;
+	document.getElementById('interessent-prestudent-textbox-zgvort').value=zgvort;
+	document.getElementById('interessent-prestudent-textbox-zgvdatum').value=zgvdatum;
+	document.getElementById('interessent-prestudent-menulist-zgvmastercode').value=zgvmaster_code;
+	document.getElementById('interessent-prestudent-textbox-zgvmasterort').value=zgvmasterort;
+	document.getElementById('interessent-prestudent-textbox-zgvmasterdatum').value=zgvmasterdatum;
+	document.getElementById('interessent-prestudent-menulist-aufnahmeschluessel').value=aufnahmeschluessel;
+	if(facheinschlberuf=='true')
+		document.getElementById('interessent-prestudent-checkbox-facheinschlberuf').checked=true;
+	else
+		document.getElementById('interessent-prestudent-checkbox-facheinschlberuf').checked=false;
+	document.getElementById('interessent-prestudent-menulist-reihungstest').value=reihungstest_id;
+	document.getElementById('interessent-prestudent-textbox-anmeldungreihungstest').value=anmeldungreihungstest;
+	if(reihungstestangetreten=='true')
+		document.getElementById('student-prestudent-checkbox-reihungstestangetreten').checked=true;
+	else
+		document.getElementById('interessent-prestudent-checkbox-reihungstestangetreten').checked=false;
+	document.getElementById('interessent-prestudent-textbox-punkte').value=punkte;
+	
+	if(bismelden=='true')
+		document.getElementById('interessent-prestudent-checkbox-bismelden').checked=true;
+	else
+		document.getElementById('interessent-prestudent-checkbox-bismelden').checked=false;
+		
+	document.getElementById('interessent-prestudent-textbox-person_id').value=person_id;
+	document.getElementById('interessent-prestudent-textbox-prestudent_id').value=prestudent_id;
+	document.getElementById('interessent-prestudent-checkbox-new').checked=false;
+	document.getElementById('interessent-prestudent-menulist-studiengang_kz').value=studiengang_kz;
+		
+	rollentree = document.getElementById('interessent-prestudent-tree-rolle');
+	url='<?php echo APP_ROOT;?>rdf/prestudentrolle.rdf.php?prestudent_id='+prestudent_id+"&"+gettimestamp();
+	
+	//Alte DS entfernen
+	var oldDatasources = rollentree.database.GetDataSources();
+	while(oldDatasources.hasMoreElements())
+	{
+		rollentree.database.RemoveDataSource(oldDatasources.getNext());
+	}
+	//Refresh damit die entfernten DS auch wirklich entfernt werden
+	rollentree.builder.rebuild();
+	
+	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+	var datasource = rdfService.GetDataSource(url);
+	rollentree.database.AddDataSource(datasource);
+}
+
+// ****
+// * De-/Aktiviert die Prestudent Felder
+// ****
+function InteressentPrestudentDisableFields(val)
+{
+	document.getElementById('interessent-prestudent-menulist-aufmerksamdurch').disabled=val;
+	document.getElementById('interessent-prestudent-menulist-berufstaetigkeit').disabled=val;
+	document.getElementById('interessent-prestudent-menulist-ausbildung').disabled=val;
+	document.getElementById('interessent-prestudent-menulist-studiengang_kz').disabled=val;
+	document.getElementById('interessent-prestudent-menulist-zgvcode').disabled=val;
+	document.getElementById('interessent-prestudent-textbox-zgvort').disabled=val;
+	document.getElementById('interessent-prestudent-textbox-zgvdatum').disabled=val;
+	document.getElementById('interessent-prestudent-menulist-zgvmastercode').disabled=val;
+	document.getElementById('interessent-prestudent-textbox-zgvmasterort').disabled=val;
+	document.getElementById('interessent-prestudent-textbox-zgvmasterdatum').disabled=val;
+	document.getElementById('interessent-prestudent-menulist-aufnahmeschluessel').disabled=val;
+	document.getElementById('interessent-prestudent-checkbox-facheinschlberuf').disabled=val;
+	document.getElementById('interessent-prestudent-menulist-reihungstest').disabled=val;
+	document.getElementById('interessent-prestudent-textbox-anmeldungreihungstest').disabled=val;
+	document.getElementById('interessent-prestudent-checkbox-reihungstestangetreten').disabled=val;
+	document.getElementById('interessent-prestudent-textbox-punkte').disabled=val;
+	document.getElementById('interessent-prestudent-checkbox-bismelden').disabled=val;
+	document.getElementById('interessent-prestudent-button-anmeldungreihungstest-heute').disabled=val;
+	document.getElementById('interessent-prestudent-button-save').disabled=val;
+}
+
+// ****
+// * Speichert die Prestudent Daten
+// ****
+function InteressentPrestudentSave()
+{
+	aufmerksamdurch_kurzbz = document.getElementById('interessent-prestudent-menulist-aufmerksamdurch').value;
+	berufstaetigkeit_code = document.getElementById('interessent-prestudent-menulist-berufstaetigkeit').value;
+	ausbildungcode = document.getElementById('interessent-prestudent-menulist-ausbildung').value;
+	zgv_code = document.getElementById('interessent-prestudent-menulist-zgvcode').value;
+	zgvort = document.getElementById('interessent-prestudent-textbox-zgvort').value;
+	zgvdatum = document.getElementById('interessent-prestudent-textbox-zgvdatum').value;
+	zgvmaster_code = document.getElementById('interessent-prestudent-menulist-zgvmastercode').value;
+	zgvmasterort = document.getElementById('interessent-prestudent-textbox-zgvmasterort').value;
+	zgvmasterdatum = document.getElementById('interessent-prestudent-textbox-zgvmasterdatum').value;
+	aufnahmeschluessel = document.getElementById('interessent-prestudent-menulist-aufnahmeschluessel').value;
+	facheinschlberuf = document.getElementById('interessent-prestudent-checkbox-facheinschlberuf').checked;
+	reihungstest_id = document.getElementById('interessent-prestudent-menulist-reihungstest').value;
+	anmeldungreihungstest = document.getElementById('interessent-prestudent-textbox-anmeldungreihungstest').value;
+	reihungstestangetreten = document.getElementById('interessent-prestudent-checkbox-reihungstestangetreten').checked;
+	punkte = document.getElementById('interessent-prestudent-textbox-punkte').value;
+	bismelden = document.getElementById('interessent-prestudent-checkbox-bismelden').checked;
+	person_id = document.getElementById('interessent-prestudent-textbox-person_id').value;
+	prestudent_id = document.getElementById('interessent-prestudent-textbox-prestudent_id').value;
+	neu = document.getElementById('interessent-prestudent-checkbox-new').checked;
+	studiengang_kz = document.getElementById('interessent-prestudent-menulist-studiengang_kz').value;
+	
+	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
+	var req = new phpRequest(url,'','');
+	
+	if (neu)
+	{
+		alert('Fehler! Es wurde versucht einen neuen Prestudenten anzulegen, dies ist aber hier nicht moeglich');
+		return false;
+	}
+	
+	req.add('type', 'saveprestudent');
+		
+	req.add('aufmerksamdurch_kurzbz', aufmerksamdurch_kurzbz);
+	req.add('berufstaetigkeit_code', berufstaetigkeit_code);
+	req.add('ausbildungcode', ausbildungcode);
+	req.add('zgv_code', zgv_code);
+	req.add('zgvort', zgvort);
+	req.add('zgvdatum', zgvdatum);
+	req.add('zgvmas_code', zgvmaster_code);
+	req.add('zgvmaort', zgvmasterort);
+	req.add('zgvmadatum', zgvmasterdatum);
+	req.add('aufnahmeschluessel', aufnahmeschluessel);
+	req.add('facheinschlberuf', facheinschlberuf);
+	req.add('reihungstest_id', reihungstest_id);
+	req.add('anmeldungreihungstest', anmeldungreihungstest);
+	req.add('reihungstestangetreten', reihungstestangetreten);
+	req.add('punkte', punkte);
+	req.add('bismelden', bismelden);
+	req.add('person_id', person_id);
+	req.add('prestudent_id', prestudent_id);
+	req.add('studiengang_kz', studiengang_kz);
+		
+	var response = req.executePOST();
+
+	var val =  new ParseReturnValue(response)
+	
+	if (!val.dbdml_return)
+	{
+		if(val.dbdml_errormsg=='')
+			alert(response)
+		else
+			alert(val.dbdml_errormsg)
+	}
+	else
+	{
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+				
+		InteressentSelectId=val.dbdml_data;
+		InteressentTreeDatasource.Refresh(false); //non blocking
+		SetStatusBarText('Daten wurden gespeichert');
+	}
+}
+
+function InteressentAnmeldungreihungstestHeute()
+{
+	var now = new Date();
+	var jahr = now.getFullYear();
+	
+	monat = now.getMonth();
+	if(monat<10) monat='0'+monat;
+	tag = now.getDate();
+	if(tag<10) tag='0'+tag;
+	
+	document.getElementById('interessent-prestudent-textbox-anmeldungreihungstest').value=jahr+'-'+monat+'-'+tag;
+}
\ No newline at end of file
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index eb2478c01..e1ed0fc25 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -127,6 +127,65 @@ if(!$error)
 			}
 		}
 	}
+	if(isset($_POST['type']) && $_POST['type']=='saveperson')
+	{
+		//Personendaten Speichern
+
+		if(!$error)
+		{
+			$person = new person($conn, null, true);
+			
+			if(!$person->load($_POST['person_id']))
+			{
+				$return = false;
+				$errormsg = 'Fehler beim laden:'.$person->errormsg;
+				$error = true;
+			}
+			
+			if(!$error)
+			{
+				$person->person_id = $_POST['person_id'];
+				$person->anrede = $_POST['anrede'];
+				$person->titelpre = $_POST['titelpre'];
+				$person->titelpost = $_POST['titelpost'];
+				$person->vorname = $_POST['vorname'];
+				$person->vornamen = $_POST['vornamen'];
+				$person->nachname = $_POST['nachname'];
+				$person->gebdatum = $_POST['geburtsdatum'];
+				$person->gebort = $_POST['geburtsort'];
+				$person->gebzeit = $_POST['geburtszeit'];
+				$person->anmerkungen = $_POST['anmerkung'];
+				$person->homepage = $_POST['homepage'];
+				$person->svnr = $_POST['svnr'];
+				$person->ersatzkennzeichen = $_POST['ersatzkennzeichen'];
+				$person->familienstand = $_POST['familienstand'];
+				$person->geschlecht = $_POST['geschlecht'];
+				$person->aktiv = ($_POST['aktiv']=='true'?true:false);
+				$person->anzahlkinder = $_POST['anzahlderkinder'];
+				$person->staatsbuergerschaft = $_POST['staatsbuergerschaft'];
+				$person->geburtsnation = $_POST['geburtsnation'];
+				$person->sprache = $_POST['sprache'];
+								
+				$person->new=false;				
+
+				if(!$error)
+				{
+					if($person->save())
+					{
+						$return = true;
+						$error=false;
+						$data = $person->person_id;
+					}
+					else
+					{
+						$return = false;
+						$errormsg  = $person->errormsg;
+						$error = true;
+					}
+				}
+			}
+		}
+	}
 	elseif(isset($_POST['type']) && $_POST['type']=='saveprestudent')
 	{
 		//Studentendaten Speichern
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index 929d7c547..e201504d9 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -166,7 +166,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
       						<label value="Anmerkung" control="student-detail-textbox-anmerkung"/>
       						<textbox id="student-detail-textbox-anmerkung" disabled="true"/>
       						<label value="Homepage" control="student-detail-textbox-homepage"/>
-      						<textbox id="student-detail-textbox-homepage" disabled="true" maxlength="256"/>
+      						<vbox><textbox id="student-detail-textbox-homepage" disabled="true" maxlength="256"/></vbox>
     					</row>
 				</rows>
 			</grid>
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index fb03dc1ba..def8b71dc 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -49,7 +49,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentdetailoverlay.xul.p
 						<toolbar id="nav-toolbar">
 						<!--<toolbarbutton id="student-toolbar-neu" label="Neuer Student" oncommand="StudentNeu();" disabled="true" image="../skin/images/NeuDokument.png" tooltiptext="Student neu anlegen" />-->
 						<!--<toolbarbutton id="student-toolbar-del" label="Löschen" oncommand="StudentDelete();" disabled="true" image="../skin/images/DeleteIcon.png" tooltiptext="Student löschen"/>-->
-						<toolbarbutton id="student-toolbar-refresh" label="Neu laden" oncommand="StudentTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
+						<toolbarbutton id="student-toolbar-refresh" label="Aktualisieren" oncommand="StudentTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
 						<spacer flex="1"/>
 						<label id="student-toolbar-label-anzahl"/>
 						</toolbar>
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 17e473974..8a2ef30eb 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -350,5 +350,86 @@ class prestudent extends person
 			return false;
 		}
 	}
+	
+	// *******************************************************************************
+	// * Laedt die Interessenten und Bewerber fuer ein bestimmtes Studiensemester
+	// * @param $studiensemester_kurzbz Studiensemester fuer das die Int. und Bewerber
+	// *                                geladen werden sollen
+	// *******************************************************************************
+	function loadIntessentenUndBewerber($studiensemester_kurzbz, $studiengang_kz, $semester=nulll)
+	{
+		$qry = "SELECT distinct on(tbl_prestudent.prestudent_id) * FROM public.tbl_person, public.tbl_prestudent, public.tbl_prestudentrolle WHERE 
+				tbl_person.person_id=tbl_prestudent.person_id AND 
+				tbl_prestudent.prestudent_id=tbl_prestudentrolle.prestudent_id AND 
+				tbl_prestudentrolle.studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' AND
+				(rolle_kurzbz='Interessent' OR rolle_kurzbz='Bewerber') AND
+				tbl_prestudent.studiengang_kz='$studiengang_kz'";
+		if($semester!=null)
+			$qry.=" AND tbl_prestudentrolle.ausbildungssemester='$semester'";
+
+		//echo $qry;
+		if($result = pg_query($this->conn, $qry))
+		{
+			while($row = pg_fetch_object($result))
+			{
+				$ps = new prestudent($this->conn, null, null);
+				
+				$ps->person_id = $row->person_id;
+				$ps->staatsbuergerschaft = $row->staatsbuergerschaft;
+				$ps->gebnation = $row->geburtsnation;
+				$ps->sprache = $row->sprache;
+				$ps->anrede = $row->anrede;
+				$ps->titelpost = $row->titelpost;
+				$ps->titelpre = $row->titelpre;
+				$ps->nachname = $row->nachname;
+				$ps->vorname = $row->vorname;
+				$ps->vornamen = $row->vornamen;
+				$ps->gebdatum = $row->gebdatum;
+				$ps->gebort = $row->gebort;
+				$ps->gebzeit = $row->gebzeit;
+				$ps->foto = $row->foto;
+				$ps->anmerkungen = $row->anmerkungen;
+				$ps->homepage = $row->homepage;
+				$ps->svnr = $row->svnr;
+				$ps->ersatzkennzeichen = $row->ersatzkennzeichen;
+				$ps->familienstand = $row->familienstand;
+				$ps->geschlecht = $row->geschlecht;
+				$ps->anzahlkinder = $row->anzahlkinder;
+				$ps->aktiv = ($row->aktiv=='t'?true:false);
+				
+				$ps->prestudent_id = $row->prestudent_id;
+				$ps->aufmerksamdurch_kurzbz = $row->aufmerksamdurch_kurzbz;
+				$ps->studiengang_kz = $row->studiengang_kz;
+				$ps->berufstaetigkeit_code = $row->berufstaetigkeit_code;
+				$ps->ausbildungcode = $row->ausbildungcode;
+				$ps->zgv_code = $row->zgv_code;
+				$ps->zgvort = $row->zgvort;
+				$ps->zgvdatum = $row->zgvdatum;
+				$ps->zgvmas_code = $row->zgvmas_code;
+				$ps->zgvmaort = $row->zgvmaort;
+				$ps->zgvmadatum = $row->zgvmadatum;
+				$ps->aufnahmeschluessel = $row->aufnahmeschluessel;
+				$ps->facheinschlberuf = ($row->facheinschlberuf=='t'?true:false);
+				$ps->anmeldungreihungstest = $row->anmeldungreihungstest;
+				$ps->reihungstestangetreten = ($row->reihungstestangetreten=='t'?true:false);
+				$ps->reihungstest_id = $row->reihungstest_id;
+				$ps->punkte = $row->punkte;
+				$ps->bismelden = ($row->bismelden=='t'?true:false);
+				
+				$ps->rolle_kurzbz = $row->rolle_kurzbz;
+				$ps->studiensemester_kurzbz = $row->studiensemester_kurzbz;
+				$ps->ausbildungssemester = $row->ausbildungssemester;
+				$ps->datum = $row->datum;
+				
+				$this->result[] = $ps;
+			}
+			return true;
+		}
+		else 
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
 }
 ?>
\ No newline at end of file
diff --git a/include/student.class.php b/include/student.class.php
index c07794cc8..d8053b3a2 100644
--- a/include/student.class.php
+++ b/include/student.class.php
@@ -240,25 +240,26 @@ class student extends benutzer
 		{
 			$where=" gruppe_kurzbz='".$gruppe."'";
 			if($stsem!=null)
-				$where.=" AND studiensemester_kurzbz='$stsem'";
+				$where.=" AND tbl_benutzergruppe.studiensemester_kurzbz='$stsem'";
 		}
 		else
 		{
 			if ($stg_kz>=0)
 			{
-				$where.=" studiengang_kz=$stg_kz";
+				$where.=" tbl_studentlehrverband.studiengang_kz=$stg_kz";
 				if ($sem!=null)
-					$where.=" AND semester=$sem";
+					$where.=" AND tbl_studentlehrverband.semester=$sem";
 				if ($ver!=null)
-					$where.=" AND verband='".$ver."'";
+					$where.=" AND tbl_studentlehrverband.verband='".$ver."'";
 				if ($grp!=null)
-					$where.=" AND gruppe='".$grp."'";
+					$where.=" AND tbl_studentlehrverband.gruppe='".$grp."'";
 			}
-		}
-
+			if($stsem!=null)
+				$where.=" AND tbl_studentlehrverband.studiensemester_kurzbz='$stsem'";
+		}			
 
 		//$sql_query="SELECT * FROM campus.vw_student WHERE $where ORDER by nachname,vorname";
-		$sql_query = "SELECT * FROM public.tbl_person, public.tbl_student, (public.tbl_benutzer LEFT JOIN tbl_benutzergruppe USING(uid)) 
+		$sql_query = "SELECT *, tbl_student.semester as std_semester, tbl_student.verband as std_verband, tbl_student.gruppe as std_gruppe, tbl_student.studiengang_kz as std_studiengang_kz FROM public.tbl_person, public.tbl_student, ((public.tbl_benutzer LEFT JOIN public.tbl_benutzergruppe USING(uid)) LEFT JOIN public.tbl_studentlehrverband ON(uid = student_uid))
 					  WHERE tbl_person.person_id=tbl_benutzer.person_id AND tbl_benutzer.uid = tbl_student.student_uid AND $where ORDER BY nachname, vorname";
 	    //echo $sql_query;
 		if(!($erg=pg_query($this->conn, $sql_query)))
@@ -293,10 +294,10 @@ class student extends benutzer
 			$l->updatevon=(isset($row->updatevon)?$row->updatevon:'');
 			// Studentendaten
 			$l->matrikelnr=$row->matrikelnr;
-			$l->gruppe=$row->gruppe;
-			$l->verband=$row->verband;
-			$l->semester=$row->semester;
-			$l->studiengang_kz=$row->studiengang_kz;
+			$l->gruppe=$row->std_gruppe;
+			$l->verband=$row->std_verband;
+			$l->semester=$row->std_semester;
+			$l->studiengang_kz=$row->std_studiengang_kz;
 			//$l->stg_bezeichnung=$row->bezeichnung;
 			// student in Array speichern
 			$result[]=$l;
diff --git a/rdf/interessentenbewerber.rdf.php b/rdf/interessentenbewerber.rdf.php
new file mode 100644
index 000000000..e5354cfc2
--- /dev/null
+++ b/rdf/interessentenbewerber.rdf.php
@@ -0,0 +1,159 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * 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 für no cache
+header("Cache-Control: no-cache");
+header("Cache-Control: post-check=0, pre-check=0",false);
+header("Expires Mon, 26 Jul 1997 05:00:00 GMT");
+header("Pragma: no-cache");
+// content type setzen
+//header("Content-type: application/vnd.mozilla.xul+xml");
+header("Content-type: application/xhtml+xml");
+// xml
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
+// DAO
+require_once('../vilesci/config.inc.php');
+require_once('../include/functions.inc.php');
+require_once('../include/person.class.php');
+require_once('../include/prestudent.class.php');
+
+// Datenbank Verbindung
+if (!$conn = pg_pconnect(CONN_STRING))
+   	$error_msg='Es konnte keine Verbindung zum Server aufgebaut werden!';
+
+$rdf_url='http://www.technikum-wien.at/interessent';
+$user = get_uid();
+loadVariables($conn, $user);
+?>
+
+<RDF:RDF
+	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:PRESTD="<?php echo $rdf_url; ?>/rdf#"
+>
+
+
+  <RDF:Seq about="<?php echo $rdf_url ?>/alle">
+
+<?php
+if(isset($_GET['studiensemester_kurzbz']))
+	$studiensemester_kurzbz = $_GET['studiensemester_kurzbz'];
+else
+	$studiensemester_kurzbz = null;
+	
+if($studiensemester_kurzbz==null)
+	$studiensemester_kurzbz = $semester_aktuell;
+
+if(isset($_GET['studiengang_kz']) && is_numeric($_GET['studiengang_kz']))
+	$studiengang_kz = $_GET['studiengang_kz'];
+else 
+	$studiengang_kz = null;
+
+if(isset($_GET['semester']) && is_numeric($_GET['semester']))
+	$semester = $_GET['semester'];
+else 
+	$semester = null;
+	
+if(isset($_GET['prestudent_id']) && is_numeric($_GET['prestudent_id']))
+	$prestudent_id=$_GET['prestudent_id'];
+else 
+	$prestudent_id=null;
+
+$prestd = new prestudent($conn, null, true);
+
+if($studiensemester_kurzbz!=null && $studiengang_kz!=null)
+{
+	if($prestd->loadIntessentenUndBewerber($studiensemester_kurzbz, $studiengang_kz, $semester))
+	{
+		foreach ($prestd->result as $row)
+		{
+			DrawInteressent($row);
+		}
+	}
+}
+elseif($prestudent_id!=null)
+{
+	if($prestd->load($prestudent_id))
+		DrawInteressent($prestd);
+	else 
+		echo $prestd->errormsg;	
+}
+else 
+{
+	echo 'Falsche Parameteruebergabe';
+}
+
+function DrawInteressent($row)
+{
+		global $rdf_url;
+?>
+		  <RDF:li>
+	      	<RDF:Description  id="<?php echo $row->prestudent_id; ?>"  about="<?php echo $rdf_url.'/'.$row->prestudent_id; ?>" >
+	        	<PRESTD:person_id><![CDATA[<?php echo $row->person_id; ?>]]></PRESTD:person_id>
+	        	<PRESTD:anrede><![CDATA[<?php echo $row->anrede; ?>]]></PRESTD:anrede>
+	        	<PRESTD:sprache><![CDATA[<?php echo $row->sprache; ?>]]></PRESTD:sprache>
+	        	<PRESTD:staatsbuergerschaft><![CDATA[<?php echo $row->staatsbuergerschaft; ?>]]></PRESTD:staatsbuergerschaft>
+	        	<PRESTD:familienstand><![CDATA[<?php echo $row->familienstand; ?>]]></PRESTD:familienstand>
+	    		<PRESTD:titelpre><![CDATA[<?php echo $row->titelpre; ?>]]></PRESTD:titelpre>
+	    		<PRESTD:titelpost><![CDATA[<?php echo $row->titelpost; ?>]]></PRESTD:titelpost>
+	    		<PRESTD:vornamen><![CDATA[<?php echo $row->vornamen  ?>]]></PRESTD:vornamen>
+	    		<PRESTD:vorname><![CDATA[<?php echo $row->vorname  ?>]]></PRESTD:vorname>
+	    		<PRESTD:nachname><![CDATA[<?php echo $row->nachname  ?>]]></PRESTD:nachname>
+	    		<PRESTD:geburtsdatum><![CDATA[<?php echo $row->gebdatum  ?>]]></PRESTD:geburtsdatum>
+	    		<PRESTD:geburtsdatum_iso><![CDATA[<?php echo $row->gebdatum;  ?>]]></PRESTD:geburtsdatum_iso>
+	    		<PRESTD:geburtsnation><![CDATA[<?php echo $row->geburtsnation; ?>]]></PRESTD:geburtsnation>
+	    		<PRESTD:homepage><![CDATA[<?php echo $row->homepage  ?>]]></PRESTD:homepage>
+	    		<PRESTD:aktiv><![CDATA[<?php echo ($row->aktiv?'true':'false')  ?>]]></PRESTD:aktiv>
+	    		<PRESTD:gebort><![CDATA[<?php echo $row->gebort;  ?>]]></PRESTD:gebort>
+	    		<PRESTD:gebzeit><![CDATA[<?php echo $row->gebzeit;  ?>]]></PRESTD:gebzeit>
+	    		<PRESTD:foto><![CDATA[<?php echo $row->foto;  ?>]]></PRESTD:foto>
+	    		<PRESTD:anmerkungen><![CDATA[<?php echo $row->anmerkungen;  ?>]]></PRESTD:anmerkungen>
+	    		<PRESTD:svnr><![CDATA[<?php echo $row->svnr; ?>]]></PRESTD:svnr>
+	    		<PRESTD:ersatzkennzeichen><![CDATA[<?php echo $row->ersatzkennzeichen; ?>]]></PRESTD:ersatzkennzeichen>
+	    		<PRESTD:geschlecht><![CDATA[<?php echo $row->geschlecht; ?>]]></PRESTD:geschlecht>
+	    		<PRESTD:anzahlkinder><![CDATA[<?php echo $row->anzahlkinder; ?>]]></PRESTD:anzahlkinder>
+	    		<PRESTD:updateamum><![CDATA[<?php echo $row->updateamum;  ?>]]></PRESTD:updateamum>
+	    		<PRESTD:updatevon><![CDATA[<?php echo $row->updatevon;  ?>]]></PRESTD:updatevon>
+	    		
+				<PRESTD:prestudent_id><![CDATA[<?php echo $row->prestudent_id;  ?>]]></PRESTD:prestudent_id>
+				<PRESTD:aufmerksamdurch_kurzbz><![CDATA[<?php echo $row->aufmerksamdurch_kurzbz;  ?>]]></PRESTD:aufmerksamdurch_kurzbz>
+				<PRESTD:studiengang_kz><![CDATA[<?php echo $row->studiengang_kz;  ?>]]></PRESTD:studiengang_kz>
+				<PRESTD:berufstaetigkeit_code><![CDATA[<?php echo $row->berufstaetigkeit_code;  ?>]]></PRESTD:berufstaetigkeit_code>
+				<PRESTD:ausbildungcode><![CDATA[<?php echo $row->ausbildungcode;  ?>]]></PRESTD:ausbildungcode>
+				<PRESTD:zgv_code><![CDATA[<?php echo $row->zgv_code;  ?>]]></PRESTD:zgv_code>
+				<PRESTD:zgvort><![CDATA[<?php echo $row->zgvort;  ?>]]></PRESTD:zgvort>
+				<PRESTD:zgvdatum><![CDATA[<?php echo $row->zgvdatum;  ?>]]></PRESTD:zgvdatum>
+				<PRESTD:zgvmas_code><![CDATA[<?php echo $row->zgvmas_code;  ?>]]></PRESTD:zgvmas_code>
+				<PRESTD:zgvmaort><![CDATA[<?php echo $row->zgvmaort;  ?>]]></PRESTD:zgvmaort>
+				<PRESTD:zgvmadatum><![CDATA[<?php echo $row->zgvmadatum;  ?>]]></PRESTD:zgvmadatum>
+				<PRESTD:aufnahmeschluessel><![CDATA[<?php echo $row->aufnahmeschluessel;  ?>]]></PRESTD:aufnahmeschluessel>
+				<PRESTD:facheinschlberuf><![CDATA[<?php echo ($row->facheinschlberuf?'true':'false');  ?>]]></PRESTD:facheinschlberuf>
+				<PRESTD:reihungstest_id><![CDATA[<?php echo $row->reihungstest_id;  ?>]]></PRESTD:reihungstest_id>
+				<PRESTD:anmeldungreihungstest><![CDATA[<?php echo $row->anmeldungreihungstest;  ?>]]></PRESTD:anmeldungreihungstest>
+				<PRESTD:reihungstestangetreten><![CDATA[<?php echo ($row->reihungstestangetreten?'true':'false');  ?>]]></PRESTD:reihungstestangetreten>
+				<PRESTD:punkte><![CDATA[<?php echo $row->punkte;  ?>]]></PRESTD:punkte>
+				<PRESTD:bismelden><![CDATA[<?php echo ($row->bismelden?'true':'false');  ?>]]></PRESTD:bismelden>
+	      	</RDF:Description>
+	      </RDF:li>
+<?php
+}
+?>
+  </RDF:Seq>
+</RDF:RDF>
\ No newline at end of file
diff --git a/rdf/prestudent.rdf.php b/rdf/prestudent.rdf.php
index 741c09db5..d41b884c2 100644
--- a/rdf/prestudent.rdf.php
+++ b/rdf/prestudent.rdf.php
@@ -54,7 +54,7 @@ $rdf_url='http://www.technikum-wien.at/prestudent';
 if(isset($_GET['prestudent_id']) && is_numeric($_GET['prestudent_id']))
 {
 	$prestd = new prestudent($conn, null, true);
-	$prestd->load($_GET['prestudent_id']);
+	//$prestd->load($_GET['prestudent_id']);
 	if($prestd->load($_GET['prestudent_id']))
 	{
 ?>
diff --git a/vilesci/personen/import/interessentenimport.php b/vilesci/personen/import/interessentenimport.php
new file mode 100644
index 000000000..3f47350b6
--- /dev/null
+++ b/vilesci/personen/import/interessentenimport.php
@@ -0,0 +1,192 @@
+<?php
+/* Copyright (C) 2007 Technikum-Wien
+ *
+ * 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>.
+ */
+
+require_once('../../config.inc.php');
+require_once('../../../include/functions.inc.php');
+require_once('../../../include/benutzerberechtigung.class.php');
+require_once('../../../include/studiengang.class.php');
+require_once('../../../include/person.class.php');
+require_once('../../../include/prestudent.class.php');
+
+if(!$conn=pg_pconnect(CONN_STRING))
+	die('Fehler beim Herstellen der DB Connection');
+      
+$user=get_uid();
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link href="../../../skin/cis.css" rel="stylesheet" type="text/css">
+<script language="Javascript">
+function disablefields(obj)
+{
+	if(obj.value==0)
+		val=false;
+	else
+		val=true;
+		
+	document.getElementById('titel').disabled=val;
+	document.getElementById('nachname').disabled=val;
+	document.getElementById('vorname').disabled=val;
+	document.getElementById('geschlecht').disabled=val;
+	document.getElementById('geburtsdatum').disabled=val;
+	document.getElementById('adresse').disabled=val;
+	document.getElementById('plz').disabled=val;
+	document.getElementById('ort').disabled=val;	
+}
+
+</script>
+</head>
+<body>
+<h1>Prestudent Anlegen</h1>
+<?php
+$rechte = new benutzerberechtigung($conn);
+$rechte->getBerechtigungen($user);
+
+if(!$rechte->isBerechtigt('admin'))
+	die('Sie haben keine Berechtigung fuer diese Seite');
+	
+$where = '';
+//Parameter
+$geburtsdatum = (isset($_POST['geburtsdatum'])?$_POST['geburtsdatum']:'');
+$titel = (isset($_POST['titel'])?$_POST['titel']:'');	
+$nachname = (isset($_POST['nachname'])?$_POST['nachname']:'');
+$vorname = (isset($_POST['vorname'])?$_POST['vorname']:'');
+$geschlecht = (isset($_POST['geschlecht'])?$_POST['geschlecht']:'');
+$geburtsdatum = (isset($_POST['geburtsdatum'])?$_POST['geburtsdatum']:'');
+$adresse = (isset($_POST['adresse'])?$_POST['adresse']:'');
+$plz = (isset($_POST['plz'])?$_POST['plz']:'');
+$ort = (isset($_POST['ort'])?$_POST['ort']:'');
+$email = (isset($_POST['email'])?$_POST['email']:'');
+$telefon = (isset($_POST['telefon'])?$_POST['telefon']:'');
+$mobil = (isset($_POST['mobil'])?$_POST['mobil']:'');
+$letzteausbildung = (isset($_POST['letzteausbildung'])?$_POST['letzteausbildung']:'');
+$ausbildungsart = (isset($_POST['ausbildungsart'])?$_POST['ausbildungsart']:'');
+$anmerkungen = (isset($_POST['anmerkungen'])?$_POST['anmerkungen']:'');
+$studiengang_kz = (isset($_POST['studiengang_kz'])?$_POST['studiengang_kz']:'');
+$person_id = (isset($_POST['person_id'])?$_POST['person_id']:'');
+//end Parameter
+
+
+//Speichern der Daten
+if(isset($_POST['save']))
+{
+	
+}
+?>
+<form method='POST'>
+<table width="100%">
+
+<tr>
+<td>
+<!--Formularfelder-->
+<table>
+<?php
+echo '<tr><tr><td>Titel</td><td><input type="text" id="titel" name="titel" maxlength="64" value="'.$titel.'" /></td></tr>';
+echo '<tr><tr><td>Vorname</td><td><input type="text" id="vorname" maxlength="32" name="vorname" value="'.$vorname.'" /></td></tr>';
+echo '<tr><tr><td>Nachname</td><td><input type="text" maxlength="64" id="nachname" name="nachname" value="'.$nachname.'" /></td></tr>';
+echo '<tr><tr><td>Geschlecht</td><td><SELECT id="geschlecht" name="geschlecht">';
+echo '<OPTION value="m" '.($geschlecht=='m'?'selected':'').'>m&auml;nnlich</OPTION>';
+echo '<OPTION value="w" '.($geschlecht=='w'?'selected':'').'>weiblich</OPTION>';
+echo '</SELECT>';
+echo '</td></tr>';
+echo '<tr><tr><td>Geburtsdatum</td><td><input type="text" id="geburtsdatum" size="10" maxlength="10" name="geburtsdatum" value="'.$geburtsdatum.'" /></td></tr>';
+echo '<tr><tr><td>Adresse</td><td><input type="text" id="adresse" maxlength="256" name="adresse" value="'.$adresse.'" /></td></tr>';
+echo '<tr><tr><td>Postleitzahl</td><td><input type="text" maxlength="16" id="plz" name="plz" value="'.$plz.'" /></td></tr>';
+echo '<tr><tr><td>Ort</td><td><input type="text" id="ort" maxlength="256" name="ort" value="'.$ort.'" /></td></tr>';
+echo '<tr><tr><td>EMail</td><td><input type="text" id="email" maxlength="128" name="email" value="'.$email.'" /></td></tr>';
+echo '<tr><tr><td>Telefon</td><td><input type="text" id="telefon" maxlength="128" name="telefon" value="'.$telefon.'" /></td></tr>';
+echo '<tr><tr><td>Mobil</td><td><input type="text" id="mobil" maxlength="128" name="Mobil" value="'.$mobil.'" /></td></tr>';
+echo '<tr><tr><td>Letzte Ausbildung</td><td><SELECT id="letzteausbildung" name="letzteausbildung">';
+$qry = "SELECT * FROM bis.tbl_ausbildung ORDER BY ausbildungcode";
+if($result = pg_query($conn, $qry))
+{
+	while($row = pg_fetch_object($result))
+	{
+		echo '<OPTION value="'.$row->ausbildungcode.'" '.($letzteausbildung==$row->ausbildungcode?'selected':'').'>'.$row->ausbildungbez.'</OPTION>';
+	}
+}
+echo '</SELECT>';
+echo '</td></tr>';
+echo '<tr><tr><td>Ausbildungsart</td><td><input type="text" id="ausbildungsart" name="ausbildungsart" value="'.$ausbildungsart.'" /></td></tr>';
+echo '<tr><tr><td>Anmerkungen</td><td><textarea id="anmerkung" name="anmerkungen">'.$anmerkungen.'</textarea></td></tr>';
+echo '<tr><tr><td>Studiengang</td><td><SELECT id="studiengang_kz" name="studiengang_kz">';
+$stg_obj = new studiengang($conn);
+$stg_obj->getAll('typ, kurzbz');
+foreach ($stg_obj->result as $row)
+	echo '<OPTION value="'.$row->studiengang_kz.'" '.($row->studiengang_kz==$studiengang_kz?'selected':'').'>'.$row->kuerzel.'</OPTION>';
+echo '</SELECT>';
+echo '</td></tr>';
+echo '<tr><tr><td></td><td>';
+
+if($geburtsdatum=='' && $vorname=='' && $nachname=='')
+	echo '<input type="submit" name="showagain" value="Vorschlag laden"</td></tr>';
+else
+	echo '<input type="submit" name="save" value="Speichern"</td></tr>';
+?>
+
+</table>
+</td>
+<td valign="top">
+<!--Vorschlaege-->
+<?php
+//Vorschlaege laden
+if($geburtsdatum!='')
+{
+	if(ereg("([0-9]{4})-([0-9]{2})-([0-9]{2})",$geburtsdatum))
+	{
+		$where = " gebdatum='".$geburtsdatum."'";
+	}
+}
+
+if($vorname!='' && $nachname!='')
+{
+	if($where!='')
+		$where.=' OR';
+	$where.=" (LOWER(vorname)='".strtolower($vorname)."' AND LOWER(nachname)='".strtolower($nachname)."')";
+}
+
+if($where!='')
+{
+	$qry = "SELECT * FROM public.tbl_person WHERE $where ORDER BY nachname, vorname, gebdatum";
+	if($result = pg_query($conn, $qry))
+	{
+		echo '<table><tr><th></th><th>Nachname</th><th>Vorname</th><th>GebDatum</th><th>SVNR</th></tr>';
+		while($row = pg_fetch_object($result))
+		{
+			echo '<tr><td><input type="radio" name="person_id" value="'.$row->person_id.'" onclick="disablefields(this)"></td><td>'."$row->nachname</td><td>$row->vorname</td><td>$row->gebdatum</td><td>$row->svnr</td></tr>";
+		}
+		echo '<tr><td><input type="radio" name="person_id" value="0" checked onclick="disablefields(this)"></td><td>keiner</td></tr>';
+		echo '</table>';
+	}
+}
+else 
+	echo 'Vorschlag kann nicht erstellt werden';	
+
+?>
+</td>
+</tr>
+</table>
+</form>
+</body>
+</html>
\ No newline at end of file