From 6dae98a29a8c7bca8776d2c26cbfda4c9ebe6d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 28 Jun 2013 09:47:49 +0000
Subject: [PATCH] 3. Feld fuer Reihungstestpunkte hinzugefuegt; ueber Config
 aktivierbar

---
 content/student/studentDBDML.php             |   3 +-
 content/student/studentdetailoverlay.xul.php |  15 +-
 content/student/studentenoverlay.xul.php     |   5 +
 content/student/studentoverlay.js.php        |  18 +-
 include/lehrveranstaltung.class.php          |   5 +-
 include/prestudent.class.php                 | 317 ++++++++++---------
 rdf/student.rdf.php                          |   8 +-
 system/checksystem.php                       |  13 +-
 8 files changed, 233 insertions(+), 151 deletions(-)

diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 257473fd2..63c605a9a 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -457,6 +457,7 @@ if(!$error)
 				$prestudent->punkte = str_replace(',','.',$_POST['punkte']);
 				$prestudent->rt_punkte1 = str_replace(',','.',$_POST['punkte1']);
 				$prestudent->rt_punkte2 = str_replace(',','.',$_POST['punkte2']);
+				$prestudent->rt_punkte3 = str_replace(',','.',$_POST['punkte3']);
 				$prestudent->bismelden = ($_POST['bismelden']=='true'?true:false);
 				$prestudent->dual = ($_POST['dual']=='true'?true:false);
 				$prestudent->anmerkung = $_POST['anmerkung'];
@@ -633,7 +634,7 @@ if(!$error)
 													$lehrverband->verband = '';
 													$lehrverband->gruppe = '';
 													$lehrverband->aktiv = true;
-													$lehrverband->bezeichnung = 'AbUnterbrecher/Incoming';
+													$lehrverband->bezeichnung = 'Ab-Unterbrecher';
 													
 													$lehrverband->save(true);
 												}
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index 4bf104eca..cf1d10082 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -379,7 +379,20 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
       						<textbox id="student-prestudent-textbox-punkte1" disabled="true" maxlength="9" size="9" onchange="StudentReihungstestPunkteChange();" oninput="StudentReihungstestPunkteSum();"/>
       						<label value="Punkte2" control="student-prestudent-textbox-punkte2"/>
       						<textbox id="student-prestudent-textbox-punkte2" disabled="true" maxlength="9" size="9" onchange="StudentReihungstestPunkteChange();" oninput="StudentReihungstestPunkteSum();"/>
-      						<label value="Gesamtpunkte" control="student-prestudent-textbox-punkte"/>
+							<?php
+							// Das Eingebefeld fuer die 3. Reihungstestpunkte wird nur angezeigt, 
+							// wenn im dies im Config aktiviert wurde
+							if(defined('RT_PUNKTE3') && RT_PUNKTE3=='true')
+								$hidden='';
+							else
+								$hidden='hidden="true"';
+
+	      					echo '
+								<label value="Punkte3" control="student-prestudent-textbox-punkte3" '.$hidden.'/>
+    	  						<textbox id="student-prestudent-textbox-punkte3" disabled="true" maxlength="9" size="9" onchange="StudentReihungstestPunkteChange();" oninput="StudentReihungstestPunkteSum();" '.$hidden.'/>
+								';							
+							?>
+   	  						<label value="Gesamtpunkte" control="student-prestudent-textbox-punkte"/>
       						<textbox id="student-prestudent-textbox-punkte" disabled="true" maxlength="9" size="9" onchange="StudentReihungstestPunkteChange();"/>
       						</hbox>
     					</row>
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index 28eeaf889..df40c37c6 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -256,6 +256,10 @@ else
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#punkte2" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
+	    				<treecol id="student-treecol-rt_punkte3" label="RT_Punkte3" flex="1" hidden="true" persist="hidden, width, ordinal"
+	    					class="sortDirectionIndicator"
+	    					sort="rdf:http://www.technikum-wien.at/student/rdf#punkte3" onclick="StudentTreeSort()"/>
+	    				<splitter class="tree-splitter"/>
 	    				<treecol id="student-treecol-dual" label="Dual" flex="1" hidden="true" persist="hidden, width, ordinal"
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#dual_bezeichnung" onclick="StudentTreeSort()"/>
@@ -295,6 +299,7 @@ else
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte1" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte2" />
+										<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte3" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#dual_bezeichnung" />
 	         						</treerow>
 	       						</treeitem>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 343181db1..44053f983 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -931,6 +931,7 @@ function StudentAuswahl()
 	punkte = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte" ));
 	punkte1 = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte1" ));
 	punkte2 = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte2" ));
+	punkte3 = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte3" ));
 	bismelden = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bismelden" ));
 	anmerkung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkungpre" ));
 	dual = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#dual" ));
@@ -959,6 +960,7 @@ function StudentAuswahl()
 	document.getElementById('student-prestudent-textbox-punkte').value=punkte;
 	document.getElementById('student-prestudent-textbox-punkte1').value=punkte1;
 	document.getElementById('student-prestudent-textbox-punkte2').value=punkte2;
+	document.getElementById('student-prestudent-textbox-punkte3').value=punkte3;
 
 	if(bismelden=='true')
 		document.getElementById('student-prestudent-checkbox-bismelden').checked=true;
@@ -1364,7 +1366,8 @@ function StudentAuswahl()
 	// Selektierungsfunktion der Addons aufrufen
 	for(i in addon)
 	{
-		addon[i].selectStudent(person_id, prestudent_id, uid)
+		if(typeof addon[i].selectStudent == 'function')
+			addon[i].selectStudent(person_id, prestudent_id, uid);
 	}
 }
 
@@ -1391,6 +1394,7 @@ function StudentPrestudentDisableFields(val)
 	document.getElementById('student-prestudent-textbox-punkte').disabled=val;
 	document.getElementById('student-prestudent-textbox-punkte1').disabled=val;
 	document.getElementById('student-prestudent-textbox-punkte2').disabled=val;
