From 761ead152ffd1100415778d3dc7c22dd3f2c5530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 25 Apr 2007 15:25:48 +0000
Subject: [PATCH] =?UTF-8?q?FAS=20Online:=20Bearbeiten=20der=20PreStudent?=
 =?UTF-8?q?=20Daten=20ist=20nun=20m=C3=B6glich?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/fasoverlay.js.php                    |   1 +
 content/student/studentDBDML.php             |  65 ++++++-
 content/student/studentdetailoverlay.xul.php | 122 +++++++++++--
 content/student/studentoverlay.js.php        | 172 ++++++++++++++++++-
 include/prestudent.class.php                 | 148 ++++++++--------
 include/reihungstest.class.php               |  58 +++++--
 rdf/aufnahmeschluessel.rdf.php               |  77 +++++++++
 rdf/ausbildung.rdf.php                       |  62 +++++++
 rdf/berufstaetigkeit.rdf.php                 |  12 ++
 rdf/lvinfo.rdf.php                           |   2 +-
 rdf/prestudent.rdf.php                       |  88 ++++++++++
 rdf/reihungstest.rdf.php                     |  97 +++++++++++
 rdf/student.rdf.php                          |   1 +
 rdf/zgv.rdf.php                              |  81 +++++++++
 rdf/zgvmaster.rdf.php                        |  81 +++++++++
 15 files changed, 970 insertions(+), 97 deletions(-)
 create mode 100644 rdf/aufnahmeschluessel.rdf.php
 create mode 100644 rdf/ausbildung.rdf.php
 create mode 100644 rdf/prestudent.rdf.php
 create mode 100644 rdf/reihungstest.rdf.php
 create mode 100644 rdf/zgv.rdf.php
 create mode 100644 rdf/zgvmaster.rdf.php

diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php
index 9751caca9..dfa6b4dd8 100644
--- a/content/fasoverlay.js.php
+++ b/content/fasoverlay.js.php
@@ -218,6 +218,7 @@ function onVerbandSelect(event)
 		treeStudent.builder.addListener(StudentTreeListener);
 		StudentDetailReset();
 		StudentDetailDisableFields(true);
+		StudentPrestudentDisableFields(true);
 	}
 	catch(e)
 	{
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 77d1b0f11..189c654a7 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -36,6 +36,7 @@ require_once('../../include/log.class.php');
 require_once('../../include/person.class.php');
 require_once('../../include/benutzer.class.php');
 require_once('../../include/student.class.php');
+require_once('../../include/prestudent.class.php');
 
 $user = get_uid();
 
@@ -103,8 +104,8 @@ if(!$error)
 				$student->matrikelnr = $_POST['matrikelnummer'];
 				$student->studiengang_kz = $_POST['studiengang_kz'];
 				$student->semester = $_POST['semester'];
-				$student->verband = $_POST['verband'];
-				$student->gruppe = $_POST['gruppe'];
+				$student->verband = ($_POST['verband']==''?' ':$_POST['verband']);
+				$student->gruppe = ($_POST['gruppe']==''?' ':$_POST['gruppe']);
 				
 				$student->new=false;				
 
@@ -126,6 +127,66 @@ if(!$error)
 			}
 		}
 	}
