2026-07-20 00:12:15 +00:00 · 2008-02-22 13:40:54 +00:00
parent ecebad8d9a
commit 385da330ae
3 changed files with 244 additions and 339 deletions
@@ -79,7 +79,11 @@
 	// Studiensemester setzen
 	$ss=new studiensemester($conn,$studiensemester);
 	if ($studiensemester==null)
-		$studiensemester=$ss->getAktTillNext();
+	{
+		$studiensemester = $ss->getaktorNext();
+		$ss->load($studiensemester);
+	}
+	
 	$datum_beginn=$ss->start;
 	$datum_ende=$ss->ende;
 	$ts_beginn=$datum_obj->mktime_fromdate($datum_beginn);
@@ -682,11 +682,8 @@ function StudentAuswahl()

 	try
 	{
-		//Ausgewaehlte UID holen
-        //var col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
-		//var uid=tree.view.getCellText(tree.currentIndex,col);
-		 var col = tree.columns ? tree.columns["student-treecol-prestudent_id"] : "student-treecol-prestudent_id";
-		var prestudent_id=tree.view.getCellText(tree.currentIndex,col);
+		//Ausgewaehlte prestudent_id holen
+		var prestudent_id = getTreeCellText(tree, 'student-treecol-prestudent_id', tree.currentIndex);
 		
 		if(prestudent_id!='')
 		{
@@ -1386,6 +1383,9 @@ function StudentPrestudentSave()
 	}
 }

+// ****
+// * Loescht eine Prestudentrolle
+// ****
 function StudentPrestudentRolleDelete()
 {
 	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
@@ -1393,18 +1393,11 @@ function StudentPrestudentRolleDelete()

 	if (tree.currentIndex==-1) return;

-	//Ausgewaehlte Nr holen
-    var col = tree.columns ? tree.columns["student-prestudent-tree-rolle-rolle_kurzbz"] : "student-prestudent-tree-rolle-rolle_kurzbz";
-	var rolle_kurzbz=tree.view.getCellText(tree.currentIndex,col);
-
-	var col = tree.columns ? tree.columns["student-prestudent-tree-rolle-studiensemester_kurzbz"] : "student-prestudent-tree-rolle-studiensemester_kurzbz";
-	var studiensemester_kurzbz=tree.view.getCellText(tree.currentIndex,col);
-	
-	var col = tree.columns ? tree.columns["student-prestudent-tree-rolle-prestudent_id"] : "student-prestudent-tree-rolle-prestudent_id";
-	var prestudent_id=tree.view.getCellText(tree.currentIndex,col);
-
-	var col = tree.columns ? tree.columns["student-prestudent-tree-rolle-ausbildungssemester"] : "student-prestudent-tree-rolle-ausbildungssemester";
-	var ausbildungssemester=tree.view.getCellText(tree.currentIndex,col);
+	//markierte Rolle holen
+	var rolle_kurzbz = getTreeCellText(tree, 'student-prestudent-tree-rolle-rolle_kurzbz', tree.currentIndex);
+	var studiensemester_kurzbz = getTreeCellText(tree, 'student-prestudent-tree-rolle-studiensemester_kurzbz', tree.currentIndex);
+	var prestudent_id = getTreeCellText(tree, 'student-prestudent-tree-rolle-prestudent_id', tree.currentIndex);	
+	var ausbildungssemester = getTreeCellText(tree, 'student-prestudent-tree-rolle-ausbildungssemester', tree.currentIndex);

 	studiengang_kz = document.getElementById('student-prestudent-menulist-studiengang_kz').value;
 	if(confirm('Diese Rolle wirklich loeschen?'))
@@ -1450,17 +1443,10 @@ function StudentRolleBearbeiten()
 	if (tree.currentIndex==-1) return;

 	//Ausgewaehlte Nr holen
-    var col = tree.columns ? tree.columns["student-prestudent-tree-rolle-rolle_kurzbz"] : "student-prestudent-tree-rolle-rolle_kurzbz";
-	var rolle_kurzbz=tree.view.getCellText(tree.currentIndex,col);
-
-	var col = tree.columns ? tree.columns["student-prestudent-tree-rolle-studiensemester_kurzbz"] : "student-prestudent-tree-rolle-studiensemester_kurzbz";
-	var studiensemester_kurzbz=tree.view.getCellText(tree.currentIndex,col);
-	
-	var col = tree.columns ? tree.columns["student-prestudent-tree-rolle-prestudent_id"] : "student-prestudent-tree-rolle-prestudent_id";
-	var prestudent_id=tree.view.getCellText(tree.currentIndex,col);
-
-	var col = tree.columns ? tree.columns["student-prestudent-tree-rolle-ausbildungssemester"] : "student-prestudent-tree-rolle-ausbildungssemester";
-	var ausbildungssemester=tree.view.getCellText(tree.currentIndex,col);
+	var rolle_kurzbz = getTreeCellText(tree, 'student-prestudent-tree-rolle-rolle_kurzbz', tree.currentIndex);
+	var studiensemester_kurzbz = getTreeCellText(tree, 'student-prestudent-tree-rolle-studiensemester_kurzbz', tree.currentIndex);
+	var prestudent_id = getTreeCellText(tree, 'student-prestudent-tree-rolle-prestudent_id', tree.currentIndex);	
+	var ausbildungssemester = getTreeCellText(tree, 'student-prestudent-tree-rolle-ausbildungssemester', tree.currentIndex);

 	window.open('<?php echo APP_ROOT?>content/student/studentrolledialog.xul.php?prestudent_id='+prestudent_id+'&rolle_kurzbz='+rolle_kurzbz+'&studiensemester_kurzbz='+studiensemester_kurzbz+'&ausbildungssemester='+ausbildungssemester,"Status","chrome, status=no, width=500, height=300, centerscreen, resizable");
 }
@@ -1580,8 +1566,7 @@ function StudentAddRolle(rolle, semester, studiensemester)
 	if (tree.currentIndex==-1) return;

 	//Ausgewaehlte ID holen
-    var col = tree.columns ? tree.columns["student-treecol-prestudent_id"] : "student-treecol-prestudent_id";
-	var prestudent_id=tree.view.getCellText(tree.currentIndex,col);
+	var prestudent_id = getTreeCellText(tree, 'student-treecol-prestudent_id', tree.currentIndex);

 	if(semester!='0' || confirm('Diesen Studenten zum '+rolle+' machen?'))
 	{
@@ -1631,13 +1616,12 @@ function StudentPrintInskriptionsbestaetigung()
 	for (var t = 0; t < numRanges; t++)
 	{
  		tree.view.selection.getRangeAt(t,start,end);
-			for (var v = start.value; v <= end.value; v++)
-			{
-			col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
-			uid = tree.view.getCellText(v,col);
+		for (var v = start.value; v <= end.value; v++)
+		{
+			uid = getTreeCellText(tree, 'student-treecol-uid', v);
 			paramList += ';'+uid;
 			anzahl = anzahl+1;
-			}
+		}
 	}

 	var stsem = getStudiensemester();
@@ -1670,8 +1654,7 @@ function StudentExport()
 			
 		for (var v=0; v < items; v++)
 		{
-			col = tree.columns ? tree.columns["student-treecol-prestudent_id"] : "student-treecol-prestudent_id";
-			prestudent_id = tree.view.getCellText(v,col);
+			prestudent_id = getTreeCellText(tree, 'student-treecol-prestudent_id', v);
 			data = data+';'+prestudent_id;
 		}
 	}