+	document.getElementById('student-prestudent-textbox-punkte3').disabled=val;
 	document.getElementById('student-prestudent-checkbox-bismelden').disabled=val;
 	document.getElementById('student-prestudent-checkbox-dual').disabled=val;
 	document.getElementById('student-prestudent-button-anmeldungreihungstest-heute').disabled=val;
@@ -1441,6 +1445,7 @@ function StudentPrestudentSave()
 	punkte = document.getElementById('student-prestudent-textbox-punkte').value;
 	punkte1 = document.getElementById('student-prestudent-textbox-punkte1').value;
 	punkte2 = document.getElementById('student-prestudent-textbox-punkte2').value;
+	punkte3 = document.getElementById('student-prestudent-textbox-punkte3').value;
 	bismelden = document.getElementById('student-prestudent-checkbox-bismelden').checked;
 	dual = document.getElementById('student-prestudent-checkbox-dual').checked;
 	person_id = document.getElementById('student-prestudent-textbox-person_id').value;
@@ -1494,6 +1499,7 @@ function StudentPrestudentSave()
 	req.add('punkte', punkte);
 	req.add('punkte1', punkte1);
 	req.add('punkte2', punkte2);
+	req.add('punkte3', punkte3);
 	req.add('bismelden', bismelden);
 	req.add('dual', dual);
 	req.add('person_id', person_id);
@@ -1683,6 +1689,8 @@ function StudentReihungstestPunkteSum()
 {
 	punkte1 = document.getElementById('student-prestudent-textbox-punkte1').value;
 	punkte2 = document.getElementById('student-prestudent-textbox-punkte2').value;
+	punkte3 = document.getElementById('student-prestudent-textbox-punkte3').value;
+
 	if(punkte1=='')
 	{
 		punkte1=0;
@@ -1693,8 +1701,14 @@ function StudentReihungstestPunkteSum()
 		punkte2=0;
 		document.getElementById('student-prestudent-textbox-punkte2').value=0;
 	}
+	if(punkte3=='')
+	{
+		punkte3=0;
+		document.getElementById('student-prestudent-textbox-punkte3').value=0;
+
+	}
 	
-	document.getElementById('student-prestudent-textbox-punkte').value=parseFloat(punkte1)+parseFloat(punkte2);
+	document.getElementById('student-prestudent-textbox-punkte').value=parseFloat(punkte1)+parseFloat(punkte2)+parseFloat(punkte3);
 }
 
 // ****
diff --git a/include/lehrveranstaltung.class.php b/include/lehrveranstaltung.class.php
index 2ab2ea163..a135b08ea 100644
--- a/include/lehrveranstaltung.class.php
+++ b/include/lehrveranstaltung.class.php
@@ -432,7 +432,8 @@ class lehrveranstaltung extends basis_db
 	{
 		$qry = "SELECT * FROM lehre.tbl_lehrveranstaltung 
 				WHERE lehrveranstaltung_id IN(SELECT lehrveranstaltung_id FROM campus.vw_student_lehrveranstaltung 
-											  WHERE uid='".addslashes($student_uid)."')
+											  WHERE uid=".$this->db_add_param($student_uid).")
+						OR lehrveranstaltung_id IN(SELECT lehrveranstaltung_id FROM lehre.tbl_zeugnisnote WHERE student_uid=".$this->db_add_param($student_uid).")
 				ORDER BY semester, bezeichnung";
 		
 		//Datensaetze laden
@@ -958,4 +959,4 @@ class lehrveranstaltung extends basis_db
 		return true;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index fa4c2e05b..8b673e03b 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -44,10 +44,11 @@ class prestudent extends person
 	public $punkte; //rt_gesamtpunkte
 	public $rt_punkte1;
 	public $rt_punkte2;
-	public $bismelden;
+	public $rt_punkte3=0;
+	public $bismelden=true;
 	public $anmerkung;
 	public $ext_id_prestudent;
-	public $dual;
+	public $dual=false;
 	
 	public $status_kurzbz;
 	public $studiensemester_kurzbz;
@@ -90,7 +91,7 @@ class prestudent extends person
 			return false;
 		}
 		
-		$qry = "SELECT * FROM public.tbl_prestudent WHERE prestudent_id='$prestudent_id'";
+		$qry = "SELECT * FROM public.tbl_prestudent WHERE prestudent_id=".$this->db_add_param($prestudent_id);
 		
 		if($this->db_query($qry))
 		{
@@ -108,18 +109,19 @@ class prestudent extends person
 				$this->zgvmaort = $row->zgvmaort;
 				$this->zgvmadatum = $row->zgvmadatum;
 				$this->aufnahmeschluessel = $row->aufnahmeschluessel;
-				$this->facheinschlberuf = ($row->facheinschlberuf=='t'?true:false);
+				$this->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
 				$this->anmeldungreihungstest = $row->anmeldungreihungstest;
-				$this->reihungstestangetreten = ($row->reihungstestangetreten=='t'?true:false);
+				$this->reihungstestangetreten = $this->db_parse_bool($row->reihungstestangetreten);
 				$this->reihungstest_id = $row->reihungstest_id;
 				$this->punkte = $row->rt_gesamtpunkte;
 				$this->rt_punkte1 = $row->rt_punkte1;
 				$this->rt_punkte2 = $row->rt_punkte2;
-				$this->bismelden = ($row->bismelden=='t'?true:false);
+				$this->rt_punkte3 = $row->rt_punkte3;
+				$this->bismelden = $this->db_parse_bool($row->bismelden);
 				$this->person_id = $row->person_id;
 				$this->anmerkung = $row->anmerkung;
 				$this->ext_id_prestudent = $row->ext_id;
-				$this->dual = ($row->dual=='t'?true:false);
+				$this->dual = $this->db_parse_bool($row->dual);
 				$this->ausstellungsstaat = $row->ausstellungsstaat;
 				
 				if(!person::load($row->person_id))
@@ -129,13 +131,13 @@ class prestudent extends person
 			}
 			else 
 			{
-				$this->errormsg = "Kein Eintrag gefunden fuer $prestudent_id";
+				$this->errormsg = "Kein Prestudent Eintrag gefunden";
 				return false;
 			}				
 		}
 		else 
 		{
-			$this->errormsg = "Fehler beim Laden: $qry";
+			$this->errormsg = "Fehler beim Laden des Prestudenten";
 			return false;
 		}		
 	}