+	elseif(isset($_POST['type']) && $_POST['type']=='saveprestudent')
+	{
+		//Studentendaten Speichern
+
+		if(!$error)
+		{
+			$prestudent = new prestudent($conn, null, true);
+			
+			if(!$prestudent->load($_POST['prestudent_id']))
+			{
+				$return = false;
+				$errormsg = 'Fehler beim laden:'.$prestudent->errormsg;
+				$error = true;
+			}
+			
+			if(!$error)
+			{
+				$prestudent->prestudent_id = $_POST['prestudent_id'];
+				$prestudent->aufmerksamdurch_kurzbz = $_POST['aufmerksamdurch_kurzbz'];
+				$prestudent->person_id = $_POST['person_id'];
+				$prestudent->studiengang_kz = $_POST['studiengang_kz'];
+				$prestudent->berufstaetigkeit_code = $_POST['berufstaetigkeit_code'];
+				$prestudent->ausbildungcode = $_POST['ausbildungcode'];
+				$presutdent->zgv_code = $_POST['zgv_code'];
+				$presutdent->zgvort = $_POST['zgvort'];
+				$prestudent->zgvdatum = $_POST['zgvdatum'];
+				$prestudent->zgvmas_code = $_POST['zgvmas_code'];
+				$prestudent->zgvmaort = $_POST['zgvmaort'];
+				$prestudent->zgvmadatum = $_POST['zgvmadatum'];
+				$prestudent->aufnahmeschluessel = $_POST['aufnahmeschluessel'];
+				$prestudent->facheinschlberuf = ($_POST['facheinschlberuf']=='true'?true:false);
+				$prestudent->reihungstest_id = $_POST['reihungstest_id'];
+				$prestudent->anmeldungreihungstest = $_POST['anmeldungreihungstest'];
+				$prestudent->reihungstestangetreten = ($_POST['reihungstestangetreten']=='true'?true:false);
+				$prestudent->punkte = $_POST['punkte'];
+				$prestudent->bismelden = ($_POST['bismelden']=='true'?true:false);
+				//$prestudent->insertamum = date('Y-m-d H:i:s');
+				//$prestudent->insertvon = $user;
+				$prestudent->updateamum = date('Y-m-d H:i:s');
+				$prestudent->updatevon = $user;				
+				$prestudent->new=false;	
+				
+				if(!$error)
+				{
+					if($prestudent->save())
+					{
+						$return = true;
+						$error=false;
+						$data = $prestudent->prestudent_id;
+					}
+					else
+					{
+						$return = false;
+						$errormsg  = $prestudent->errormsg;
+						$error = true;
+					}
+				}
+			}
+		}
+	}
 	else
 	{
 		$return = false;
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index c5b4b19d0..b9e38eb85 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -219,15 +219,19 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 <!-- STUDENT PREStudent -->
 <vbox id="student-prestudent" style="margin:0px;">
 		<hbox style="background:#eeeeee;margin:0px;padding:2px">
-			<label value="Details" style="font-size:12pt;font-weight:bold;margin-top:5px;"  flex="1" />
+			<label value="PreStudent" style="font-size:12pt;font-weight:bold;margin-top:5px;"  flex="1" />
 			<spacer flex="1" />
-			<button id="student-prestudent-button-save" label="Speichern" oncommand="StudentPrestudentSave();" disabled="true"/>
+			<button id="student-prestudent-button-save" label="Speichern" oncommand="StudentPrestudentSave();" disabled="false"/>
 		</hbox>
 		<vbox hidden="true">
 			<label value="Neu"/>
-			<checkbox id="student-prestudent-checkbox-new" checked="true" />      	
+			<checkbox id="student-prestudent-checkbox-new" checked="false" />      	
 			<label value="Person_id"/>
-      		<textbox id="student-prestudent-textbox-person_id" disabled="true"/>					
+      		<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>
 		<hbox flex="1">
 			<grid id="student-prestudent-grid" style="overflow:auto;margin:4px;" flex="1">
@@ -239,7 +243,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
   					<rows>
   						<row>
       						<label value="Aufmerksam durch" control="student-prestudent-menulist-aufmerksamdurch"/>
-      						<menulist id="student-prestudent-menulist-aufmerksamdurch" disabled="false"
+      						<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>
@@ -253,12 +257,12 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
     					</row>
     					<row>
       						<label value="Berufstaetigkeit" control="student-prestudent-menulist-berufstaetigkeit"/>
-      						<menulist id="student-prestudent-menulist-berufstaetigkeit" disabled="false"
-							          datasources="<?php echo APP_ROOT ?>rdf/berufstaetigkeit.rdf.php" flex="1"
+      						<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#bezeichnung"
+										<menuitem value="rdf:http://www.technikum-wien.at/berufstaetigkeit/rdf#code"
 							        		      label="rdf:http://www.technikum-wien.at/berufstaetigkeit/rdf#bezeichnung"
 										  		  uri="rdf:*"/>
 										</menupopup>
@@ -267,18 +271,110 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
     					</row>
 						<row>
       						<label value="Ausbildung" control="student-prestudent-menulist-ausbildung"/>
-      						<menulist id="student-prestudent-menulist-berufstaetigkeit" disabled="false"
-							          datasources="<?php echo APP_ROOT ?>rdf/berufstaetigkeit.rdf.php" flex="1"
-						              ref="http://www.technikum-wien.at/berufstaetigkeit/alle" >
+      						<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/berufstaetigkeit/rdf#bezeichnung"
-							        		      label="rdf:http://www.technikum-wien.at/berufstaetigkeit/rdf#bezeichnung"
+										<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="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>
+    					</row>
+    					<row>
+      						<label value="ZGV Ort" control="student-prestudent-textbox-zgvort"/>
+      						<textbox id="student-prestudent-textbox-zgvort" disabled="true" maxlength="64"/>
+    					</row>
+    					<row>
+      						<label value="ZGV Datum" control="student-prestudent-textbox-zgvdatum"/>
+      						<textbox id="student-prestudent-textbox-zgvdatum" disabled="true" maxlength="10"/>
+    					</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>
+    					</row>
+    					<row>
+      						<label value="ZGV Master Ort" control="student-prestudent-textbox-zgvmasterort"/>
+      						<textbox id="student-prestudent-textbox-zgvmasterort" disabled="true" maxlength="64"/>
+    					</row>
+    					<row>
+      						<label value="ZGV Master Datum" control="student-prestudent-textbox-zgvmasterdatum"/>
+      						<textbox id="student-prestudent-textbox-zgvmasterdatum" disabled="true" maxlength="10"/>
+    					</row>
+    					<row>
+      						<label value="Aufnahmeschluessel" control="student-prestudent-menulist-aufnahmeschluessel"/>
+      						<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" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/aufnahmeschluessel/rdf#aufnahmeschluessel"
+							        		      label="rdf:http://www.technikum-wien.at/aufnahmeschluessel/rdf#aufnahmeschluessel"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+    					</row>
+    					<row>
+      						<label value="Facheinschlaegig berufstaetig" control="student-prestudent-checkbox-facheinschlberuf"/>
+      						<checkbox id="student-prestudent-checkbox-facheinschlberuf" checked="true" disabled="true"/>
+    					</row>
+    					<row>
+      						<label value="Reihungstest" control="student-prestudent-menulist-reihungstest"/>
+      						<menulist id="student-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="Anmeldung zum Reihungstest am" control="student-prestudent-textbox-anmeldungreihungstest"/>
+      						<textbox id="student-prestudent-textbox-anmeldungreihungstest" disabled="true" maxlength="10"/>
+    					</row>
+    					<row>
+      						<label value="Zum Reihungstest angetreten" control="student-prestudent-checkbox-reihungstestangetreten"/>
+      						<checkbox id="student-prestudent-checkbox-reihungstestangetreten" checked="true" disabled="true"/>
+    					</row>
+    					<row>
+      						<label value="Reihungstestpunkte" control="student-prestudent-textbox-punkte"/>
+      						<textbox id="student-prestudent-textbox-punkte" disabled="true" maxlength="19"/>
+    					</row>
+    					<row>
+      						<label value="Bismelden" control="student-prestudent-checkbox-bismelden"/>
+      						<checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
+    					</row>
 				</rows>
 			</grid>
 		</hbox>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index ed9043372..dfb6af8f5 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -334,7 +334,10 @@ function StudentDetailSave()
 	
 	if (!val.dbdml_return)
 	{
-		alert(val.dbdml_errormsg)
+		if(val.dbdml_errormsg=='')
+			alert(response)
+		else
+			alert(val.dbdml_errormsg)
 	}
 	else
 	{
@@ -382,6 +385,7 @@ function StudentAuswahl()
 			//Student wurde markiert
 			//loeschen button aktivieren
 			StudentDetailDisableFields(false);
+			StudentPrestudentDisableFields(false);
 			document.getElementById('student-detail-button-save').disabled=false;
 		}
 		else
@@ -446,6 +450,7 @@ function StudentAuswahl()
 	semester=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#semester" ));
 	verband=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#verband" ));
 	gruppe=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#gruppe" ));
+	prestudent_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#prestudent_id" ));
 	
 	//Daten den Feldern zuweisen
 
@@ -480,4 +485,169 @@ function StudentAuswahl()
 	document.getElementById('student-detail-textbox-semester').value=semester;
 	document.getElementById('student-detail-textbox-verband').value=verband;
 	document.getElementById('student-detail-textbox-gruppe').value=gruppe;
+	
+	//PreStudent Daten holen
+	var url = '<?php echo APP_ROOT ?>rdf/prestudent.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/prestudent/" + prestudent_id);
+
+	var predicateNS = "http://www.technikum-wien.at/prestudent/rdf";
+
+	//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('student-prestudent-menulist-aufmerksamdurch').value=aufmerksamdurch_kurzbz;
+	document.getElementById('student-prestudent-menulist-berufstaetigkeit').value=berufstaetigkeit_code;
+	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-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-textbox-zgvmasterdatum').value=zgvmasterdatum;
+	document.getElementById('student-prestudent-menulist-aufnahmeschluessel').value=aufnahmeschluessel;
+	if(facheinschlberuf=='true')
+		document.getElementById('student-prestudent-checkbox-facheinschlberuf').checked=true;
+	else
+		document.getElementById('student-prestudent-checkbox-facheinschlberuf').checked=false;
+	document.getElementById('student-prestudent-menulist-reihungstest').value=reihungstest_id;
+	document.getElementById('student-prestudent-textbox-anmeldungreihungstest').value=anmeldungreihungstest;
+	if(reihungstestangetreten=='true')
+		document.getElementById('student-prestudent-checkbox-reihungstestangetreten').checked=true;
+	else
+		document.getElementById('student-prestudent-checkbox-reihungstestangetreten').checked=false;
+	document.getElementById('student-prestudent-textbox-punkte').value=punkte;
+	
+	if(bismelden=='true')
+		document.getElementById('student-prestudent-checkbox-bismelden').checked=true;
+	else
+		document.getElementById('student-prestudent-checkbox-bismelden').checked=false;
+		
+	document.getElementById('student-prestudent-textbox-person_id').value=person_id;
+	document.getElementById('student-prestudent-textbox-prestudent_id').value=prestudent_id;
+	document.getElementById('student-prestudent-checkbox-new').checked=false;
+	document.getElementById('student-prestudent-textbox-studiengang_kz').value=studiengang_kz;
+}
+
+// ****
+// * De-/Aktiviert die Prestudent Felder
+// ****
+function StudentPrestudentDisableFields(val)
+{
+	document.getElementById('student-prestudent-menulist-aufmerksamdurch').disabled=val;
+	document.getElementById('student-prestudent-menulist-berufstaetigkeit').disabled=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-textbox-zgvdatum').disabled=val;
+	document.getElementById('student-prestudent-menulist-zgvmastercode').disabled=val;
+	document.getElementById('student-prestudent-textbox-zgvmasterort').disabled=val;
+	document.getElementById('student-prestudent-textbox-zgvmasterdatum').disabled=val;
+	document.getElementById('student-prestudent-menulist-aufnahmeschluessel').disabled=val;
+	document.getElementById('student-prestudent-checkbox-facheinschlberuf').disabled=val;
+	document.getElementById('student-prestudent-menulist-reihungstest').disabled=val;
+	document.getElementById('student-prestudent-textbox-anmeldungreihungstest').disabled=val;
+	document.getElementById('student-prestudent-checkbox-reihungstestangetreten').disabled=val;
+	document.getElementById('student-prestudent-textbox-punkte').disabled=val;
+	document.getElementById('student-prestudent-checkbox-bismelden').disabled=val;
+}
+
+// ****
+// * Speichert die Prestudent Daten
+// ****
+function StudentPrestudentSave()
+{
+	aufmerksamdurch_kurzbz = document.getElementById('student-prestudent-menulist-aufmerksamdurch').value;
+	berufstaetigkeit_code = document.getElementById('student-prestudent-menulist-berufstaetigkeit').value;
+	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;
+	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;
+	zgvmasterdatum = document.getElementById('student-prestudent-textbox-zgvmasterdatum').value;
+	aufnahmeschluessel = document.getElementById('student-prestudent-menulist-aufnahmeschluessel').value;
+	facheinschlberuf = document.getElementById('student-prestudent-checkbox-facheinschlberuf').checked;
+	reihungstest_id = document.getElementById('student-prestudent-menulist-reihungstest').value;
+	anmeldungreihungstest = document.getElementById('student-prestudent-textbox-anmeldungreihungstest').value;
+	reihungstestangetreten = document.getElementById('student-prestudent-checkbox-reihungstestangetreten').checked;
+	punkte = document.getElementById('student-prestudent-textbox-punkte').value;
+	bismelden = document.getElementById('student-prestudent-checkbox-bismelden').checked;
+	person_id = document.getElementById('student-prestudent-textbox-person_id').value;
+	prestudent_id = document.getElementById('student-prestudent-textbox-prestudent_id').value;
+	neu = document.getElementById('student-prestudent-checkbox-new').checked;
+	studiengang_kz = document.getElementById('student-prestudent-textbox-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");
+				
+		StudentSelectUid=val.dbdml_data;
+		StudentTreeDatasource.Refresh(false); //non blocking
+		SetStatusBarText('Daten wurden gespeichert');
+	}
 }