@@ -1689,8 +1672,7 @@ function StudentExport()
 	  		tree.view.selection.getRangeAt(t,start,end);
 			for (var v = start.value; v <= end.value; v++)
 			{
-				col = tree.columns ? tree.columns["student-treecol-prestudent_id"] : "student-treecol-prestudent_id";
-				prestudent_id = tree.view.getCellText(v,col);
+				prestudent_id = getTreeCellText(tree, 'student-treecol-prestudent_id', v);
 				data = data+';'+prestudent_id;
 			}
 		}
@@ -1699,40 +1681,6 @@ function StudentExport()
 	stsem = getStudiensemester();
 	action = '<?php echo APP_ROOT; ?>content/statistik/studentenexport.xls.php?studiensemester_kurzbz='+stsem;
 	OpenWindowPost(action, data);
-	
-/*
-	var tree=document.getElementById('tree-verband');
-
-	//Wenn nichts markiert wurde -> beenden
-	if(tree.currentIndex==-1)
-		return;
-
-	var col;
-	col = tree.columns ? tree.columns["stg_kz"] : "stg_kz";
-	var stg_kz=tree.view.getCellText(tree.currentIndex,col);
-	col = tree.columns ? tree.columns["sem"] : "sem";
-	var sem=tree.view.getCellText(tree.currentIndex,col);
-	col = tree.columns ? tree.columns["ver"] : "ver";
-	var ver=tree.view.getCellText(tree.currentIndex,col);
-	col = tree.columns ? tree.columns["grp"] : "grp";
-	var grp=tree.view.getCellText(tree.currentIndex,col);
-	col = tree.columns ? tree.columns["gruppe"] : "gruppe";
-	var gruppe=tree.view.getCellText(tree.currentIndex,col);
-	col = tree.columns ? tree.columns["typ"] : "typ";
-	var typ=tree.view.getCellText(tree.currentIndex,col);
-	col = tree.columns ? tree.columns["stsem"] : "stsem";
-	var stsem=tree.view.getCellText(tree.currentIndex,col);
-	if(typ=='')
-		typ='student';
-	
-	if(typ=='student')
-		stsem = getStudiensemester();
-	url = "<?php echo APP_ROOT; ?>content/statistik/studentenexport.xls.php?studiengang_kz="+stg_kz+"&semester="+sem+"&verband="+ver+"&gruppe="+grp+"&gruppe_kurzbz="+gruppe+"&studiensemester_kurzbz="+stsem+"&typ="+typ+"&"+gettimestamp();
-	
-	//alert(url);
-	window.open(url,"","chrome,status=no, modal, width=400, height=250, centerscreen, resizable");
-	//window.location.href=url;	
-	*/
 }

 // **************** KONTO ******************
@@ -1765,8 +1713,7 @@ function StudentKontoTreeSelectBuchung()
 	   	for(var i=0;i<items;i++)
 	   	{
 	   		//buchungsnr der row holen
-			col = tree.columns ? tree.columns["student-konto-tree-buchungsnr"] : "student-konto-tree-buchungsnr";
-			buchungsnr=tree.view.getCellText(i,col);
+			buchungsnr = getTreeCellText(tree, 'student-konto-tree-buchungsnr', i);

 			//wenn dies die zu selektierende Zeile
 			if(buchungsnr == StudentKontoSelectBuchung)
@@ -1782,6 +1729,9 @@ function StudentKontoTreeSelectBuchung()
 	}
 }

+// ****
+// * Laedt die Buchungen der markierten Person
+// ****
 function StudentKontoLoad()
 {
 	person_id = document.getElementById('student-detail-textbox-person_id').value;
@@ -1830,8 +1780,7 @@ function StudentKontoAuswahl()
 	StudentKontoDetailDisableFields(false);

 	//Ausgewaehlte Nr holen
-    var col = tree.columns ? tree.columns["student-konto-tree-buchungsnr"] : "student-konto-tree-buchungsnr";
-	var buchungsnr=tree.view.getCellText(tree.currentIndex,col);
+	var buchungsnr = getTreeCellText(tree, 'student-konto-tree-buchungsnr', tree.currentIndex);

 	//Daten holen
 	var url = '<?php echo APP_ROOT ?>rdf/konto.rdf.php?buchungsnr='+buchungsnr+'&'+gettimestamp();
@@ -1900,8 +1849,7 @@ function StudentKontoFilter()
 		if(kontotree.currentIndex!='-1')
 		{
 			//Ausgewaehlte Nr holen
-		    var col = kontotree.columns ? kontotree.columns["student-konto-tree-buchungsnr"] : "student-konto-tree-buchungsnr";
-			buchungsnr=kontotree.view.getCellText(kontotree.currentIndex,col);
+			buchungsnr = getTreeCellText(kontotree, 'student-konto-tree-buchungsnr', kontotree.currentIndex);
 		}
 	}
 	catch(e)
@@ -1964,6 +1912,8 @@ function StudentKontoFilterStudenten(filter)
 		
 	if(stsem=='')
 		stsem = getStudiensemester();
+	if(typ=='')
+		typ='student';
 	url = "<?php echo APP_ROOT; ?>rdf/student.rdf.php?studiengang_kz="+stg_kz+"&semester="+sem+"&verband="+ver+"&gruppe="+grp+"&gruppe_kurzbz="+gruppe+"&studiensemester_kurzbz="+stsem+"&typ="+typ+"&filter2="+filter+"&"+gettimestamp();
 	var treeStudent=document.getElementById('student-tree');

@@ -2091,16 +2041,11 @@ function StudentKontoGegenbuchung()
  		tree.view.selection.getRangeAt(t,start,end);
 			for (var v = start.value; v <= end.value; v++)
 			{
-				var col = tree.columns ? tree.columns["student-konto-tree-buchungsnr"] : "student-konto-tree-buchungsnr";
-				var buchungsnr=tree.view.getCellText(v,col);
+				var buchungsnr = getTreeCellText(tree, 'student-konto-tree-buchungsnr', v);
 				paramList += ';'+buchungsnr;
 			}
 	}
-	
-	//Ausgewaehlte Nr holen
-    //var col = tree.columns ? tree.columns["student-konto-tree-buchungsnr"] : "student-konto-tree-buchungsnr";
-	//var buchungsnr=tree.view.getCellText(tree.currentIndex,col);
-
+		
 	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
 	var req = new phpRequest(url,'','');

@@ -2145,8 +2090,7 @@ function StudentKontoDelete()
 	StudentKontoDetailDisableFields(false);

 	//Ausgewaehlte Nr holen