@@ -162,6 +164,12 @@ class prestudent extends person
 			$this->errormsg = 'Reihungstestpunkte2 darf nicht groesser als 9999.9999 sein';
 			return false;
 		}
+		if($this->rt_punkte3>9999.9999)
+		{
+			$this->errormsg = 'Reihungstestpunkte3 darf nicht groesser als 9999.9999 sein';
+			return false;
+		}
+
 		return true;
 	}
 	
@@ -183,66 +191,73 @@ class prestudent extends person
 		
 		if($this->new) //Wenn new true ist dann ein INSERT absetzen ansonsten ein UPDATE
 		{
-			$qry = 'BEGIN;INSERT INTO public.tbl_prestudent (aufmerksamdurch_kurzbz, person_id, studiengang_kz, berufstaetigkeit_code, ausbildungcode, zgv_code, zgvort, zgvdatum, zgvmas_code, zgvmaort, zgvmadatum, aufnahmeschluessel, facheinschlberuf, reihungstest_id, anmeldungreihungstest, reihungstestangetreten, rt_gesamtpunkte, rt_punkte1, rt_punkte2, bismelden, insertamum, insertvon, updateamum, updatevon, ext_id, anmerkung, dual, ausstellungsstaat) 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->addslashes($this->rt_punkte1).",".
-			       $this->addslashes($this->rt_punkte2).",".
-			       ($this->bismelden?'true':'false').",".
-			       $this->addslashes($this->insertamum).",".
-			       $this->addslashes($this->insertvon).",".
-			       $this->addslashes($this->updateamum).",".
-			       $this->addslashes($this->updatevon).",".
-			       $this->addslashes($this->ext_id_prestudent).",".
-			       $this->addslashes($this->anmerkung).",".
-			       ($this->dual?'true':'false').",".
-			       $this->addslashes($this->ausstellungsstaat).");";
+			$qry = 'BEGIN;INSERT INTO public.tbl_prestudent (aufmerksamdurch_kurzbz, person_id, 
+					studiengang_kz, berufstaetigkeit_code, ausbildungcode, zgv_code, zgvort, zgvdatum, 
+					zgvmas_code, zgvmaort, zgvmadatum, aufnahmeschluessel, facheinschlberuf, 
+					reihungstest_id, anmeldungreihungstest, reihungstestangetreten, rt_gesamtpunkte, 
+					rt_punkte1, rt_punkte2, rt_punkte3, bismelden, insertamum, insertvon, 
+					updateamum, updatevon, ext_id, anmerkung, dual, ausstellungsstaat) VALUES('.
+			       $this->db_add_param($this->aufmerksamdurch_kurzbz).",".
+			       $this->db_add_param($this->person_id).",".
+			       $this->db_add_param($this->studiengang_kz).",".
+			       $this->db_add_param($this->berufstaetigkeit_code).",".
+			       $this->db_add_param($this->ausbildungcode).",".
+			       $this->db_add_param($this->zgv_code).",".
+			       $this->db_add_param($this->zgvort).",".
+			       $this->db_add_param($this->zgvdatum).",".
+			       $this->db_add_param($this->zgvmas_code).",".
+			       $this->db_add_param($this->zgvmaort).",".
+			       $this->db_add_param($this->zgvmadatum).",".
+			       $this->db_add_param($this->aufnahmeschluessel).",".
+			       $this->db_add_param($this->facheinschlberuf, FHC_BOOLEAN).",".
+			       $this->db_add_param($this->reihungstest_id).",".
+			       $this->db_add_param($this->anmeldungreihungstest).",".
+			       $this->db_add_param($this->reihungstestangetreten, FHC_BOOLEAN).",".
+			       $this->db_add_param($this->punkte).",".
+			       $this->db_add_param($this->rt_punkte1).",".
+			       $this->db_add_param($this->rt_punkte2).",".
+			       $this->db_add_param($this->rt_punkte3).",".
+			       $this->db_add_param($this->bismelden, FHC_BOOLEAN).",".
+			       $this->db_add_param($this->insertamum).",".
+			       $this->db_add_param($this->insertvon).",".
+			       $this->db_add_param($this->updateamum).",".
+			       $this->db_add_param($this->updatevon).",".
+			       $this->db_add_param($this->ext_id_prestudent).",".
+			       $this->db_add_param($this->anmerkung).",".
+			       $this->db_add_param($this->dual, FHC_BOOLEAN).",".
+			       $this->db_add_param($this->ausstellungsstaat).");";
 		}
 		else
 		{
 			$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').",".
-			       ' rt_gesamtpunkte='.$this->addslashes($this->punkte).",".
-			       ' rt_punkte1='.$this->addslashes($this->rt_punkte1).",".
-			       ' rt_punkte2='.$this->addslashes($this->rt_punkte2).",".
-			       ' bismelden='.($this->bismelden?'true':'false').",".
-			       ' updateamum='.$this->addslashes($this->updateamum).",".
-			       ' updatevon='.$this->addslashes($this->updatevon).",".
-			       ' ext_id='.$this->addslashes($this->ext_id_prestudent).",".
-			       ' anmerkung='.$this->addslashes($this->anmerkung).",".
-			       ' dual='.($this->dual?'true':'false').",".
-				   ' ausstellungsstaat='.$this->addslashes($this->ausstellungsstaat).
-			       " WHERE prestudent_id='".addslashes($this->prestudent_id)."';";
+			       ' aufmerksamdurch_kurzbz='.$this->db_add_param($this->aufmerksamdurch_kurzbz).",".
+			       ' person_id='.$this->db_add_param($this->person_id).",".
+			       ' studiengang_kz='.$this->db_add_param($this->studiengang_kz).",".
+			       ' berufstaetigkeit_code='.$this->db_add_param($this->berufstaetigkeit_code).",".
+			       ' ausbildungcode='.$this->db_add_param($this->ausbildungcode).",".
+			       ' zgv_code='.$this->db_add_param($this->zgv_code).",".
+			       ' zgvort='.$this->db_add_param($this->zgvort).",".
+			       ' zgvdatum='.$this->db_add_param($this->zgvdatum).",".
+			       ' zgvmas_code='.$this->db_add_param($this->zgvmas_code).",".
+			       ' zgvmaort='.$this->db_add_param($this->zgvmaort).",".
+			       ' zgvmadatum='.$this->db_add_param($this->zgvmadatum).",".
+			       ' aufnahmeschluessel='.$this->db_add_param($this->aufnahmeschluessel).",".
+			       ' facheinschlberuf='.$this->db_add_param($this->facheinschlberuf, FHC_BOOLEAN).",".
+			       ' reihungstest_id='.$this->db_add_param($this->reihungstest_id).",".
+			       ' anmeldungreihungstest='.$this->db_add_param($this->anmeldungreihungstest).",".
+			       ' reihungstestangetreten='.$this->db_add_param($this->reihungstestangetreten, FHC_BOOLEAN).",".
+			       ' rt_gesamtpunkte='.$this->db_add_param($this->punkte).",".
+			       ' rt_punkte1='.$this->db_add_param($this->rt_punkte1).",".
+			       ' rt_punkte2='.$this->db_add_param($this->rt_punkte2).",".
+			       ' rt_punkte3='.$this->db_add_param($this->rt_punkte3).",".
+			       ' bismelden='.$this->db_add_param($this->bismelden, FHC_BOOLEAN).",".
+			       ' updateamum='.$this->db_add_param($this->updateamum).",".
+			       ' updatevon='.$this->db_add_param($this->updatevon).",".
+			       ' ext_id='.$this->db_add_param($this->ext_id_prestudent).",".
+			       ' anmerkung='.$this->db_add_param($this->anmerkung).",".
+			       ' dual='.$this->db_add_param($this->dual, FHC_BOOLEAN).",".
+				   ' ausstellungsstaat='.$this->db_add_param($this->ausstellungsstaat).
+			       " WHERE prestudent_id=".$this->db_add_param($this->prestudent_id).";";
 		}
 		
 		if($this->db_query($qry))