\ No newline at end of file
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 7860de93a..9005c95c4 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -38,11 +38,12 @@ class prestudent extends person
 	var $facheinschlberuf;
 	var $anmeldungreihungstest;
 	var $reihungstestangetreten;
+	var $reihungstest_id;
 	var $punkte;
-	var $bismelden;
-	
-	// ErgebnisArray
-	var $result=array();
+	var $bismelden;
+	
+	// ErgebnisArray
+	var $result=array();
 	var $num_rows=0;
 		
 	// *************************************************************************
@@ -52,7 +53,7 @@ class prestudent extends person
 	// *        $unicode     	Gibt an ob die Daten mit UNICODE Codierung 
 	// *                     	oder LATIN9 Codierung verarbeitet werden sollen
 	// *************************************************************************
-	function benutzer($conn, $prestudent_id=null, $unicode=false)
+	function prestudent($conn, $prestudent_id=null, $unicode=false)
 	{
 		$this->conn = $conn;
 		
@@ -94,11 +95,14 @@ class prestudent extends person
 				$this->zgvmaort = $row->zgvmaort;
 				$this->zgvmadatum = $row->zgvmadatum;
 				$this->aufnahmeschluessel = $row->aufnahmeschluessel;
-				$this->facheinschlberuf = $row->facheinschlberuf;
+				$this->facheinschlberuf = ($row->facheinschlberuf=='t'?true:false);
 				$this->anmeldungreihungstest = $row->anmeldungreihungstest;
-				$this->reihungstestangetreten = $row->reihungstestangetreten;
+				$this->reihungstestangetreten = ($row->reihungstestangetreten=='t'?true:false);
+				$this->reihungstest_id = $row->reihungstest_id;
 				$this->punkte = $row->punkte;
-				$this->bismelden = $row->bismelden;
+				$this->bismelden = ($row->bismelden=='t'?true:false);
+				$this->person_id = $row->person_id;
+				
 				if(!person::load($row->person_id))
 					return false;
 				else 
@@ -124,31 +128,6 @@ class prestudent extends person
 	// *******************************************
 	function validate()
 	{
-		if(strlen($this->uid)>16)
-		{
-			$this->errormsg = 'UID darf nicht laenger als 16 Zeichen sein';
-			return false;
-		}
-		if($this->uid == '')
-		{
-			$this->errormsg = 'UID muss eingegeben werden '.$this->uid;
-			return false;
-		}
-		if(strlen($this->alias)>256)
-		{
-			$this->errormsg = 'Alias darf nicht laenger als 256 Zeichen sein';
-			return false;
-		}
-		if(!is_numeric($this->person_id))
-		{
-			$this->errormsg = 'person_id muss eine gueltige Zahl sein';
-			return false;
-		}
-		if(!is_bool($this->aktiv))
-		{
-			$this->errormsg = 'aktiv muss ein boolscher wert sein';
-			return false;
-		}
 		return true;
 	}
 	
@@ -161,34 +140,65 @@ class prestudent extends person
 	function save()
 	{
 		//Personen Datensatz speichern
-		if(!person::save())
-			return false;
+		//if(!person::save())
+		//	return false;
 			
 		//Variablen auf Gueltigkeit pruefen
-		if(!benutzer::validate())
+		if(!prestudent::validate())
 			return false;
 		
 		if($this->new) //Wenn new true ist dann ein INSERT absetzen ansonsten ein UPDATE
 		{
-			$qry = 'INSERT INTO public.tbl_benutzer (uid, aktiv, alias, person_id, insertamum, insertvon, updateamum, updatevon) VALUES('.
-			       "'".addslashes($this->uid)."',".
-			       ($this->aktiv?'true':'false').','.
-			       $this->addslashes($this->alias).",'".
-			       $this->person_id."',".
+			$qry = 'INSERT INTO public.tbl_prestudent (aufmerksamdurch_kurzbz, person_id, studiengang_kz, berufstaetigkeit_code, ausbildungcode, zgv_code, zgvort, zgvdatum, zgvmas_code, zgvmaort, zgvmadatum, aufnahmeschluessel, facheinschlberuf, reihungstest_id, anmeldungreihungstest, reihungstestangetreten, punkte, bismelden, insertamum, insertvon, updateamum, updatevon, ext_id) VALUES('.
+			       $this->addslashes($this->aufmerksamdurch_kurzbz).",".
+			       $this->addslashes($this->person_id).",".
+			       $this->addslashes($this->studiengang_kz).",".
+			       $this->addslashes($this->berufstaetigkeit_code).",".
+			       $this->addslashes($this->ausbildungcode).",".
+			       $this->addslashes($this->zgv_code).",".
+			       $this->addslashes($this->zgvort).",".
+			       $this->addslashes($this->zgvdatum).",".
+			       $this->addslashes($this->zgvmas_code).",".
+			       $this->addslashes($this->zgvmaort).",".
+			       $this->addslashes($this->zgvmadatum).",".
+			       $this->addslashes($this->aufnahmeschluessel).",".
+			       ($this->facheinschlberuf?'true':'false').",".
+			       $this->addslashes($this->reihungstest_id).",".
+			       $this->addslashes($this->anmeldungreihungstest).",".
+			       ($this->reihungstestangetreten?'true':'false').",".
+			       $this->addslashes($this->punkte).",".
+			       ($this->bismelden?'true':'false').",".
 			       $this->addslashes($this->insertamum).",".
 			       $this->addslashes($this->insertvon).",".
 			       $this->addslashes($this->updateamum).",".
-			       $this->addslashes($this->updatevon).");";
+			       $this->addslashes($this->updatevon).",".
+			       $this->addslashes($this->ext_id).");";
 		}
 		else
 		{			
-			$qry = 'UPDATE public.tbl_benutzer SET'.
-			       ' aktiv='.($this->aktiv?'true':'false').','.
-			       ' alias='.$this->addslashes($this->alias).','.
-			       " person_id='".$this->person_id."',".
-			       ' updateamum='.$this->addslashes($this->updateamum).','.
-			       ' updatevon='.$this->addslashes($this->updatevon).
-			       " WHERE uid='".addslashes($this->uid)."';";
+			$qry = 'UPDATE public.tbl_prestudent SET'.
+			       ' aufmerksamdurch_kurzbz='.$this->addslashes($this->aufmerksamdurch_kurzbz).",".
+			       ' person_id='.$this->addslashes($this->person_id).",".
+			       ' studiengang_kz='.$this->addslashes($this->studiengang_kz).",".
+			       ' berufstaetigkeit_code='.$this->addslashes($this->berufstaetigkeit_code).",".
+			       ' ausbildungcode='.$this->addslashes($this->ausbildungcode).",".
+			       ' zgv_code='.$this->addslashes($this->zgv_code).",".
+			       ' zgvort='.$this->addslashes($this->zgvort).",".
+			       ' zgvdatum='.$this->addslashes($this->zgvdatum).",".
+			       ' zgvmas_code='.$this->addslashes($this->zgvmas_code).",".
+			       ' zgvmaort='.$this->addslashes($this->zgvmaort).",".
+			       ' zgvmadatum='.$this->addslashes($this->zgvmadatum).",".
+			       ' aufnahmeschluessel='.$this->addslashes($this->aufnahmeschluessel).",".
+			       ' facheinschlberuf='.($this->facheinschlberuf?'true':'false').",".
+			       ' reihungstest_id='.$this->addslashes($this->reihungstest_id).",".
+			       ' anmeldungreihungstest='.$this->addslashes($this->anmeldungreihungstest).",".
+			       ' reihungstestangetreten='.($this->reihungstestangetreten?'true':'false').",".
+			       ' punkte='.$this->addslashes($this->punkte).",".
+			       ' bismelden='.($this->bismelden?'true':'false').",".
+			       ' updateamum='.$this->addslashes($this->updateamum).",".
+			       ' updatevon='.$this->addslashes($this->updatevon).",".
+			       ' ext_id='.$this->addslashes($this->ext_id).
+			       " WHERE prestudent_id='".addslashes($this->prestudent_id)."';";
 		}
 		
 		if(pg_query($this->conn,$qry))
@@ -198,34 +208,34 @@ class prestudent extends person
 		}
 		else 
 		{	
-			$this->errormsg = 'Fehler beim Speichern des Benutzer-Datensatzes:'.$qry;
+			$this->errormsg = 'Fehler beim Speichern des Prestudent-Datensatzes:'.$qry;
 			return false;
 		}
-	}
-
+	}
+
 	// ******************************************************************
 	// * Laden aller Prestudenten, die an $datum zum Reihungstest geladen sind.
 	// * Wenn $equal auf true gesetzt ist wird genau dieses Datum verwendet,
 	// * ansonsten werden auch alle mit späterem Datum geladen.
 	// * @return true wenn erfolgreich, false im Fehlerfall