-    var col = tree.columns ? tree.columns["student-konto-tree-buchungsnr"] : "student-konto-tree-buchungsnr";
-	var buchungsnr=tree.view.getCellText(tree.currentIndex,col);
+	var buchungsnr = getTreeCellText(tree, 'student-konto-tree-buchungsnr', tree.currentIndex);

 	if(confirm('Diese Buchung wirklich loeschen?'))
 	{
@@ -2257,15 +2201,7 @@ function StudentKontoZahlungsbestaetigung()
  		tree.view.selection.getRangeAt(t,start,end);
 			for (var v = start.value; v <= end.value; v++)
 			{
-				/*
-				if(!tree.view.getParentIndex(v))
-				{
-					alert('Zum Drucken der Bestaetigung bitte die oberste Buchung waehlen');
-					return false;
-				}
-				*/
-				var col = tree.columns ? tree.columns["student-konto-tree-buchungsnr"] : "student-konto-tree-buchungsnr";
-				var buchungsnr=tree.view.getCellText(v,col);
+				var buchungsnr = getTreeCellText(tree, 'student-konto-tree-buchungsnr', v);
 				paramList += ';'+buchungsnr;
 			}
 	}
@@ -2299,8 +2235,7 @@ function StudentCreateZeugnis()
  		tree.view.selection.getRangeAt(t,start,end);
 		for (var v = start.value; v <= end.value; v++)
 		{			
-			var col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
-			var uid=tree.view.getCellText(v,col);
+			var uid = getTreeCellText(tree, 'student-treecol-uid', v);
 			paramList += ';'+uid;
 		}
 	}