@@ -260,7 +275,7 @@ class prestudent extends person
 					}
 					else 
 					{
-						$this->errormsg = 'Fehler beim auslesen der Sequence';
+						$this->errormsg = 'Fehler beim Auslesen der Sequence';
 						$this->db_query('ROLLBACK;');
 						return false;
 					}						
@@ -277,7 +292,7 @@ class prestudent extends person
 		}
 		else 
 		{	
-			$this->errormsg = 'Fehler beim Speichern des Prestudent-Datensatzes:'.$qry;
+			$this->errormsg = 'Fehler beim Speichern des Prestudent-Datensatzes';
 			return false;
 		}
 	}
@@ -324,7 +339,7 @@ class prestudent extends person
 			$ps->gebdatum = $row->gebdatum;
 			$ps->gebort = $row->gebort;
 			$ps->gebzeit = $row->gebzeit;
-			$ps->foto = $row->foto;
+			// $ps->foto = $row->foto;
 			$ps->anmerkungen = $row->anmerkungen;
 			$ps->homepage = $row->homepage;
 			$ps->svnr = $row->svnr;
@@ -332,7 +347,7 @@ class prestudent extends person
 			$ps->familienstand = $row->familienstand;
 			$ps->geschlecht = $row->geschlecht;
 			$ps->anzahlkinder = $row->anzahlkinder;
-			$ps->aktiv = $row->aktiv;
+			$ps->aktiv = $this->db_parse_bool($row->aktiv);
 			$ps->aufmerksamdurch_kurzbz = $row->aufmerksamdurch_kurzbz;
 			$ps->studiengang_kz = $row->studiengang_kz;
 			$ps->berufstaetigkeit_code = $row->berufstaetigkeit_code;
@@ -344,13 +359,13 @@ class prestudent extends person
 			$ps->zgvmaort = $row->zgvmaort;
 			$ps->zgvmadatum = $row->zgvmadatum;
 			$ps->aufnahmeschluessel = $row->aufnahmeschluessel;
-			$ps->facheinschlberuf = $row->facheinschlberuf;
+			$ps->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
 			$ps->anmeldungreihungstest = $row->anmeldungreihungstest;
-			$ps->reihungstestangetreten = $row->reihungstestangetreten;
+			$ps->reihungstestangetreten = $this->db_parse_bool($row->reihungstestangetreten);
 			$ps->punkte = $row->punkte;
 			$ps->rt_punkte1 = $row->rt_punkte1;
 			$ps->rt_punkte2 = $row->rt_punkte2;
-			$ps->bismelden = $row->bismelden;
+			$ps->bismelden = $this->db_parse_bool($row->bismelden);
 			$ps->rt_studiengang_kz = $row->rt_studiengang_kz;
 			$ps->rt_ort = $row->rt_ort;
 			$ps->rt_datum = $row->rt_datum;
@@ -377,13 +392,13 @@ class prestudent extends person
 			return false;
 		}
 		
-		$qry = "SELECT * FROM public.tbl_prestudentstatus WHERE prestudent_id='$prestudent_id'";	
+		$qry = "SELECT * FROM public.tbl_prestudentstatus WHERE prestudent_id=".$this->db_add_param($prestudent_id, FHC_INTEGER);	
 		if($status_kurzbz!=null)
-			$qry.= " AND status_kurzbz='".addslashes($status_kurzbz)."'";
+			$qry.= " AND status_kurzbz=".$this->db_add_param($status_kurzbz);
 		if($studiensemester_kurzbz!=null)
-			$qry.= " AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'";
+			$qry.= " AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
 		if($ausbildungssemester!=null)
