diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index eaf4b071d..9c3c3a40f 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -351,8 +351,9 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
       						</hbox>
       						<label value="Reihungstest" control="student-prestudent-menulist-reihungstest"/>
       						<hbox>
+<!--								          datasources="<?php echo APP_ROOT ?>rdf/reihungstest.rdf.php?optional=true" flex="1"-->
 	      						<menulist id="student-prestudent-menulist-reihungstest" disabled="true"
-								          datasources="<?php echo APP_ROOT ?>rdf/reihungstest.rdf.php?optional=true" flex="1"
+								          datasources="rdf:null" flex="1"
 							              ref="http://www.technikum-wien.at/reihungstest/alle" 
 							              oncommand="StudentReihungstestDropDownSelect()">
 									<template>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index c19fa554e..3c8db741d 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -983,7 +983,7 @@ function StudentAuswahl()
 		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;
@@ -1037,6 +1037,25 @@ function StudentAuswahl()
 	StudentDetailRolleTreeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
 	rollentree.database.AddDataSource(StudentDetailRolleTreeDatasource);
 	StudentDetailRolleTreeDatasource.addXMLSinkObserver(StudentDetailRolleTreeSinkObserver);
+
+	// Reihungstest DropDown
+	var reihungstestmenulist = document.getElementById('student-prestudent-menulist-reihungstest');
+	var url="<?php echo APP_ROOT ?>rdf/reihungstest.rdf.php?optional=true&include_id="+reihungstest_id+"&studiengang_kz="+studiengang_kz_prestudent;
+	
+	//Alte DS entfernen
+	var oldDatasources = reihungstestmenulist.database.GetDataSources();
+	while(oldDatasources.hasMoreElements())
+	{
+		reihungstestmenulist.database.RemoveDataSource(oldDatasources.getNext());
+	}
+	//Refresh damit die entfernten DS auch wirklich entfernt werden
+	reihungstestmenulist.builder.rebuild();
+	
+	var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+	var myDatasource = rdfService.GetDataSourceBlocking(url);
+	reihungstestmenulist.database.AddDataSource(myDatasource);
+	reihungstestmenulist.builder.rebuild();
+	document.getElementById('student-prestudent-menulist-reihungstest').value=reihungstest_id;
 	
 	if(uid=='')
 	{
diff --git a/include/reihungstest.class.php b/include/reihungstest.class.php
index b588b4154..37baac20c 100644
--- a/include/reihungstest.class.php
+++ b/include/reihungstest.class.php
@@ -290,5 +290,51 @@ class reihungstest extends basis_db
 			return false;
 		}
 	}
+
+	/**
+	 * Liefert die Reihungstests der Zukunft und einer bestimmten ID
+	 * Und sortiert diese so, dass die des uebergebenen Studienganges zuerst geliefert werden
+	 * @param $include_id
+	 * @param $studiengang_kz
+	 * @return true wenn ok, sonst false
+	 */
+	public function getZukuenftige($include_id, $studiengang_kz)
+	{
+		$qry = "SELECT *, '1' as sortierung,(SELECT upper(typ || kurzbz) FROM public.tbl_studiengang WHERE studiengang_kz=tbl_reihungstest.studiengang_kz) as stg FROM public.tbl_reihungstest WHERE datum>=now()-'1 days'::interval AND studiengang_kz=".$this->db_add_param($studiengang_kz)."
+			UNION 
+			SELECT *, '2' as sortierung,(SELECT upper(typ || kurzbz) FROM public.tbl_studiengang WHERE studiengang_kz=tbl_reihungstest.studiengang_kz) as stg FROM public.tbl_reihungstest WHERE datum>=now()-'1 days'::interval AND studiengang_kz!=".$this->db_add_param($studiengang_kz)."
+			UNION
+			SELECT *, '0' as sortierung,(SELECT upper(typ || kurzbz) FROM public.tbl_studiengang WHERE studiengang_kz=tbl_reihungstest.studiengang_kz) as stg FROM public.tbl_reihungstest WHERE reihungstest_id=".$this->db_add_param($include_id)."
+			ORDER BY sortierung, stg, datum";
+		
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$obj = new reihungstest();
+				
+				$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;
+				$obj->freigeschaltet = $this->db_parse_bool($row->freigeschaltet);
+				
+				$this->result[] = $obj;
+			}
+			return true;
+		}
+		else 
+		{
+			$this->errormsg = 'Fehler beim Laden der Reihungstests';
+			return false;
+		}
+	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/rdf/reihungstest.rdf.php b/rdf/reihungstest.rdf.php
index fc7052bc8..f4745f8e2 100644
--- a/rdf/reihungstest.rdf.php
+++ b/rdf/reihungstest.rdf.php
@@ -69,7 +69,16 @@ foreach ($stg_obj->result as $row)
 	$stg[$row->studiengang_kz]=$row->kuerzel;
 
 $rt = new reihungstest();
-$rt->getAll();
+
+if(isset($_GET['include_id']) && isset($_GET['studiengang_kz']))
+{
+	$include_id=$_GET['include_id'];
+	$studiengang_kz=$_GET['studiengang_kz'];
+	$rt->getZukuenftige($include_id, $studiengang_kz);
+}
+else
+	$rt->getAll();
+
 foreach ($rt->result as $row)
 {
 ?>
@@ -88,4 +97,4 @@ foreach ($rt->result as $row)
 }
 ?>
   </RDF:Seq>
-</RDF:RDF>
\ No newline at end of file
+</RDF:RDF>