From 6dfe76e95bb83a9f1566932f207f23ecd4e20b34 Mon Sep 17 00:00:00 2001
From: Nikolaus Krondraf <krondraf@technikum-wien.at>
Date: Fri, 7 Nov 2014 11:43:01 +0000
Subject: [PATCH] =?UTF-8?q?Filter=20f=C3=BCr=20offene=20Buchungen=20hinzug?=
 =?UTF-8?q?ef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/student/studentkontooverlay.xul.php | 31 +++++++++++++++++++++
 content/student/studentoverlay.js.php       |  4 ++-
 rdf/student.rdf.php                         |  9 ++++--
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/content/student/studentkontooverlay.xul.php b/content/student/studentkontooverlay.xul.php
index 946faebfc..333609549 100644
--- a/content/student/studentkontooverlay.xul.php
+++ b/content/student/studentkontooverlay.xul.php
@@ -54,7 +54,9 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 						<button id="student-konto-button-filter" value="alle" oncommand="StudentKontoFilter()" label="offene anzeigen" disabled="true"/>
 					</hbox>
 					<hbox>
+						<!--
 						<button id="student-konto-button-filterstudenten" oncommand="StudentKontoFilterStudenten('konto')" label="Studentenliste auf offene Buchungen filtern" tooltiptext="Liste aller Studenten mit offenen Buchungen"/>
+						-->
 						<!--
 						<button id="student-konto-button-filterstudiengebuehr" oncommand="StudentKontoFilterStudenten('studiengebuehr')" label="nicht gebuchte Studiengebuehr" tooltiptext="Liste aller Studenten ohne Studiengebuehrbelastung"/>
 						-->
@@ -83,6 +85,35 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 						
 					</hbox>
 				</row>
+				<row>
+					<hbox></hbox>
+					<hbox>
+						<vbox>
+							<spacer flex="1" />
+							<label value="Liste auf offene"/>
+							<sapcer flex="1" />
+						</vbox>
+						<vbox flex="1">
+							<spacer flex="1" />
+							<menulist id="student-konto-menulist-filter-buchungstyp-offen" disabled="false"
+							          datasources="<?php echo APP_ROOT ?>rdf/buchungstyp.rdf.php" flex="1"
+							          ref="http://www.technikum-wien.at/buchungstyp/liste" >
+								<template>
+									<menupopup>
+										<menuitem value="alle"
+												  label="alle Buchungstypen"/>
+										<menuitem value="rdf:http://www.technikum-wien.at/buchungstyp/rdf#buchungstyp_kurzbz"
+							        		      label="rdf:http://www.technikum-wien.at/buchungstyp/rdf#beschreibung"
+										  		  uri="rdf:*"/>
+									</menupopup>
+								</template>
+							</menulist>
+							<spacer flex="1" />
+						</vbox>
+						<button id="student-konto-button-filterbuchungstypoffen" oncommand="StudentKontoFilterStudenten('konto')" label="filtern"/>
+						
+					</hbox>
+				</row>
 				
 				<row flex="1">
 					<vbox flex="1">
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 90415f7a6..751966290 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -2258,6 +2258,8 @@ function StudentKontoFilterStudenten(filter)
 		return;
 	}
 	
+	buchungstyp = document.getElementById('student-konto-menulist-filter-buchungstyp-offen').value;
+	
     // Progressmeter starten. Ab jetzt keine 'return's mehr.
     document.getElementById('statusbar-progressmeter').setAttribute('mode','undetermined');
     //globalProgressmeter.StartPM();
@@ -2274,7 +2276,7 @@ function StudentKontoFilterStudenten(filter)
 		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();
+	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+"&buchungstyp="+buchungstyp+"&"+gettimestamp();
 	var treeStudent=document.getElementById('student-tree');
 
 	try
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index a88114cdb..cd5ed07e6 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -51,7 +51,7 @@ function convdate($date)
 	return $y.'-'.$m.'-'.$d;
 }
 
-function checkfilter($row, $filter2)
+function checkfilter($row, $filter2, $buchungstyp = null)
 {
 	global $studiensemester_kurzbz, $kontofilterstg;
 	$db = new basis_db();
@@ -74,7 +74,9 @@ function checkfilter($row, $filter2)
 		$qry = "SELECT sum(betrag) as summe FROM tbl_konto WHERE person_id='$row->person_id'";
 		if($kontofilterstg=='true')
 			$qry.=" AND studiengang_kz='$row->studiengang_kz'";
-		//echo $qry;
+		if($buchungstyp != null && $buchungstyp != "alle")
+			$qry.=" AND buchungstyp_kurzbz='$buchungstyp'";
+		
 		if($db->db_query($qry))
 			if($row_filter = $db->db_fetch_object())
 				if($row_filter->summe=='0.00' || $row_filter->summe=='' || $row_filter->summe=='0')
@@ -320,6 +322,7 @@ $filter = (isset($_GET['filter'])?$_GET['filter']:null);
 $ss = (isset($_GET['ss'])?$_GET['ss']:null);
 $filter2 = (isset($_GET['filter2'])?$_GET['filter2']:null);
 $orgform = (isset($_GET['orgform'])?$_GET['orgform']:null);
+$buchungstyp_filter = (isset($_GET['buchungstyp'])?$_GET['buchungstyp']:null);
 
 $db = new basis_db();
 
@@ -426,7 +429,7 @@ if($xmlformat=='rdf')
 		{
 			while($row = $db->db_fetch_object())
 			{
-				if(checkfilter($row, $filter2))
+				if(checkfilter($row, $filter2, $buchungstyp_filter))
 					draw_content_liste($row);
 			}
 		}