-			$qry.= " AND ausbildungssemester='".addslashes($ausbildungssemester)."'";
+			$qry.= " AND ausbildungssemester=".$this->db_add_param($ausbildungssemester);
 
 		if($order!='')
 			$qry.=" ORDER BY ".$order;
@@ -433,10 +448,10 @@ class prestudent extends person
 			return false;
 		}
 		
-		$qry = "SELECT * FROM public.tbl_prestudentstatus WHERE prestudent_id='$prestudent_id'".
-			   " AND status_kurzbz='".addslashes($status_kurzbz)."'".
-			   " AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'".
-			   " AND ausbildungssemester='".addslashes($ausbildungssemester)."'";
+		$qry = "SELECT * FROM public.tbl_prestudentstatus WHERE prestudent_id=".$this->db_add_param($prestudent_id).
+			   " AND status_kurzbz=".$this->db_add_param($status_kurzbz).
+			   " AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz).
+			   " AND ausbildungssemester=".$this->db_add_param($ausbildungssemester);
 		
 		if($this->db_query($qry))
 		{
@@ -477,7 +492,7 @@ class prestudent extends person
 	{
 		$stsemqry='';
 		if(!is_null($studiensemester_kurzbz) && $studiensemester_kurzbz!='')
-			$stsemqry=" AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'";
+			$stsemqry=" AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
 		
 		$qry = "SELECT 
 					*, a.anmerkung, tbl_person.anmerkung as anmerkungen 
@@ -492,15 +507,15 @@ class prestudent extends person
 				WHERE a.rolle=tbl_prestudentstatus.status_kurzbz AND 
 					a.person_id=tbl_person.person_id AND
 					a.prestudent_id = tbl_prestudentstatus.prestudent_id AND
-					a.studiengang_kz='$studiengang_kz'";
+					a.studiengang_kz=".$this->db_add_param($studiengang_kz);
 						
 		if(!is_null($studiensemester_kurzbz) && $studiensemester_kurzbz!='')
-			$qry.=" AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'";
+			$qry.=" AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
 			
 		if($semester!=null)
-			$qry.=" AND ausbildungssemester='$semester'";
+			$qry.=" AND ausbildungssemester=".$this->db_add_param($semester);
 		if($orgform!=null && $orgform!='')
-			$qry.=" AND tbl_prestudentstatus.orgform_kurzbz='$orgform'";
+			$qry.=" AND tbl_prestudentstatus.orgform_kurzbz=".$this->db_add_param($orgform);
 		
 		switch ($typ)
 		{
@@ -535,7 +550,7 @@ class prestudent extends person
 				break;
 			case "prestudent":
 				if($studiensemester_kurzbz=='' || is_null($studiensemester_kurzbz))
-					$qry = "SELECT *, '' as status_kurzbz, '' as studiensemester_kurzbz, '' as ausbildungssemester, '' as datum, tbl_person.anmerkung as anmerkungen, '' as orgform_kurzbz FROM public.tbl_prestudent prestudent, public.tbl_person WHERE NOT EXISTS (select * from tbl_prestudentstatus WHERE prestudent_id=prestudent.prestudent_id) AND studiengang_kz='".addslashes($studiengang_kz)."' AND prestudent.person_id=tbl_person.person_id";
+					$qry = "SELECT *, '' as status_kurzbz, '' as studiensemester_kurzbz, '' as ausbildungssemester, '' as datum, tbl_person.anmerkung as anmerkungen, '' as orgform_kurzbz FROM public.tbl_prestudent prestudent, public.tbl_person WHERE NOT EXISTS (select * from tbl_prestudentstatus WHERE prestudent_id=prestudent.prestudent_id) AND studiengang_kz=".$this->db_add_param($studiengang_kz, FHC_INTEGER)." AND prestudent.person_id=tbl_person.person_id";
 				else 
 					$qry .= " AND a.rolle IN('Interessent', 'Bewerber', 'Aufgenommener', 'Wartender', 'Abgewiesener')";
 				break;
@@ -568,7 +583,7 @@ class prestudent extends person
 				$ps->gebdatum = $row->gebdatum;
 				$ps->gebort = $row->gebort;
 				$ps->gebzeit = $row->gebzeit;
-				$ps->foto = $row->foto;
+				//$ps->foto = $row->foto;
 				$ps->anmerkungen = $row->anmerkungen;
 				$ps->homepage = $row->homepage;
 				$ps->svnr = $row->svnr;
@@ -576,7 +591,7 @@ class prestudent extends person
 				$ps->familienstand = $row->familienstand;
 				$ps->geschlecht = $row->geschlecht;
 				$ps->anzahlkinder = $row->anzahlkinder;
-				$ps->aktiv = ($row->aktiv=='t'?true:false);
+				$ps->aktiv = $this->db_parse_bool($row->aktiv);
 				
 				$ps->prestudent_id = $row->prestudent_id;
 				$ps->aufmerksamdurch_kurzbz = $row->aufmerksamdurch_kurzbz;
@@ -591,16 +606,17 @@ class prestudent extends person
 				$ps->zgvmadatum = $row->zgvmadatum;
 				$ps->ausstellungsstaat = $row->ausstellungsstaat;
 				$ps->aufnahmeschluessel = $row->aufnahmeschluessel;
-				$ps->facheinschlberuf = ($row->facheinschlberuf=='t'?true:false);
+				$ps->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
 				$ps->anmeldungreihungstest = $row->anmeldungreihungstest;
-				$ps->reihungstestangetreten = ($row->reihungstestangetreten=='t'?true:false);
+				$ps->reihungstestangetreten = $this->db_parse_bool($row->reihungstestangetreten);
 				$ps->reihungstest_id = $row->reihungstest_id;
 				$ps->punkte = $row->rt_gesamtpunkte;
 				$ps->rt_punkte1 = $row->rt_punkte1;
 				$ps->rt_punkte2 = $row->rt_punkte2;
-				$ps->bismelden = ($row->bismelden=='t'?true:false);
+				$ps->rt_punkte3 = $row->rt_punkte3;
+				$ps->bismelden = $this->db_parse_bool($row->bismelden);
 				$ps->anmerkung = $row->anmerkung;
-				$ps->dual = ($row->dual=='t'?true:false);
+				$ps->dual = $this->db_parse_bool($row->dual);
 				
 				$ps->status_kurzbz = $row->status_kurzbz;
 				$ps->studiensemester_kurzbz = $row->studiensemester_kurzbz;
@@ -643,7 +659,9 @@ class prestudent extends person
 		}
 		
 		$qry = "SELECT count(*) as anzahl FROM public.tbl_prestudent 
-				WHERE person_id='$person_id' AND studiengang_kz='$studiengang_kz'";
+				WHERE person_id=".$this->db_add_param($person_id, FHC_INTEGER)." 
+				AND studiengang_kz=".$this->db_add_param($studiengang_kz, FHC_INTEGER);
+
 		if($this->db_query($qry))
 		{
 			if($row = $this->db_fetch_object())
@@ -673,7 +691,7 @@ class prestudent extends person
 	}
 	
 	/**
-	 * Speichert die Prestudentrolle
+	 * Speichert den Prestudentstatus
 	 * @return true wenn ok, false im Fehlerfall
 	 */
 	public function save_rolle()
@@ -687,18 +705,20 @@ class prestudent extends person
 				return false;
 			}
 
-			$qry = 'INSERT INTO public.tbl_prestudentstatus (prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester, datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz) VALUES('.
-			       $this->addslashes($this->prestudent_id).",".
-			       $this->addslashes($this->status_kurzbz).",".
-			       $this->addslashes($this->studiensemester_kurzbz).",".
-			       $this->addslashes($this->ausbildungssemester).",".
-			       $this->addslashes($this->datum).",".
-			       $this->addslashes($this->insertamum).",".
-			       $this->addslashes($this->insertvon).",".
-			       $this->addslashes($this->updateamum).",".
-			       $this->addslashes($this->updatevon).",".
-			       $this->addslashes($this->ext_id_prestudent).",".
-			       $this->addslashes($this->orgform_kurzbz).");";
+			$qry = 'INSERT INTO public.tbl_prestudentstatus (prestudent_id, status_kurzbz, 
+					studiensemester_kurzbz, ausbildungssemester, datum, insertamum, insertvon, 
+					updateamum, updatevon, ext_id, orgform_kurzbz) VALUES('.
+			       $this->db_add_param($this->prestudent_id).",".
+			       $this->db_add_param($this->status_kurzbz).",".
+			       $this->db_add_param($this->studiensemester_kurzbz).",".
+			       $this->db_add_param($this->ausbildungssemester).",".
+			       $this->db_add_param($this->datum).",".
+			       $this->db_add_param($this->insertamum).",".
+			       $this->db_add_param($this->insertvon).",".
+			       $this->db_add_param($this->updateamum).",".
+			       $this->db_add_param($this->updatevon).",".
+			       $this->db_add_param($this->ext_id_prestudent).",".
+			       $this->db_add_param($this->orgform_kurzbz).");";
 		}
 		else
 		{			
@@ -717,13 +737,17 @@ class prestudent extends person
 				}
 			}
 			$qry = 'UPDATE public.tbl_prestudentstatus SET'.