-	// ******************************************************************	
-	function getPrestudentRT($datum, $equal=false)
-	{
-		$sql_query='SELECT DISTINCT * FROM public.vw_prestudent WHERE rt_datum';
-		if ($equal)
-			$sql_query.='=';
-		else
-			$sql_query.='>=';
-		$sql_query.="'$datum' ORDER BY nachname,vorname";
-		
+	// ******************************************************************	
+	function getPrestudentRT($datum, $equal=false)
+	{
+		$sql_query='SELECT DISTINCT * FROM public.vw_prestudent WHERE rt_datum';
+		if ($equal)
+			$sql_query.='=';
+		else
+			$sql_query.='>=';
+		$sql_query.="'$datum' ORDER BY nachname,vorname";
+		
 		if(!$result=pg_query($this->conn,$sql_query))
 		{	
 			$this->errormsg = 'Fehler beim Speichern des Benutzer-Datensatzes:'.$sql_query;
 			return false;
-		}
-		
-		$this->num_rows=0;
-		
+		}
+		
+		$this->num_rows=0;
+		
 		while($row = pg_fetch_object($result))
 		{
 			$ps=new prestudent($this->conn);
@@ -278,10 +288,10 @@ class prestudent extends person
 			$ps->insertamum = $row->insertamum;
 			$ps->insertvon = $row->insertvon;
 			$ps->ext_id = $row->ext_id;
-			$this->result[]=$ps;
+			$this->result[]=$ps;
 			$this->num_rows++; 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	 	
 		}	
-		
+		
 	}
 }
