diff --git a/cis/private/lehre/pruefung/pruefungsbewertung.json.php b/cis/private/lehre/pruefung/pruefungsbewertung.json.php
index 0ff901e0c..6e5aad377 100755
--- a/cis/private/lehre/pruefung/pruefungsbewertung.json.php
+++ b/cis/private/lehre/pruefung/pruefungsbewertung.json.php
@@ -5,13 +5,19 @@ header( 'Cache-Control: no-store, no-cache, must-revalidate' );
 header( 'Pragma: no-cache' );
 header('Content-Type: text/html;charset=UTF-8');
 
-require_once('../../../../config/cis.config.inc.php');
+require_once('../../../../config/global.config.inc.php');
+if (defined('CIS_PRUEFUNG_SET_ZEUGNISNOTE') && CIS_PRUEFUNG_SET_ZEUGNISNOTE)
+	require_once('../../../../config/vilesci.config.inc.php');
+else
+	require_once('../../../../config/cis.config.inc.php');
+
 require_once('../../../../include/functions.inc.php');
 require_once('../../../../include/pruefungCis.class.php');
 require_once('../../../../include/lehrveranstaltung.class.php');
 require_once('../../../../include/benutzerberechtigung.class.php');
 require_once('../../../../include/studiensemester.class.php');
 require_once('../../../../include/note.class.php');
+require_once('../../../../include/zeugnisnote.class.php');
 require_once('../../../../include/pruefung.class.php');
 require_once('../../../../include/pruefungsanmeldung.class.php');
 require_once('../../../../include/student.class.php');
@@ -271,6 +277,28 @@ function saveBeurteilung($lehrveranstaltung_id, $student_uid, $mitarbeiter_uid,
 		$data['error']='true';
 		$data['errormsg']=$pruefung->errormsg;
 	    }
+		if (defined('CIS_PRUEFUNG_SET_ZEUGNISNOTE') && CIS_PRUEFUNG_SET_ZEUGNISNOTE)
+		{
+			$zeugnisnote = new zeugnisnote();
+			$zeugnisnote->new = true;
+			$zeugnisnote->lehrveranstaltung_id = $lehrveranstaltung_id;
+			$zeugnisnote->student_uid = $student_uid;
+			$zeugnisnote->studiensemester_kurzbz = $pruefungCis->studiensemester_kurzbz;
+			$zeugnisnote->note = $note;
+			$zeugnisnote->benotungsdatum = $pruefung->datum;
+			$zeugnisnote->insertamum = date('Y-m-d H:i:s');
+			$zeugnisnote->insertvon = $uid;
+			$zeugnisnote_check = new zeugnisnote();
+			if (!$zeugnisnote_check->load($zeugnisnote->lehrveranstaltung_id, $zeugnisnote->student_uid, $zeugnisnote->studiensemester_kurzbz))
+			{
+				$zeugnisnote->save(true);
+			}
+			else
+			{
+				$data['error'] = 'true';
+				$data['errormsg'] = 'Existing Grade';
+			}
+		}
 	}
 	else
 	{
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
old mode 100644
new mode 100755
index 2efe9be9e..6431e8f43
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -284,6 +284,10 @@ else
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#punkte3" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
+						<treecol id="student-treecol-rt_datum" label="RT Datum" flex="1" hidden="true" persist="hidden, width, ordinal"
+							class="sortDirectionIndicator"
+							sort="rdf:http://www.technikum-wien.at/student/rdf#rt_datum" 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()"/>
@@ -344,6 +348,7 @@ else
 	           							<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#rt_datum" />
 	           							<treecell label="rdf:http://www.technikum-wien.at/student/rdf#dual_bezeichnung" />
 									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#matr_nr" />
 									<treecell label="rdf:http://www.technikum-wien.at/student/rdf#studienplan_bezeichnung" />
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 1f56ae3e9..ef30125a0 100755
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -46,6 +46,7 @@ require_once('../include/lehrveranstaltung.class.php');
 require_once('../include/mitarbeiter.class.php');
 require_once('../include/organisationsform.class.php');
 require_once('../include/konto.class.php');
+require_once('../include/reihungstest.class.php');
 
 // *********** Funktionen *************************
 function convdate($date)
@@ -147,7 +148,8 @@ function draw_content_liste($row)
 	$status = $prestudent->status_kurzbz;
 	$orgform = $prestudent->orgform_kurzbz;
 	$studienplan_bezeichnung=$prestudent->studienplan_bezeichnung;
-
+	$reihungstest = new reihungstest($row->reihungstest_id);
+	$rt_datum = $reihungstest->datum;
 	echo '
 	  <RDF:li>
       	<RDF:Description  id="'.$row->prestudent_id.'"  about="'.$rdf_url.'/'.$row->prestudent_id.'" >
@@ -186,6 +188,7 @@ function draw_content_liste($row)
 		<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:rt_datum><![CDATA['.$rt_datum.']]></STUDENT:rt_datum>
 		<STUDENT:dual><![CDATA['.($row->dual=='t'?'true':'false').']]></STUDENT:dual>
 		<STUDENT:dual_bezeichnung><![CDATA['.($row->dual=='t'?'Ja':'Nein').']]></STUDENT:dual_bezeichnung>
 		<STUDENT:matr_nr><![CDATA['.$row->matr_nr.']]></STUDENT:matr_nr>
@@ -301,6 +304,8 @@ function draw_content($row)
 function draw_prestudent($row)
 {
 	global $rdf_url, $datum_obj, $stg_arr;
+	$reihungstest = new reihungstest($row->reihungstest_id);
+	$rt_datum = $reihungstest->datum;
 	if($row->prestudent_id!='')
 	{
 	echo '
@@ -332,6 +337,7 @@ function draw_prestudent($row)
 			<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:rt_datum><![CDATA['.$rt_datum.']]></STUDENT:rt_datum>
 			<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>
@@ -458,7 +464,7 @@ if($xmlformat=='rdf')
 						(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,
 						(SELECT rt_punkte3 as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as rt_punkte3,
-						 tbl_prestudent.dual as dual, p.matr_nr
+						 tbl_prestudent.dual as dual, tbl_prestudent.reihungstest_id, p.matr_nr
 						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)