-			       ' ausbildungssemester='.$this->addslashes($this->ausbildungssemester).",".
-			       ' studiensemester_kurzbz='.$this->addslashes($this->studiensemester_kurzbz).",".
-			       ' datum='.$this->addslashes($this->datum).",".
-			       ' updateamum='.$this->addslashes($this->updateamum).",".
-			       ' updatevon='.$this->addslashes($this->updatevon).",".
-			       ' orgform_kurzbz='.$this->addslashes($this->orgform_kurzbz).
-			       " WHERE prestudent_id='".addslashes($this->prestudent_id)."' AND status_kurzbz='".addslashes($this->status_kurzbz)."' AND studiensemester_kurzbz='".addslashes($this->studiensemester_old)."' AND ausbildungssemester='".addslashes($this->ausbildungssemester_old)."';";
+			       ' ausbildungssemester='.$this->db_add_param($this->ausbildungssemester).",".
+			       ' studiensemester_kurzbz='.$this->db_add_param($this->studiensemester_kurzbz).",".
+			       ' datum='.$this->db_add_param($this->datum).",".
+			       ' updateamum='.$this->db_add_param($this->updateamum).",".
+			       ' updatevon='.$this->db_add_param($this->updatevon).",".
+			       ' orgform_kurzbz='.$this->db_add_param($this->orgform_kurzbz).
+			       " WHERE 
+						prestudent_id=".$this->db_add_param($this->prestudent_id, FHC_INTEGER, false)." 
+						AND status_kurzbz=".$this->db_add_param($this->status_kurzbz, FHC_STRING, false)."
+						AND studiensemester_kurzbz=".$this->db_add_param($this->studiensemester_old, FHC_STRING, false)."
+						AND ausbildungssemester=".$this->db_add_param($this->ausbildungssemester_old, FHC_STRING, false).";";
 		}
 		
 		if($this->db_query($qry))
@@ -733,16 +757,17 @@ class prestudent extends person
 		}
 		else 
 		{	
-			$this->errormsg = 'Fehler beim Speichern der Prestudentrolle:'.$qry;
+			$this->errormsg = 'Fehler beim Speichern des Prestudentstatus';
 			return false;
 		}
 	}
 	
 	/**
-	 * Loescht eine Rolle
+	 * Loescht einen Prestudentstatus
 	 * @param $prestudent_id
 	 *        $status_kurzbz
 	 *        $studiensemester_kurzbz
+	 *		  $ausbildungssemester
 	 * @return true wenn ok, false wenn Fehler
 	 */
 	public function delete_rolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester)
@@ -753,7 +778,13 @@ class prestudent extends person
 			return false;
 		}
 