-?>
+?>
diff --git a/include/reihungstest.class.php b/include/reihungstest.class.php
index fad7ea26a..2f0050b75 100644
--- a/include/reihungstest.class.php
+++ b/include/reihungstest.class.php
@@ -30,6 +30,7 @@ class reihungstest
 	var $new;       // @var boolean
 	var $errormsg;  // @var string
 	var $done=false;	// @var boolean
+	var $result = array();
 	
 	//Tabellenspalten
 	Var $reihungstest_id;	// @var integer
@@ -52,18 +53,21 @@ class reihungstest
 	function reihungstest($conn,$reihungstest_id=null, $unicode=false)
 	{
 		$this->conn = $conn;
-		if ($unicode)
+		if($unicode!=null)
 		{
-			$qry = "SET CLIENT_ENCODING TO 'UNICODE';";
-		}
-		else 
-		{
-			$qry="SET CLIENT_ENCODING TO 'LATIN9';";
-		}
-		if(!pg_query($conn,$qry))
-		{
-			$this->errormsg	 = "Encoding konnte nicht gesetzt werden";
-			return false;
+			if ($unicode)
+			{
+				$qry = "SET CLIENT_ENCODING TO 'UNICODE';";
+			}
+			else 
+			{
+				$qry="SET CLIENT_ENCODING TO 'LATIN9';";
+			}
+			if(!pg_query($conn,$qry))
+			{
+				$this->errormsg	 = "Encoding konnte nicht gesetzt werden";
+				return false;
+			}
 		}
 	}
 	
@@ -77,6 +81,38 @@ class reihungstest
 		//noch nicht implementiert
 	}
 	
+	function getAll()
+	{
+		$qry = "SELECT * FROM public.tbl_reihungstest ORDER BY studiengang_kz, datum, uhrzeit";
+		if($result = pg_query($this->conn, $qry))
+		{
+			while($row = pg_fetch_object($result))
+			{
+				$obj = new reihungstest($this->conn, null, null);
+				
+				$obj->reihungstest_id = $row->reihungstest_id;
+				$obj->studiengang_kz = $row->studiengang_kz;
+				$obj->ort_kurzbz = $row->ort_kurzbz;
+				$obj->anmerkung = $row->anmerkung;
+				$obj->datum = $row->datum;
+				$obj->uhrzeit = $row->uhrzeit;
+				$obj->ext_id = $row->ext_id;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+				$obj->updateamum = $row->updateamum;
+				$obj->updatevon = $row->updatevon;
+				
+				$this->result[] = $obj;
+			}
+			return true;
+		}
+		else 
+		{
+			$this->errormsg = 'Fehler beim Laden der Reihungstests';
+			return false;
+		}
+	}
+	
 	// ************************************************
 	// * wenn $var '' ist wird "null" zurueckgegeben
 	// * wenn $var !='' ist werden datenbankkritische 