@@ -2329,12 +2264,11 @@ function StudentZeugnisAnzeigen()
 	try
 	{
 		//Ausgewaehlte ID holen
-        var col = tree.columns ? tree.columns["student-zeugnis-tree-akte_id"] : "student-zeugnis-tree-akte_id";
-		var akte_id=tree.view.getCellText(tree.currentIndex,col);
+		var akte_id = getTreeCellText(tree, 'student-zeugnis-tree-akte_id', tree.currentIndex);
+		
 		if(akte_id!='')
 		{
 			window.open('<?php echo APP_ROOT;?>content/akte.php?id='+akte_id,'File');
-			//document.location.href='<?php echo APP_ROOT;?>content/akte.php?id='+akte_id;
 		}
 		else
 		{
@@ -2363,8 +2297,7 @@ function StudentAkteDel()
 	try
 	{
 		//Ausgewaehlte Akte holen
-        var col = tree.columns ? tree.columns["student-zeugnis-tree-akte_id"] : "student-zeugnis-tree-akte_id";
-		var akte_id=tree.view.getCellText(tree.currentIndex,col);
+		var akte_id = getTreeCellText(tree, 'student-zeugnis-tree-akte_id', tree.currentIndex);
 	}
 	catch(e)
 	{
@@ -2416,10 +2349,7 @@ function StudentZeugnisArchivieren()
 		alert('Student muss ausgewaehlt sein');
 		return;
 	}
-    //var col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
-	//var uid=tree.view.getCellText(tree.currentIndex,col);
-	
-	
+    	
 	var tree=document.getElementById('student-tree');
 	var numRanges = tree.view.selection.getRangeCount();
 	var start = new Object();
@@ -2435,8 +2365,7 @@ function StudentZeugnisArchivieren()
  		tree.view.selection.getRangeAt(t,start,end);
  		for (v=start.value; v<=end.value; v++)
  		{
-  			var col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
-  			uid = tree.view.getCellText(v,col)
+  			uid = getTreeCellText(tree, 'student-treecol-uid', v);
  			
  			url = '<?php echo APP_ROOT; ?>content/pdfExport.php?xsl=Zeugnis&xml=zeugnis.rdf.php&uid='+uid+'&ss='+stsem+'&archive=1';

@@ -2469,9 +2398,8 @@ function StudentIOAuswahl()

 	StudentIODetailDisableFields(false);

-	//Ausgewaehlte Nr holen
-    var col = tree.columns ? tree.columns["student-io-tree-bisio_id"] : "student-io-tree-bisio_id";
-	var bisio_id=tree.view.getCellText(tree.currentIndex,col);
+	//Ausgewaehlte ID holen
+	var bisio_id = getTreeCellText(tree, 'student-io-tree-bisio_id', tree.currentIndex);

 	//Daten holen
 	var url = '<?php echo APP_ROOT ?>rdf/bisio.rdf.php?bisio_id='+bisio_id+'&'+gettimestamp();
@@ -2504,11 +2432,8 @@ function StudentIOAuswahl()
 		//Wenn nach dem Personen gesucht wurde, ist es moeglich, dass kein Studiengang gewaehlt ist.
 		//Dann wird der Studiengang/Semester des Studenten genommen
 		var verband_tree=document.getElementById('tree-verband');
-		var col = verband_tree.columns ? verband_tree.columns["stg_kz"] : "stg_kz";
-		var stg_kz=verband_tree.view.getCellText(verband_tree.currentIndex,col);
-		
-		col = verband_tree.columns ? verband_tree.columns["sem"] : "sem";
-		var sem=verband_tree.view.getCellText(verband_tree.currentIndex,col);
+		var stg_kz = getTreeCellText(verband_tree, 'stg_kz', verband_tree.currentIndex);
+		var sem = getTreeCellText(verband_tree, 'sem', verband_tree.currentIndex);
 	}
 	catch(e)
 	{	
@@ -2706,8 +2631,8 @@ function StudentIODelete()
 	StudentIODetailDisableFields(false);

 	//Ausgewaehlte Nr holen
-    var col = tree.columns ? tree.columns["student-io-tree-bisio_id"] : "student-io-tree-bisio_id";
-	var bisio_id=tree.view.getCellText(tree.currentIndex,col);
+	var bisio_id = getTreeCellText(tree, 'student-io-tree-bisio_id', tree.currentIndex);
+	
 	studiengang_kz = document.getElementById('student-prestudent-menulist-studiengang_kz').value;
 	
 	if(confirm('Diesen Eintrag wirklich loeschen?'))
@@ -2774,11 +2699,9 @@ function StudentIONeu()
 		//Wenn nach dem Personen gesucht wurde, ist es moeglich, dass kein Studiengang gewaehlt ist.
 		//Dann wird der Studiengang/Semester des Studenten genommen
 		var verband_tree=document.getElementById('tree-verband');
-		var col = verband_tree.columns ? verband_tree.columns["stg_kz"] : "stg_kz";
-		var stg_kz=verband_tree.view.getCellText(verband_tree.currentIndex,col);
 		
-		col = verband_tree.columns ? verband_tree.columns["sem"] : "sem";
-		var sem=verband_tree.view.getCellText(verband_tree.currentIndex,col);
+		var stg_kz = getTreeCellText(verband_tree, 'stg_kz', verband_tree.currentIndex);
+		var sem = getTreeCellText(verband_tree, 'sem', verband_tree.currentIndex);
 	}
 	catch(e)
 	{	
@@ -2838,8 +2761,7 @@ function StudentIOTreeSelectID()
 	   	for(var i=0;i<items;i++)
 	   	{
 	   		//ID der row holen
-			col = tree.columns ? tree.columns["student-io-tree-bisio_id"] : "student-io-tree-bisio_id";
-			var bisio_id=tree.view.getCellText(i,col);
+			var bisio_id = getTreeCellText(tree, 'student-io-tree-bisio_id', i);

 			//wenn dies die zu selektierende Zeile
 			if(bisio_id == StudentIOSelectID)
@@ -49,211 +49,213 @@ function convdate($date)
 	list($d,$m,$y) = explode('.',$date);
 	return $y.'-'.$m.'-'.$d;
 }
-	function checkfilter($row, $filter2)
-	{
-		global $conn, $studiensemester_kurzbz;

-		if($filter2=='dokumente')
-		{
-			// Alle Personen die noch nicht alle Dokumente gebracht haben
-			$qry = "SELECT count(*) as anzahl FROM public.tbl_dokumentstudiengang WHERE
-					dokument_kurzbz NOT IN(
-						SELECT dokument_kurzbz FROM tbl_dokumentprestudent WHERE prestudent_id='$row->prestudent_id')
-					AND studiengang_kz='$row->studiengang_kz'";
-			if($result_filter = pg_query($conn, $qry))
-				if($row_filter = pg_fetch_object($result_filter))
-					if($row_filter->anzahl==0)
-						return false;
-		}
-		elseif($filter2=='konto')
-		{
-			// Alle Personen die offene Buchungen haben
-			$qry = "SELECT sum(betrag) as summe FROM tbl_konto WHERE person_id='$row->person_id'";
-			if($result_filter = pg_query($conn, $qry))
-				if($row_filter = pg_fetch_object($result_filter))
-					if($row_filter->summe=='0.00' || $row_filter->summe=='' || $row_filter->summe=='0')
-						return false;
-		}
-		elseif($filter2=='studiengebuehr')
-		{
-			// Alle Personen die keine Studiengebuehrbelastung haben 
-			// Incoming werden nicht beruecksichtigt
-			$prestudent = new prestudent($conn, null, null);
-			$prestudent->getLastStatus($row->prestudent_id);
-			
-			$qry = "SELECT count(*) as anzahl FROM public.tbl_konto WHERE 
-						studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' AND 
-						person_id='".addslashes($row->person_id)."' AND 
-						buchungstyp_kurzbz='Studiengebuehr'";
-			if($result_filter = pg_query($conn, $qry))
-				if($row_filter = pg_fetch_object($result_filter))
-					if($row_filter->anzahl>0 || $prestudent->rolle_kurzbz=='Incoming')
-						return false;
-		}
-		elseif($filter2=='zgvohnedatum')
-		{
-			//Alle Personen die den ZGV Typ eingetragen haben aber noch kein Datum
-			$qry = "SELECT zgv_code, zgvdatum, zgvmas_code, zgvmadatum FROM public.tbl_prestudent WHERE prestudent_id='$row->prestudent_id'";
-			if($result_filter = pg_query($conn, $qry))
-			{
-				if($row_filter = pg_fetch_object($result_filter))
-				{
-					if(($row_filter->zgv_code!='' && $row_filter->zgvdatum=='') ||
-					   ($row_filter->zgvmas_code!='' && $row_filter->zgvmadatum==''))
-					   	return true;
-					else 
-						return false;
-				}
-			}			
-		}
-		return true;
+function checkfilter($row, $filter2)
+{
+	global $conn, $studiensemester_kurzbz;
+
+	if($filter2=='dokumente')
+	{
+		// Alle Personen die noch nicht alle Dokumente gebracht haben
+		$qry = "SELECT count(*) as anzahl FROM public.tbl_dokumentstudiengang WHERE
+				dokument_kurzbz NOT IN(
+					SELECT dokument_kurzbz FROM tbl_dokumentprestudent WHERE prestudent_id='$row->prestudent_id')
+				AND studiengang_kz='$row->studiengang_kz'";
+		if($result_filter = pg_query($conn, $qry))
+			if($row_filter = pg_fetch_object($result_filter))
+				if($row_filter->anzahl==0)
+					return false;
 	}
-
-	function draw_content_liste($row)
+	elseif($filter2=='konto')
 	{
-		global $rdf_url, $datum_obj, $conn, $stg_arr;
-		$status='';
-
-		$mail_privat = '';
-		/*$qry_mail = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id='$row->person_id' AND zustellung=true ORDER BY kontakt_id DESC LIMIT 1";
-		if($result_mail = pg_query($conn, $qry_mail))
+		// Alle Personen die offene Buchungen haben
+		$qry = "SELECT sum(betrag) as summe FROM tbl_konto WHERE person_id='$row->person_id'";
+		if($result_filter = pg_query($conn, $qry))
+			if($row_filter = pg_fetch_object($result_filter))
+				if($row_filter->summe=='0.00' || $row_filter->summe=='' || $row_filter->summe=='0')
+					return false;
+	}
+	elseif($filter2=='studiengebuehr')
+	{
+		// Alle Personen die keine Studiengebuehrbelastung haben 
+		// Incoming werden nicht beruecksichtigt
+		$prestudent = new prestudent($conn, null, null);
+		$prestudent->getLastStatus($row->prestudent_id);
+		
+		$qry = "SELECT count(*) as anzahl FROM public.tbl_konto WHERE 
+					studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' AND 
+					person_id='".addslashes($row->person_id)."' AND 
+					buchungstyp_kurzbz='Studiengebuehr'";
+		if($result_filter = pg_query($conn, $qry))
+			if($row_filter = pg_fetch_object($result_filter))
+				if($row_filter->anzahl>0 || $prestudent->rolle_kurzbz=='Incoming')
+					return false;
+	}
+	elseif($filter2=='zgvohnedatum')
+	{
+		//Alle Personen die den ZGV Typ eingetragen haben aber noch kein Datum
+		$qry = "SELECT zgv_code, zgvdatum, zgvmas_code, zgvmadatum FROM public.tbl_prestudent WHERE prestudent_id='$row->prestudent_id'";
+		if($result_filter = pg_query($conn, $qry))
 		{
-			if($row_mail = pg_fetch_object($result_mail))
+			if($row_filter = pg_fetch_object($result_filter))
 			{
-				$mail_privat = $row_mail->kontakt;
+				if(($row_filter->zgv_code!='' && $row_filter->zgvdatum=='') ||
+				   ($row_filter->zgvmas_code!='' && $row_filter->zgvmadatum==''))
+				   	return true;
+				else 
+					return false;
 			}
-		}*/
+		}			
+	}
+	return true;
+}

+function draw_content_liste($row)
+{
+	global $rdf_url, $datum_obj, $conn, $stg_arr;
+	$status='';
+
+	$mail_privat = '';
+	/*$qry_mail = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id='$row->person_id' AND zustellung=true ORDER BY kontakt_id DESC LIMIT 1";
+	if($result_mail = pg_query($conn, $qry_mail))
+	{
+		if($row_mail = pg_fetch_object($result_mail))
+		{
+			$mail_privat = $row_mail->kontakt;
+		}
+	}*/
+
+	$prestudent = new prestudent($conn, null, null);
+	$prestudent->getLastStatus($row->prestudent_id);
+	$status = $prestudent->rolle_kurzbz;
+	$orgform = $prestudent->orgform_kurzbz;
+
+	echo '
+	  <RDF:li>
+      	<RDF:Description  id="'.$row->prestudent_id.'"  about="'.$rdf_url.'/'.$row->prestudent_id.'" >
+        	<STUDENT:person_id><![CDATA['.$row->person_id.']]></STUDENT:person_id>
+        	<STUDENT:prestudent_id><![CDATA['.$row->prestudent_id.']]></STUDENT:prestudent_id>
+        	<STUDENT:uid><![CDATA['.(isset($row->uid)?$row->uid:'').']]></STUDENT:uid>
+    		<STUDENT:titelpre><![CDATA['.$row->titelpre.']]></STUDENT:titelpre>
+    		<STUDENT:titelpost><![CDATA['.$row->titelpost.']]></STUDENT:titelpost>
+    		<STUDENT:vornamen><![CDATA['.$row->vornamen.']]></STUDENT:vornamen>
+    		<STUDENT:vorname><![CDATA['.$row->vorname.']]></STUDENT:vorname>
+    		<STUDENT:nachname><![CDATA['.$row->nachname.']]></STUDENT:nachname>
+    		<STUDENT:svnr>'.($row->svnr==''?'&#xA0;':'<![CDATA['.$row->svnr.']]>').'</STUDENT:svnr>
+    		<STUDENT:ersatzkennzeichen>'.($row->ersatzkennzeichen==''?'&#xA0;':'<![CDATA['.$row->ersatzkennzeichen.']]>').'</STUDENT:ersatzkennzeichen>
+    		<STUDENT:geburtsdatum><![CDATA['.$datum_obj->convertISODate($row->gebdatum).']]></STUDENT:geburtsdatum>
+    		<STUDENT:geburtsdatum_iso><![CDATA['.$row->gebdatum.']]></STUDENT:geburtsdatum_iso>
+			<STUDENT:semester><![CDATA['.(isset($row->semester)?$row->semester:'').']]></STUDENT:semester>
+    		<STUDENT:verband><![CDATA['.(isset($row->verband)?$row->verband:'').']]></STUDENT:verband>
+    		<STUDENT:gruppe><![CDATA['.(isset($row->gruppe)?$row->gruppe:'').']]></STUDENT:gruppe>
+			<STUDENT:matrikelnummer><![CDATA['.(isset($row->matrikelnr)?$row->matrikelnr:'').']]></STUDENT:matrikelnummer>
+    		<STUDENT:mail_privat><![CDATA['.$row->email_privat.']]></STUDENT:mail_privat>
+    		<STUDENT:mail_intern><![CDATA['.(isset($row->uid)?$row->uid.'@'.DOMAIN:'').']]></STUDENT:mail_intern>
+			<STUDENT:status><![CDATA['.$status.']]></STUDENT:status>
+    		<STUDENT:anmerkungen>'.($row->anmerkungen==''?'&#xA0;':'<![CDATA['.$row->anmerkungen.']]>').'</STUDENT:anmerkungen>
+    		<STUDENT:anmerkungpre>'.($row->anmerkung==''?'&#xA0;':'<![CDATA['.$row->anmerkung.']]>').'</STUDENT:anmerkungpre>
+    		<STUDENT:studiengang_kz><![CDATA['.$row->studiengang_kz.']]></STUDENT:studiengang_kz>
+			<STUDENT:studiengang><![CDATA['.$stg_arr[$row->studiengang_kz].']]></STUDENT:studiengang>
+			<STUDENT:orgform><![CDATA['.$orgform.']]></STUDENT:orgform>
+      	</RDF:Description>
+      </RDF:li>';
+}
+
+function draw_content($row)
+{
+	global $rdf_url, $datum_obj, $conn;
+	$status='';
+
+	$mail_privat = '';
+	/*$qry_mail = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id='$row->person_id' AND zustellung=true ORDER BY kontakt_id DESC LIMIT 1";
+	if($result_mail = pg_query($conn, $qry_mail))
+	{
+		if($row_mail = pg_fetch_object($result_mail))
+		{
+			$mail_privat = $row_mail->kontakt;
+		}
+	}*/
+
+	if($row->prestudent_id!='')
+	{
 		$prestudent = new prestudent($conn, null, null);
 		$prestudent->getLastStatus($row->prestudent_id);
 		$status = $prestudent->rolle_kurzbz;
 		$orgform = $prestudent->orgform_kurzbz;
+	echo '
+	  <RDF:li>
+      	<RDF:Description  id="'.$row->prestudent_id.'"  about="'.$rdf_url.'/'.$row->prestudent_id.'" >
+        	<STUDENT:person_id><![CDATA['.$row->person_id.']]></STUDENT:person_id>
+    		<STUDENT:titelpre><![CDATA['.$row->titelpre.']]></STUDENT:titelpre>
+    		<STUDENT:titelpost><![CDATA['.$row->titelpost.']]></STUDENT:titelpost>
+    		<STUDENT:vornamen><![CDATA['.$row->vornamen.']]></STUDENT:vornamen>
+    		<STUDENT:vorname><![CDATA['.$row->vorname.']]></STUDENT:vorname>
+    		<STUDENT:nachname><![CDATA['.$row->nachname.']]></STUDENT:nachname>
+    		<STUDENT:geburtsdatum><![CDATA['.$datum_obj->convertISODate($row->gebdatum).']]></STUDENT:geburtsdatum>
+    		<STUDENT:geburtsdatum_iso><![CDATA['.$row->gebdatum.']]></STUDENT:geburtsdatum_iso>
+    		<STUDENT:homepage><![CDATA['.$row->homepage.']]></STUDENT:homepage>
+    		<STUDENT:gebort><![CDATA['.$row->gebort.']]></STUDENT:gebort>
+    		<STUDENT:gebzeit><![CDATA['.$row->gebzeit.']]></STUDENT:gebzeit>
+    		<STUDENT:anmerkungen>'.($row->anmerkungen==''?'&#xA0;':'<![CDATA['.$row->anmerkungen.']]>').'</STUDENT:anmerkungen>
+    		<STUDENT:anrede><![CDATA['.$row->anrede.']]></STUDENT:anrede>
+    		<STUDENT:svnr><![CDATA['.$row->svnr.']]></STUDENT:svnr>
+    		<STUDENT:ersatzkennzeichen><![CDATA['.$row->ersatzkennzeichen.']]></STUDENT:ersatzkennzeichen>
+    		<STUDENT:familienstand><![CDATA['.$row->familienstand.']]></STUDENT:familienstand>
+    		<STUDENT:geschlecht><![CDATA['.$row->geschlecht.']]></STUDENT:geschlecht>
+    		<STUDENT:anzahlkinder><![CDATA['.$row->anzahlkinder.']]></STUDENT:anzahlkinder>
+    		<STUDENT:staatsbuergerschaft><![CDATA['.$row->staatsbuergerschaft.']]></STUDENT:staatsbuergerschaft>
+    		<STUDENT:geburtsnation><![CDATA['.$row->geburtsnation.']]></STUDENT:geburtsnation>
+    		<STUDENT:sprache><![CDATA['.$row->sprache.']]></STUDENT:sprache>
+    		<STUDENT:status><![CDATA['.$status.']]></STUDENT:status>
+    		<STUDENT:orgform><![CDATA['.$orgform.']]></STUDENT:orgform>
+    		<STUDENT:mail_privat><![CDATA['.$mail_privat.']]></STUDENT:mail_privat>
+    		<STUDENT:mail_intern><![CDATA['.(isset($row->uid)?$row->uid.'@'.DOMAIN:'').']]></STUDENT:mail_intern>

-		echo '
-		  <RDF:li>
-	      	<RDF:Description  id="'.$row->prestudent_id.'"  about="'.$rdf_url.'/'.$row->prestudent_id.'" >
-	        	<STUDENT:person_id><![CDATA['.$row->person_id.']]></STUDENT:person_id>
-	        	<STUDENT:prestudent_id><![CDATA['.$row->prestudent_id.']]></STUDENT:prestudent_id>
-	        	<STUDENT:uid><![CDATA['.(isset($row->uid)?$row->uid:'').']]></STUDENT:uid>
-	    		<STUDENT:titelpre><![CDATA['.$row->titelpre.']]></STUDENT:titelpre>
-	    		<STUDENT:titelpost><![CDATA['.$row->titelpost.']]></STUDENT:titelpost>
-	    		<STUDENT:vornamen><![CDATA['.$row->vornamen.']]></STUDENT:vornamen>
-	    		<STUDENT:vorname><![CDATA['.$row->vorname.']]></STUDENT:vorname>
-	    		<STUDENT:nachname><![CDATA['.$row->nachname.']]></STUDENT:nachname>
-	    		<STUDENT:svnr>'.($row->svnr==''?'&#xA0;':'<![CDATA['.$row->svnr.']]>').'</STUDENT:svnr>
-	    		<STUDENT:ersatzkennzeichen>'.($row->ersatzkennzeichen==''?'&#xA0;':'<![CDATA['.$row->ersatzkennzeichen.']]>').'</STUDENT:ersatzkennzeichen>
-	    		<STUDENT:geburtsdatum><![CDATA['.$datum_obj->convertISODate($row->gebdatum).']]></STUDENT:geburtsdatum>
-	    		<STUDENT:geburtsdatum_iso><![CDATA['.$row->gebdatum.']]></STUDENT:geburtsdatum_iso>
-				<STUDENT:semester><![CDATA['.(isset($row->semester)?$row->semester:'').']]></STUDENT:semester>
-	    		<STUDENT:verband><![CDATA['.(isset($row->verband)?$row->verband:'').']]></STUDENT:verband>
-	    		<STUDENT:gruppe><![CDATA['.(isset($row->gruppe)?$row->gruppe:'').']]></STUDENT:gruppe>
-				<STUDENT:matrikelnummer><![CDATA['.(isset($row->matrikelnr)?$row->matrikelnr:'').']]></STUDENT:matrikelnummer>
-	    		<STUDENT:mail_privat><![CDATA['.$row->email_privat.']]></STUDENT:mail_privat>
-	    		<STUDENT:mail_intern><![CDATA['.(isset($row->uid)?$row->uid.'@'.DOMAIN:'').']]></STUDENT:mail_intern>
-				<STUDENT:status><![CDATA['.$status.']]></STUDENT:status>
-	    		<STUDENT:anmerkungen>'.($row->anmerkungen==''?'&#xA0;':'<![CDATA['.$row->anmerkungen.']]>').'</STUDENT:anmerkungen>
-	    		<STUDENT:anmerkungpre>'.($row->anmerkung==''?'&#xA0;':'<![CDATA['.$row->anmerkung.']]>').'</STUDENT:anmerkungpre>
-	    		<STUDENT:studiengang_kz><![CDATA['.$row->studiengang_kz.']]></STUDENT:studiengang_kz>
-				<STUDENT:studiengang><![CDATA['.$stg_arr[$row->studiengang_kz].']]></STUDENT:studiengang>
-				<STUDENT:orgform><![CDATA['.$orgform.']]></STUDENT:orgform>
-	      	</RDF:Description>
-	      </RDF:li>';
+    		<STUDENT:aktiv><![CDATA['.((isset($row->bnaktiv) && $row->bnaktiv)?'true':'false').']]></STUDENT:aktiv>
+    		<STUDENT:uid><![CDATA['.(isset($row->uid)?$row->uid:'').']]></STUDENT:uid>
+    		<STUDENT:matrikelnummer><![CDATA['.(isset($row->matrikelnr)?$row->matrikelnr:'').']]></STUDENT:matrikelnummer>
+			<STUDENT:alias><![CDATA['.(isset($row->alias)?$row->alias:'').']]></STUDENT:alias>
+    		<STUDENT:semester><![CDATA['.(isset($row->semester)?$row->semester:'').']]></STUDENT:semester>
+    		<STUDENT:verband><![CDATA['.(isset($row->verband)?$row->verband:'').']]></STUDENT:verband>
+    		<STUDENT:gruppe><![CDATA['.(isset($row->gruppe)?$row->gruppe:'').']]></STUDENT:gruppe>
+			<STUDENT:studiengang_kz_student><![CDATA['.(is_a($row,'student')?$row->studiengang_kz:'').']]></STUDENT:studiengang_kz_student>';
 	}
+}

-	function draw_content($row)
+function draw_prestudent($row)
+{
+	global $rdf_url, $datum_obj, $stg_arr;
+	if($row->prestudent_id!='')
 	{
-		global $rdf_url, $datum_obj, $conn;
-		$status='';
-
-		$mail_privat = '';
-		/*$qry_mail = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id='$row->person_id' AND zustellung=true ORDER BY kontakt_id DESC LIMIT 1";
-		if($result_mail = pg_query($conn, $qry_mail))
-		{
-			if($row_mail = pg_fetch_object($result_mail))
-			{
-				$mail_privat = $row_mail->kontakt;
-			}
-		}*/
-
-		if($row->prestudent_id!='')
-		{
-			$prestudent = new prestudent($conn, null, null);
-			$prestudent->getLastStatus($row->prestudent_id);
-			$status = $prestudent->rolle_kurzbz;
-			$orgform = $prestudent->orgform_kurzbz;
-		echo '
-		  <RDF:li>
-	      	<RDF:Description  id="'.$row->prestudent_id.'"  about="'.$rdf_url.'/'.$row->prestudent_id.'" >
-	        	<STUDENT:person_id><![CDATA['.$row->person_id.']]></STUDENT:person_id>
-	    		<STUDENT:titelpre><![CDATA['.$row->titelpre.']]></STUDENT:titelpre>
-	    		<STUDENT:titelpost><![CDATA['.$row->titelpost.']]></STUDENT:titelpost>
-	    		<STUDENT:vornamen><![CDATA['.$row->vornamen.']]></STUDENT:vornamen>
-	    		<STUDENT:vorname><![CDATA['.$row->vorname.']]></STUDENT:vorname>
-	    		<STUDENT:nachname><![CDATA['.$row->nachname.']]></STUDENT:nachname>
-	    		<STUDENT:geburtsdatum><![CDATA['.$datum_obj->convertISODate($row->gebdatum).']]></STUDENT:geburtsdatum>
-	    		<STUDENT:geburtsdatum_iso><![CDATA['.$row->gebdatum.']]></STUDENT:geburtsdatum_iso>
-	    		<STUDENT:homepage><![CDATA['.$row->homepage.']]></STUDENT:homepage>
-	    		<STUDENT:gebort><![CDATA['.$row->gebort.']]></STUDENT:gebort>
-	    		<STUDENT:gebzeit><![CDATA['.$row->gebzeit.']]></STUDENT:gebzeit>
-	    		<STUDENT:anmerkungen>'.($row->anmerkungen==''?'&#xA0;':'<![CDATA['.$row->anmerkungen.']]>').'</STUDENT:anmerkungen>
-	    		<STUDENT:anrede><![CDATA['.$row->anrede.']]></STUDENT:anrede>
-	    		<STUDENT:svnr><![CDATA['.$row->svnr.']]></STUDENT:svnr>
-	    		<STUDENT:ersatzkennzeichen><![CDATA['.$row->ersatzkennzeichen.']]></STUDENT:ersatzkennzeichen>
-	    		<STUDENT:familienstand><![CDATA['.$row->familienstand.']]></STUDENT:familienstand>
-	    		<STUDENT:geschlecht><![CDATA['.$row->geschlecht.']]></STUDENT:geschlecht>
-	    		<STUDENT:anzahlkinder><![CDATA['.$row->anzahlkinder.']]></STUDENT:anzahlkinder>
-	    		<STUDENT:staatsbuergerschaft><![CDATA['.$row->staatsbuergerschaft.']]></STUDENT:staatsbuergerschaft>
-	    		<STUDENT:geburtsnation><![CDATA['.$row->geburtsnation.']]></STUDENT:geburtsnation>
-	    		<STUDENT:sprache><![CDATA['.$row->sprache.']]></STUDENT:sprache>
-	    		<STUDENT:status><![CDATA['.$status.']]></STUDENT:status>
-	    		<STUDENT:orgform><![CDATA['.$orgform.']]></STUDENT:orgform>
-	    		<STUDENT:mail_privat><![CDATA['.$mail_privat.']]></STUDENT:mail_privat>
-	    		<STUDENT:mail_intern><![CDATA['.(isset($row->uid)?$row->uid.'@'.DOMAIN:'').']]></STUDENT:mail_intern>
-
-	    		<STUDENT:aktiv><![CDATA['.((isset($row->bnaktiv) && $row->bnaktiv)?'true':'false').']]></STUDENT:aktiv>
-	    		<STUDENT:uid><![CDATA['.(isset($row->uid)?$row->uid:'').']]></STUDENT:uid>
-	    		<STUDENT:matrikelnummer><![CDATA['.(isset($row->matrikelnr)?$row->matrikelnr:'').']]></STUDENT:matrikelnummer>
-				<STUDENT:alias><![CDATA['.(isset($row->alias)?$row->alias:'').']]></STUDENT:alias>
-	    		<STUDENT:semester><![CDATA['.(isset($row->semester)?$row->semester:'').']]></STUDENT:semester>
-	    		<STUDENT:verband><![CDATA['.(isset($row->verband)?$row->verband:'').']]></STUDENT:verband>
-	    		<STUDENT:gruppe><![CDATA['.(isset($row->gruppe)?$row->gruppe:'').']]></STUDENT:gruppe>
-				<STUDENT:studiengang_kz_student><![CDATA['.(is_a($row,'student')?$row->studiengang_kz:'').']]></STUDENT:studiengang_kz_student>';
-		}
-	}
-	function draw_prestudent($row)
-	{
-		global $rdf_url, $datum_obj, $stg_arr;
-		if($row->prestudent_id!='')
-		{
-		echo '
-				<STUDENT:prestudent_id><![CDATA['.$row->prestudent_id.']]></STUDENT:prestudent_id>
-	    		<STUDENT:studiengang_kz_prestudent><![CDATA['.$row->studiengang_kz.']]></STUDENT:studiengang_kz_prestudent>
-				<STUDENT:studiengang_kz><![CDATA['.$row->studiengang_kz.']]></STUDENT:studiengang_kz>
-				<STUDENT:aufmerksamdurch_kurzbz><![CDATA['.$row->aufmerksamdurch_kurzbz.']]></STUDENT:aufmerksamdurch_kurzbz>
-				<STUDENT:studiengang><![CDATA['.$stg_arr[$row->studiengang_kz].']]></STUDENT:studiengang>
-				<STUDENT:berufstaetigkeit_code><![CDATA['.$row->berufstaetigkeit_code.']]></STUDENT:berufstaetigkeit_code>
-				<STUDENT:ausbildungcode><![CDATA['.$row->ausbildungcode.']]></STUDENT:ausbildungcode>
-				<STUDENT:zgv_code><![CDATA['.$row->zgv_code.']]></STUDENT:zgv_code>
-				<STUDENT:zgvort><![CDATA['.$row->zgvort.']]></STUDENT:zgvort>
-				<STUDENT:zgvdatum><![CDATA['.$datum_obj->convertISODate($row->zgvdatum).']]></STUDENT:zgvdatum>
-				<STUDENT:zgvdatum_iso><![CDATA['.$row->zgvdatum.']]></STUDENT:zgvdatum_iso>
-				<STUDENT:zgvmas_code><![CDATA['.$row->zgvmas_code.']]></STUDENT:zgvmas_code>
-				<STUDENT:zgvmaort><![CDATA['.$row->zgvmaort.']]></STUDENT:zgvmaort>
-				<STUDENT:zgvmadatum><![CDATA['.$datum_obj->convertISODate($row->zgvmadatum).']]></STUDENT:zgvmadatum>
-				<STUDENT:zgvmadatum_iso><![CDATA['.$row->zgvmadatum.']]></STUDENT:zgvmadatum_iso>
-				<STUDENT:aufnahmeschluessel><![CDATA['.$row->aufnahmeschluessel.']]></STUDENT:aufnahmeschluessel>
-				<STUDENT:facheinschlberuf><![CDATA['.($row->facheinschlberuf?'true':'false').']]></STUDENT:facheinschlberuf>
-				<STUDENT:reihungstest_id><![CDATA['.$row->reihungstest_id.']]></STUDENT:reihungstest_id>
-				<STUDENT:anmeldungreihungstest><![CDATA['.$datum_obj->convertISODate($row->anmeldungreihungstest).']]></STUDENT:anmeldungreihungstest>
-				<STUDENT:anmeldungreihungstest_iso><![CDATA['.$row->anmeldungreihungstest.']]></STUDENT:anmeldungreihungstest_iso>
-				<STUDENT:reihungstestangetreten><![CDATA['.($row->reihungstestangetreten?'true':'false').']]></STUDENT:reihungstestangetreten>
-				<STUDENT:punkte><![CDATA['.$row->punkte.']]></STUDENT:punkte>
-				<STUDENT:bismelden><![CDATA['.($row->bismelden?'true':'false').']]></STUDENT:bismelden>
-				<STUDENT:anmerkung><![CDATA['.$row->anmerkung.']]></STUDENT:anmerkung>
-	      	</RDF:Description>
-	      </RDF:li>';
-		}
+	echo '
+			<STUDENT:prestudent_id><![CDATA['.$row->prestudent_id.']]></STUDENT:prestudent_id>
+    		<STUDENT:studiengang_kz_prestudent><![CDATA['.$row->studiengang_kz.']]></STUDENT:studiengang_kz_prestudent>
+			<STUDENT:studiengang_kz><![CDATA['.$row->studiengang_kz.']]></STUDENT:studiengang_kz>
+			<STUDENT:aufmerksamdurch_kurzbz><![CDATA['.$row->aufmerksamdurch_kurzbz.']]></STUDENT:aufmerksamdurch_kurzbz>
+			<STUDENT:studiengang><![CDATA['.$stg_arr[$row->studiengang_kz].']]></STUDENT:studiengang>
+			<STUDENT:berufstaetigkeit_code><![CDATA['.$row->berufstaetigkeit_code.']]></STUDENT:berufstaetigkeit_code>
+			<STUDENT:ausbildungcode><![CDATA['.$row->ausbildungcode.']]></STUDENT:ausbildungcode>
+			<STUDENT:zgv_code><![CDATA['.$row->zgv_code.']]></STUDENT:zgv_code>
+			<STUDENT:zgvort><![CDATA['.$row->zgvort.']]></STUDENT:zgvort>
+			<STUDENT:zgvdatum><![CDATA['.$datum_obj->convertISODate($row->zgvdatum).']]></STUDENT:zgvdatum>
+			<STUDENT:zgvdatum_iso><![CDATA['.$row->zgvdatum.']]></STUDENT:zgvdatum_iso>
+			<STUDENT:zgvmas_code><![CDATA['.$row->zgvmas_code.']]></STUDENT:zgvmas_code>
+			<STUDENT:zgvmaort><![CDATA['.$row->zgvmaort.']]></STUDENT:zgvmaort>
+			<STUDENT:zgvmadatum><![CDATA['.$datum_obj->convertISODate($row->zgvmadatum).']]></STUDENT:zgvmadatum>
+			<STUDENT:zgvmadatum_iso><![CDATA['.$row->zgvmadatum.']]></STUDENT:zgvmadatum_iso>
+			<STUDENT:aufnahmeschluessel><![CDATA['.$row->aufnahmeschluessel.']]></STUDENT:aufnahmeschluessel>
+			<STUDENT:facheinschlberuf><![CDATA['.($row->facheinschlberuf?'true':'false').']]></STUDENT:facheinschlberuf>
+			<STUDENT:reihungstest_id><![CDATA['.$row->reihungstest_id.']]></STUDENT:reihungstest_id>
+			<STUDENT:anmeldungreihungstest><![CDATA['.$datum_obj->convertISODate($row->anmeldungreihungstest).']]></STUDENT:anmeldungreihungstest>
+			<STUDENT:anmeldungreihungstest_iso><![CDATA['.$row->anmeldungreihungstest.']]></STUDENT:anmeldungreihungstest_iso>
+			<STUDENT:reihungstestangetreten><![CDATA['.($row->reihungstestangetreten?'true':'false').']]></STUDENT:reihungstestangetreten>
+			<STUDENT:punkte><![CDATA['.$row->punkte.']]></STUDENT:punkte>
+			<STUDENT:bismelden><![CDATA['.($row->bismelden?'true':'false').']]></STUDENT:bismelden>
+			<STUDENT:anmerkung><![CDATA['.$row->anmerkung.']]></STUDENT:anmerkung>
+      	</RDF:Description>
+      </RDF:li>';
 	}
+}

 // ******* Init **************************
 // Datenbank Verbindung
@@ -344,28 +346,6 @@ if($xmlformat=='rdf')

 		$where.=" AND tbl_studentlehrverband.studiensemester_kurzbz='$studiensemester_kurzbz'";

-		/*$sql_query = "SET CLIENT_ENCODING TO 'UNICODE'; SELECT tbl_person.person_id, tbl_student.prestudent_id, tbl_benutzer.uid, tbl_person.titelpre,
-		                     tbl_person.titelpost, tbl_person.vorname, tbl_person.vornamen, tbl_person.nachname,
-		                      tbl_person.gebdatum, tbl_person.anmerkungen, tbl_person.ersatzkennzeichen,
-		                     tbl_person.svnr, tbl_student.matrikelnr, tbl_studentlehrverband.semester,
-		                     tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe, tbl_studentlehrverband.studiengang_kz
-					  FROM public.tbl_person, public.tbl_student, public.tbl_benutzer, public.tbl_studentlehrverband";*/
-		/*$sql_query="SET CLIENT_ENCODING TO 'UNICODE';
-					SELECT person_id, tbl_student.prestudent_id, tbl_benutzer.uid, titelpre, titelpost,
-						vorname, vornamen, nachname, gebdatum, anmerkungen,ersatzkennzeichen,svnr, tbl_student.matrikelnr,
-						tbl_studentlehrverband.semester,tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
-						tbl_studentlehrverband.studiengang_kz, kontakt AS email_privat
-					FROM public.tbl_studentlehrverband JOIN public.tbl_student USING (student_uid)
-						JOIN public.tbl_benutzer ON (student_uid=uid) JOIN public.tbl_person USING (person_id)
-						LEFT OUTER JOIN public.tbl_kontakt ON (tbl_person.person_id=tbl_kontakt.person_id AND kontakttyp='email' AND zustellung) ";*/
-		/*$sql_query="SET CLIENT_ENCODING TO 'UNICODE';
-					SELECT person_id, tbl_student.prestudent_id, tbl_benutzer.uid, titelpre, titelpost,
-						vorname, vornamen, nachname, gebdatum, anmerkungen,ersatzkennzeichen,svnr, tbl_student.matrikelnr,
-						tbl_studentlehrverband.semester,tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
-						tbl_studentlehrverband.studiengang_kz
-					FROM public.tbl_studentlehrverband JOIN public.tbl_student USING (student_uid)
-						JOIN public.tbl_benutzer ON (student_uid=uid) JOIN public.tbl_person USING (person_id)
-					WHERE ";*/
 		$sql_query="SET CLIENT_ENCODING TO 'UNICODE';
 					SELECT p.person_id, tbl_student.prestudent_id, tbl_benutzer.uid, titelpre, titelpost,	vorname, vornamen,
 						nachname, gebdatum, tbl_prestudent.anmerkung,ersatzkennzeichen,svnr, tbl_student.matrikelnr, p.anmerkung as anmerkungen,
@@ -381,7 +361,6 @@ if($xmlformat=='rdf')
 							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)
 			$sql_query.= "JOIN public.tbl_benutzergruppe USING (uid) ";
-		//$sql_query.= " WHERE tbl_person.person_id=tbl_benutzer.person_id AND tbl_benutzer.uid = tbl_student.student_uid AND tbl_studentlehrverband.student_uid=tbl_student.student_uid AND $where ORDER BY nachname, vorname";
 		$sql_query.="WHERE ".$where.' ORDER BY nachname, vorname';
 		//echo $sql_query;
 		if($result = pg_query($conn, $sql_query))