-		$qry = "DELETE FROM public.tbl_prestudentstatus WHERE prestudent_id='$prestudent_id' AND status_kurzbz='".addslashes($status_kurzbz)."' AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' AND ausbildungssemester='".addslashes($ausbildungssemester)."'";
+		$qry = "DELETE FROM public.tbl_prestudentstatus 
+				WHERE 
+					prestudent_id=".$this->db_add_param($prestudent_id, FHC_INTEGER)."
+					AND status_kurzbz=".$this->db_add_param($status_kurzbz)."
+					AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
+					AND ausbildungssemester=".$this->db_add_param($ausbildungssemester);
+
 		if($this->load_rolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester))
 		{
 			$this->db_query('BEGIN;');
@@ -766,17 +797,17 @@ class prestudent extends person
 			$log->sql = $qry;
 			$log->sqlundo = 'INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz,'.
 							' ausbildungssemester, datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz) VALUES('.
-							$this->addslashes($this->prestudent_id).','.
-							$this->addslashes($this->status_kurzbz).','.
-							$this->addslashes($this->studiensemester_kurzbz).','.
-							$this->addslashes($this->ausbildungssemester).','.
-							$this->addslashes($this->datum).','.
-							$this->addslashes($this->insertamum).','.
-							$this->addslashes($this->insertvon).','.
-							$this->addslashes($this->updateamum).','.
-							$this->addslashes($this->updatevon).','.
-							$this->addslashes($this->ext_id_prestudent).','.
-							$this->addslashes($this->orgform_kurzbz).');';
+							$this->db_add_param($this->prestudent_id).','.
+							$this->db_add_param($this->status_kurzbz).','.
+							$this->db_add_param($this->studiensemester_kurzbz).','.
+							$this->db_add_param($this->ausbildungssemester).','.
+							$this->db_add_param($this->datum).','.
+							$this->db_add_param($this->insertamum).','.
+							$this->db_add_param($this->insertvon).','.
+							$this->db_add_param($this->updateamum).','.
+							$this->db_add_param($this->updatevon).','.
+							$this->db_add_param($this->ext_id_prestudent).','.
+							$this->db_add_param($this->orgform_kurzbz).');';
 			if($log->save(true))
 			{
 						
@@ -820,13 +851,13 @@ class prestudent extends person
 			return false;
 		}
 		
-		$qry = "SELECT * FROM public.tbl_prestudentstatus WHERE prestudent_id='$prestudent_id'";
+		$qry = "SELECT * FROM public.tbl_prestudentstatus WHERE prestudent_id=".$this->db_add_param($prestudent_id, FHC_INTEGER);
 
 		if($studiensemester_kurzbz!='')
-			$qry.=" AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'";
-			
+			$qry.=" AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
+		
 		if($status_kurzbz !='')
-			$qry.= " AND status_kurzbz ='".addslashes($status_kurzbz)."'";
+			$qry.= " AND status_kurzbz =".$this->db_add_param($status_kurzbz);
 		
 		$qry.=" ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1";
 		if($this->db_query($qry))
@@ -872,10 +903,11 @@ class prestudent extends person
 			return false;
 		}
 		
-		$qry = "SELECT * FROM public.tbl_prestudentstatus WHERE prestudent_id='$prestudent_id' and status_kurzbz = ".$this->addslashes($status_kurzbz);
-
-
-		$qry.=" ORDER BY datum ASC, insertamum ASC, ext_id ASC LIMIT 1";
+		$qry = "SELECT * FROM public.tbl_prestudentstatus 
+				WHERE 
+					prestudent_id=".$this->db_add_param($prestudent_id, FHC_INTEGER)." 
+					AND status_kurzbz = ".$this->db_add_param($status_kurzbz)."
+				ORDER BY datum ASC, insertamum ASC, ext_id ASC LIMIT 1";
 		if($this->db_query($qry))
 		{
 			if($row = $this->db_fetch_object())
@@ -917,7 +949,7 @@ class prestudent extends person
 			return false;
 		}
 		
-		$qry = "SELECT * FROM public.tbl_prestudent WHERE person_id='$person_id'";
+		$qry = "SELECT * FROM public.tbl_prestudent WHERE person_id=".$this->db_add_param($person_id, FHC_INTEGER);
 		
 		if($this->db_query($qry))
 		{
@@ -937,18 +969,19 @@ class prestudent extends person
 				$obj->zgvmaort = $row->zgvmaort;
 				$obj->zgvmadatum = $row->zgvmadatum;
 				$obj->aufnahmeschluessel = $row->aufnahmeschluessel;
-				$obj->facheinschlberuf = ($row->facheinschlberuf=='t'?true:false);
+				$obj->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
 				$obj->anmeldungreihungstest = $row->anmeldungreihungstest;
-				$obj->reihungstestangetreten = ($row->reihungstestangetreten=='t'?true:false);
+				$obj->reihungstestangetreten = $this->db_parse_bool($row->reihungstestangetreten);
 				$obj->reihungstest_id = $row->reihungstest_id;
 				$obj->punkte = $row->rt_gesamtpunkte;
 				$obj->rt_punkte1 = $row->rt_punkte1;
 				$obj->rt_punkte2 = $row->rt_punkte2;
-				$obj->bismelden = ($row->bismelden=='t'?true:false);
+				$obj->rt_punkte3 = $row->rt_punkte3;
+				$obj->bismelden = $this->db_parse_bool($row->bismelden);
 				$obj->person_id = $row->person_id;
 				$obj->anmerkung = $row->anmerkung;
 				$obj->ext_id_prestudent = $row->ext_id;
-				$obj->dual = ($row->dual=='t'?true:false);
+				$obj->dual = $this->db_parse_bool($row->dual);
 				$obj->ausstellungsstaat = $row->ausstellungsstaat;
 				
 				$this->result[] = $obj;
@@ -957,9 +990,9 @@ class prestudent extends person
 		}
 		else 
 		{
-			$this->errormsg = "Fehler beim Laden: $qry";
+			$this->errormsg = "Fehler beim Laden";
 			return false;
 		}
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 70f50af8a..10622e636 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -173,6 +173,7 @@ function draw_content_liste($row)
 			<STUDENT:punkte><![CDATA['.$row->punkte.']]></STUDENT:punkte>
 			<STUDENT:punkte1><![CDATA['.$row->rt_punkte1.']]></STUDENT:punkte1>
 			<STUDENT:punkte2><![CDATA['.$row->rt_punkte2.']]></STUDENT:punkte2>