diff --git a/rdf/aufnahmeschluessel.rdf.php b/rdf/aufnahmeschluessel.rdf.php
new file mode 100644
index 000000000..ef20a7705
--- /dev/null
+++ b/rdf/aufnahmeschluessel.rdf.php
@@ -0,0 +1,77 @@
+<?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");
+// xml
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
+// DAO
+require_once('../vilesci/config.inc.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/aufnahmeschluessel';
+
+?>
+
+<RDF:RDF
+	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:AS="<?php echo $rdf_url; ?>/rdf#"
+>
+
+
+  <RDF:Seq about="<?php echo $rdf_url ?>/alle">
+
+<?php
+if(isset($_GET['optional']) && $_GET['optional']=='true')
+{
+	echo '
+	  <RDF:li>
+      	<RDF:Description  id=""  about="'.$rdf_url.'/" >
+        	<AS:aufnahmeschluessel>-- keine Auswahl --</AS:aufnahmeschluessel>
+      	</RDF:Description>
+      </RDF:li>
+';
+}
+$qry = "SET CLIENT_ENCODING to 'UNICODE'; SELECT * FROM public.tbl_aufnahmeschluessel ORDER BY aufnahmeschluessel";
+if($result = pg_query($conn, $qry))
+{
+	while($row = pg_fetch_object($result))
+	{
+?>
+	  <RDF:li>
+      	<RDF:Description  id="<?php echo $row->aufnahmeschluessel; ?>"  about="<?php echo $rdf_url.'/'.$row->aufnahmeschluessel; ?>" >
+        	<AS:aufnahmeschluessel><![CDATA[<?php echo $row->aufnahmeschluessel;  ?>]]></AS:aufnahmeschluessel>
+      	</RDF:Description>
+      </RDF:li>
+<?php
+	}
+}
+?>
+  </RDF:Seq>
+</RDF:RDF>
\ No newline at end of file
diff --git a/rdf/ausbildung.rdf.php b/rdf/ausbildung.rdf.php
new file mode 100644
index 000000000..1446dce92
--- /dev/null
+++ b/rdf/ausbildung.rdf.php
@@ -0,0 +1,62 @@
+<?php
+
+// 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");
+// xml
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
+// DAO
+require_once('../vilesci/config.inc.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/ausbildung';
+
+?>
+
+<RDF:RDF
+	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:BT="<?php echo $rdf_url; ?>/rdf#"
+>
+
+
+  <RDF:Seq about="<?php echo $rdf_url ?>/alle">
+
+<?php
+if(isset($_GET['optional']) && $_GET['optional']=='true')
+{
+	echo '
+	  <RDF:li>
+      	<RDF:Description  id=""  about="'.$rdf_url.'/" >
+        	<BT:code></BT:code>
+        	<BT:bezeichnung>-- keine Auswahl --</BT:bezeichnung>
+        	<BT:beschreibung>-- keine Auswahl --</BT:beschreibung>
+      	</RDF:Description>
+      </RDF:li>	
+';
+}
+$qry = "SET CLIENT_ENCODING to 'UNICODE'; SELECT * FROM bis.tbl_ausbildung ORDER BY ausbildungbez";
+if($result = pg_query($conn, $qry))
+{
+	while($row = pg_fetch_object($result))
+	{
+?>
+	  <RDF:li>
+      	<RDF:Description  id="<?php echo $row->ausbildungcode; ?>"  about="<?php echo $rdf_url.'/'.$row->ausbildungcode; ?>" >
+        	<BT:code><![CDATA[<?php echo $row->ausbildungcode;  ?>]]></BT:code>
+        	<BT:bezeichnung><![CDATA[<?php echo $row->ausbildungbez; ?>]]></BT:bezeichnung>
+        	<BT:beschreibung><![CDATA[<?php echo $row->ausbildungbeschreibung; ?>]]></BT:beschreibung>
+      	</RDF:Description>
+      </RDF:li>
+<?php
+	}
+}
+?>
+  </RDF:Seq>
+</RDF:RDF>
\ No newline at end of file
diff --git a/rdf/berufstaetigkeit.rdf.php b/rdf/berufstaetigkeit.rdf.php
index 8c7c5d31d..efb15f660 100644
--- a/rdf/berufstaetigkeit.rdf.php
+++ b/rdf/berufstaetigkeit.rdf.php
@@ -29,6 +29,18 @@ $rdf_url='http://www.technikum-wien.at/berufstaetigkeit';
   <RDF:Seq about="<?php echo $rdf_url ?>/alle">
 
 <?php
+if(isset($_GET['optional']) && $_GET['optional']=='true')
+{
+echo '	
+	  <RDF:li>
+      	<RDF:Description  id=""  about="'.$rdf_url.'/'.'" >
+        	<BT:code></BT:code>
+        	<BT:bezeichnung>-- keine Auswahl --</BT:bezeichnung>
+        	<BT:kurzbz>-- keine Auswahl --</BT:kurzbz>
+      	</RDF:Description>
+      </RDF:li>
+';
+}
 $qry = "SET CLIENT_ENCODING to 'UNICODE'; SELECT * FROM bis.tbl_berufstaetigkeit ORDER BY berufstaetigkeit_bez";
 if($result = pg_query($conn, $qry))
 {
diff --git a/rdf/lvinfo.rdf.php b/rdf/lvinfo.rdf.php
index 57bb7bd2f..27f8f62ac 100644
--- a/rdf/lvinfo.rdf.php
+++ b/rdf/lvinfo.rdf.php
@@ -29,7 +29,7 @@ header("Content-type: application/vnd.mozilla.xul+xml");
 // xml
 echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 // DAO
-require_once('../vilesci/config.inc.php');
+require_once('../cis/config.inc.php');
 
 // Datenbank Verbindung
 if (!$conn = pg_pconnect(CONN_STRING))
diff --git a/rdf/prestudent.rdf.php b/rdf/prestudent.rdf.php
new file mode 100644
index 000000000..f196db432
--- /dev/null
+++ b/rdf/prestudent.rdf.php
@@ -0,0 +1,88 @@
+<?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");
+// xml
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
+// DAO
+require_once('../vilesci/config.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/prestudent';
+
+?>
+
+<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['prestudent_id']) && is_numeric($_GET['prestudent_id']))
+{
+	$prestd = new prestudent($conn, null, true);
+	$prestd->load($_GET['prestudent_id']);
+	if($prestd->load($_GET['prestudent_id']))
+	{
+?>
+		  <RDF:li>
+	      	<RDF:Description  id="<?php echo $prestd->prestudent_id; ?>"  about="<?php echo $rdf_url.'/'.$prestd->prestudent_id; ?>" >
+				<PRESTD:prestudent_id><![CDATA[<?php echo $prestd->prestudent_id;  ?>]]></PRESTD:prestudent_id>
+				<PRESTD:aufmerksamdurch_kurzbz><![CDATA[<?php echo $prestd->aufmerksamdurch_kurzbz;  ?>]]></PRESTD:aufmerksamdurch_kurzbz>
+				<PRESTD:person_id><![CDATA[<?php echo $prestd->person_id;  ?>]]></PRESTD:person_id>
+				<PRESTD:studiengang_kz><![CDATA[<?php echo $prestd->studiengang_kz;  ?>]]></PRESTD:studiengang_kz>
+				<PRESTD:berufstaetigkeit_code><![CDATA[<?php echo $prestd->berufstaetigkeit_code;  ?>]]></PRESTD:berufstaetigkeit_code>
+				<PRESTD:ausbildungcode><![CDATA[<?php echo $prestd->ausbildungcode;  ?>]]></PRESTD:ausbildungcode>
+				<PRESTD:zgv_code><![CDATA[<?php echo $prestd->zgv_code;  ?>]]></PRESTD:zgv_code>
+				<PRESTD:zgvort><![CDATA[<?php echo $prestd->zgvort;  ?>]]></PRESTD:zgvort>
+				<PRESTD:zgvdatum><![CDATA[<?php echo $prestd->zgvdatum;  ?>]]></PRESTD:zgvdatum>
+				<PRESTD:zgvmas_code><![CDATA[<?php echo $prestd->zgvmas_code;  ?>]]></PRESTD:zgvmas_code>
+				<PRESTD:zgvmaort><![CDATA[<?php echo $prestd->zgvmaort;  ?>]]></PRESTD:zgvmaort>
+				<PRESTD:zgvmadatum><![CDATA[<?php echo $prestd->zgvmadatum;  ?>]]></PRESTD:zgvmadatum>
+				<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><![CDATA[<?php echo $prestd->anmeldungreihungstest;  ?>]]></PRESTD:anmeldungreihungstest>
+				<PRESTD:reihungstestangetreten><![CDATA[<?php echo ($prestd->reihungstestangetreten?'true':'false');  ?>]]></PRESTD:reihungstestangetreten>
+				<PRESTD:punkte><![CDATA[<?php echo $prestd->punkte;  ?>]]></PRESTD:punkte>
+				<PRESTD:bismelden><![CDATA[<?php echo ($prestd->bismelden?'true':'false');  ?>]]></PRESTD:bismelden>
+	      	</RDF:Description>
+	      </RDF:li>
+<?php
+	}
+}
+?>
+  </RDF:Seq>
+</RDF:RDF>
\ No newline at end of file
diff --git a/rdf/reihungstest.rdf.php b/rdf/reihungstest.rdf.php
new file mode 100644
index 000000000..9abff9f91
--- /dev/null
+++ b/rdf/reihungstest.rdf.php
@@ -0,0 +1,97 @@
+<?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");
+// xml
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
+// DAO
+require_once('../vilesci/config.inc.php');
+require_once('../include/reihungstest.class.php');
+require_once('../include/studiengang.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/reihungstest';
+
+?>
+
+<RDF:RDF
+	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:RT="<?php echo $rdf_url; ?>/rdf#"
+>
+
+
+  <RDF:Seq about="<?php echo $rdf_url ?>/alle">
+
+<?php
+if(isset($_GET['optional']) && $_GET['optional']=='true')
+{
+	echo '
+	  <RDF:li>
+      	<RDF:Description  id=""  about="'.$rdf_url.'/" >
+			<RT:reihungstest_id></RT:reihungstest_id>
+			<RT:studiengang_kz></RT:studiengang_kz>
+			<RT:ort_kurzbz></RT:ort_kurzbz>
+			<RT:anmerkung></RT:anmerkung>
+			<RT:datum></RT:datum>
+			<RT:uhrzeit></RT:uhrzeit>
+			<RT:bezeichnung>-- keine Auswahl --</RT:bezeichnung>			
+      	</RDF:Description>
+      </RDF:li>
+	
+';
+}
+
+$stg = array();
+$stg_obj = new studiengang($conn);
+$stg_obj->getAll();
+foreach ($stg_obj->result as $row) 
+	$stg[$row->studiengang_kz]=$row->kuerzel;
+
+$rt = new reihungstest($conn, null, true);
+$rt->getAll();
+foreach ($rt->result as $row)
+{
+?>
+	  <RDF:li>
+      	<RDF:Description  id="<?php echo $row->reihungstest_id; ?>"  about="<?php echo $rdf_url.'/'.$row->reihungstest_id; ?>" >
+			<RT:reihungstest_id><![CDATA[<?php echo $row->reihungstest_id;  ?>]]></RT:reihungstest_id>
+			<RT:studiengang_kz><![CDATA[<?php echo $row->studiengang_kz;  ?>]]></RT:studiengang_kz>
+			<RT:ort_kurzbz><![CDATA[<?php echo $row->ort_kurzbz;  ?>]]></RT:ort_kurzbz>
+			<RT:anmerkung><![CDATA[<?php echo $row->anmerkung;  ?>]]></RT:anmerkung>
+			<RT:datum><![CDATA[<?php echo $row->datum;  ?>]]></RT:datum>
+			<RT:uhrzeit><![CDATA[<?php echo $row->uhrzeit;  ?>]]></RT:uhrzeit>
+			<RT:bezeichnung><![CDATA[<?php echo (array_key_exists($row->studiengang_kz, $stg)?$stg[$row->studiengang_kz].' ':'').$row->datum.' '.$row->uhrzeit.' '.$row->ort_kurzbz.' '.$row->anmerkung;  ?>]]></RT:bezeichnung>			
+      	</RDF:Description>
+      </RDF:li>
+<?php
+}
+?>
+  </RDF:Seq>
+</RDF:RDF>
\ No newline at end of file
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 348174ffa..f586b95ef 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -107,6 +107,7 @@ function drawStudent($student)
     		<STUDENT:staatsbuergerschaft><![CDATA[<?php echo $student->staatsbuergerschaft; ?>]]></STUDENT:staatsbuergerschaft>
     		<STUDENT:geburtsnation><![CDATA[<?php echo $student->geburtsnation; ?>]]></STUDENT:geburtsnation>
     		<STUDENT:sprache><![CDATA[<?php echo $student->sprache; ?>]]></STUDENT:sprache>
+    		<STUDENT:prestudent_id><![CDATA[<?php echo $student->prestudent_id; ?>]]></STUDENT:prestudent_id>
       	</RDF:Description>
       </RDF:li>
 <?php
diff --git a/rdf/zgv.rdf.php b/rdf/zgv.rdf.php
new file mode 100644
index 000000000..040caff55
--- /dev/null
+++ b/rdf/zgv.rdf.php
@@ -0,0 +1,81 @@
+<?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");
+// xml
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
+// DAO
+require_once('../vilesci/config.inc.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/zgv';
+
+?>
+
+<RDF:RDF
+	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:BT="<?php echo $rdf_url; ?>/rdf#"
+>
+
+
+  <RDF:Seq about="<?php echo $rdf_url ?>/alle">
+
+<?php
+if(isset($_GET['optional']) && $_GET['optional']=='true')
+{
+	echo '
+	  <RDF:li>
+      	<RDF:Description  id=""  about="'.$rdf_url.'/" >
+        	<BT:code></BT:code>
+        	<BT:bezeichnung>-- keine Auswahl --</BT:bezeichnung>
+        	<BT:kurzbz>-- keine Auswahl --</BT:kurzbz>
+      	</RDF:Description>
+      </RDF:li>
+';
+}
+$qry = "SET CLIENT_ENCODING to 'UNICODE'; SELECT * FROM bis.tbl_zgv ORDER BY zgv_kurzbz";
+if($result = pg_query($conn, $qry))
+{
+	while($row = pg_fetch_object($result))
+	{
+?>
+	  <RDF:li>
+      	<RDF:Description  id="<?php echo $row->zgv_code; ?>"  about="<?php echo $rdf_url.'/'.$row->zgv_code; ?>" >
+        	<BT:code><![CDATA[<?php echo $row->zgv_code;  ?>]]></BT:code>
+        	<BT:bezeichnung><![CDATA[<?php echo $row->zgv_bez; ?>]]></BT:bezeichnung>
+        	<BT:kurzbz><![CDATA[<?php echo $row->zgv_kurzbz; ?>]]></BT:kurzbz>
+      	</RDF:Description>
+      </RDF:li>
+<?php
+	}
+}
+?>
+  </RDF:Seq>
+</RDF:RDF>
\ No newline at end of file
diff --git a/rdf/zgvmaster.rdf.php b/rdf/zgvmaster.rdf.php
new file mode 100644
index 000000000..a996cb6a4
--- /dev/null
+++ b/rdf/zgvmaster.rdf.php
@@ -0,0 +1,81 @@
+<?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");
+// xml
+echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
+// DAO
+require_once('../vilesci/config.inc.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/zgvmaster';
+
+?>
+
+<RDF:RDF
+	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:ZGVMASTER="<?php echo $rdf_url; ?>/rdf#"
+>
+
+
+  <RDF:Seq about="<?php echo $rdf_url ?>/alle">
+
+<?php
+if(isset($_GET['optional']) && $_GET['optional']=='true')
+{
+	echo '
+	  <RDF:li>
+      	<RDF:Description  id=""  about="'.$rdf_url.'/" >
+        	<ZGVMASTER:code></ZGVMASTER:code>
+        	<ZGVMASTER:bezeichnung>-- keine Auswahl --</ZGVMASTER:bezeichnung>
+        	<ZGVMASTER:kurzbz>-- keine Auswahl --</ZGVMASTER:kurzbz>
+      	</RDF:Description>
+      </RDF:li>	
+';
+}
+$qry = "SET CLIENT_ENCODING to 'UNICODE'; SELECT * FROM bis.tbl_zgvmaster ORDER BY zgvmas_kurzbz";
+if($result = pg_query($conn, $qry))
+{
+	while($row = pg_fetch_object($result))
+	{
+?>
+	  <RDF:li>
+      	<RDF:Description  id="<?php echo $row->zgvmas_code; ?>"  about="<?php echo $rdf_url.'/'.$row->zgvmas_code; ?>" >
+        	<ZGVMASTER:code><![CDATA[<?php echo $row->zgvmas_code;  ?>]]></ZGVMASTER:code>
+        	<ZGVMASTER:bezeichnung><![CDATA[<?php echo $row->zgvmas_bez; ?>]]></ZGVMASTER:bezeichnung>
+        	<ZGVMASTER:kurzbz><![CDATA[<?php echo $row->zgvmas_kurzbz; ?>]]></ZGVMASTER:kurzbz>
+      	</RDF:Description>
+      </RDF:li>
+<?php
+	}
+}
+?>
+  </RDF:Seq>
+</RDF:RDF>
\ No newline at end of file