blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-02 04:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Filter für offene Buchungen hinzugefügt

Browse Source
This commit is contained in:
Nikolaus Krondraf
2014-11-07 11:43:01 +00:00
parent f231056d85
commit 6dfe76e95b
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/student/studentkontooverlay.xul.php
+31
View File
@@ -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">
content/student/studentoverlay.js.php
+3 -1
View File
@@ -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
rdf/student.rdf.php
+6 -3
View File
@@ -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);
}
}