+			<STUDENT:punkte3><![CDATA['.$row->rt_punkte3.']]></STUDENT:punkte3>
 			<STUDENT:dual><![CDATA['.($row->dual=='t'?'true':'false').']]></STUDENT:dual>
 			<STUDENT:dual_bezeichnung><![CDATA['.($row->dual=='t'?'Ja':'Nein').']]></STUDENT:dual_bezeichnung>
       	</RDF:Description>
@@ -277,6 +278,7 @@ function draw_prestudent($row)
 			<STUDENT:punkte><![CDATA['.$row->punkte.']]></STUDENT:punkte>
 			<STUDENT:punkte1><![CDATA['.$row->rt_punkte1.']]></STUDENT:punkte1>
 			<STUDENT:punkte2><![CDATA['.$row->rt_punkte2.']]></STUDENT:punkte2>
+			<STUDENT:punkte3><![CDATA['.$row->rt_punkte3.']]></STUDENT:punkte3>
 			<STUDENT:bismelden><![CDATA['.($row->bismelden?'true':'false').']]></STUDENT:bismelden>
 			<STUDENT:dual><![CDATA['.($row->dual?'true':'false').']]></STUDENT:dual>
 			<STUDENT:dual_bezeichnung><![CDATA['.($row->dual?'Ja':'Nein').']]></STUDENT:dual_bezeichnung>
@@ -399,7 +401,9 @@ if($xmlformat=='rdf')
 						AS email_privat,
 						(SELECT rt_gesamtpunkte as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as punkte,
 						(SELECT rt_punkte1 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte1,
-						(SELECT rt_punkte2 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte2, tbl_prestudent.dual as dual
+						(SELECT rt_punkte2 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte2,
+						(SELECT rt_punkte3 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte3,
+						 tbl_prestudent.dual as dual
 						FROM public.tbl_student 
 							JOIN public.tbl_benutzer ON (student_uid=uid) JOIN public.tbl_person p USING (person_id)  JOIN public.tbl_prestudent USING(prestudent_id) ";
 		if($gruppe_kurzbz!=null)
@@ -680,4 +684,4 @@ else
 	}
 	echo '</studenten>';
 }
-?>
\ No newline at end of file
+?>
diff --git a/system/checksystem.php b/system/checksystem.php
index 561ea2ffb..553abe0eb 100644
--- a/system/checksystem.php
+++ b/system/checksystem.php
@@ -4059,6 +4059,17 @@ if(!@$db->db_query("SELECT dms_id FROM public.tbl_akte LIMIT 1"))
         echo 'Spalte dms_id zu public.tbl_akte hinzugefuegt<br>';
 }
 
+// 3. Feld fuer Reihungstestpunkte
+if(!@$db->db_query("SELECT rt_punkte3 FROM public.tbl_prestudent LIMIT 1"))
+{
+    $qry ="ALTER TABLE public.tbl_prestudent ADD COLUMN rt_punkte3 numeric(8,4) DEFAULT 0;";
+    
+    if(!$db->db_query($qry))
+        echo '<strong>public.tbl_prestudent: '.$db->db_last_error().'</strong><br>';
+    else
+        echo 'Spalte rt_punkte3 zu public.tbl_prestudent hinzugefuegt<br>';
+}
+
 echo '<br>';
 
 $tabellen=array(
@@ -4218,7 +4229,7 @@ $tabellen=array(
 	"public.tbl_preoutgoing_lehrveranstaltung" => array("preoutgoing_lehrveranstaltung_id","preoutgoing_id","bezeichnung","ects","endversion","insertamum","insertvon","updateamum","updatevon","wochenstunden","unitcode"),
 	"public.tbl_preoutgoing_preoutgoing_status" => array("status_id","preoutgoing_status_kurzbz","preoutgoing_id","datum","insertamum","insertvon","updateamum","updatevon"),
 	"public.tbl_preoutgoing_status" => array("preoutgoing_status_kurzbz","bezeichnung"),
-	"public.tbl_prestudent"  => array("prestudent_id","aufmerksamdurch_kurzbz","person_id","studiengang_kz","berufstaetigkeit_code","ausbildungcode","zgv_code","zgvort","zgvdatum","zgvmas_code","zgvmaort","zgvmadatum","aufnahmeschluessel","facheinschlberuf","reihungstest_id","anmeldungreihungstest","reihungstestangetreten","rt_gesamtpunkte","rt_punkte1","rt_punkte2","bismelden","anmerkung","dual","insertamum","insertvon","updateamum","updatevon","ext_id","ausstellungsstaat"),
+	"public.tbl_prestudent"  => array("prestudent_id","aufmerksamdurch_kurzbz","person_id","studiengang_kz","berufstaetigkeit_code","ausbildungcode","zgv_code","zgvort","zgvdatum","zgvmas_code","zgvmaort","zgvmadatum","aufnahmeschluessel","facheinschlberuf","reihungstest_id","anmeldungreihungstest","reihungstestangetreten","rt_gesamtpunkte","rt_punkte1","rt_punkte2","bismelden","anmerkung","dual","insertamum","insertvon","updateamum","updatevon","ext_id","ausstellungsstaat","rt_punkte3"),
 	"public.tbl_prestudentstatus"  => array("prestudent_id","status_kurzbz","studiensemester_kurzbz","ausbildungssemester","datum","orgform_kurzbz","insertamum","insertvon","updateamum","updatevon","ext_id"),
 	"public.tbl_raumtyp"  => array("raumtyp_kurzbz","beschreibung"),
 	"public.tbl_reihungstest"  => array("reihungstest_id","studiengang_kz","ort_kurzbz","anmerkung","datum","uhrzeit","updateamum","updatevon","insertamum","insertvon","ext_id","freigeschaltet"),