mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-15 19:19:28 +00:00
Squashed commit of the following:
commit f8bc2388095b1b41f56dd9bda8abd4fdd86e4a4c Author: Stefan Puraner <puraner@technikum-wien.at> Date: Tue Apr 21 11:17:25 2015 +0200 Refactoring Suche nach Zahlungsreferenz commit ed1b8608c5bdbb08d6e3ce02ba63359f7b28d7ae Author: Stefan Puraner <puraner@technikum-wien.at> Date: Tue Apr 21 10:59:13 2015 +0200 Mitarbeiter anlegen mit Personalnummer NULL möglich; FAS-Suche um Parameter Zahlungsreferenz erweitert; commit 652ba355e6dd0504402c7c20364a8ce25f766d83 Author: Stefan Puraner <puraner@technikum-wien.at> Date: Mon Apr 13 09:42:35 2015 +0200 Datumsfeld für manulles Buchungsdatum bei Gegenbuchungen hinzugefügt
This commit is contained in:
Stefan Puraner
@@ -160,5 +160,8 @@ define('RT_PUNKTE3','false');
|
||||
define('TABLE_ID','_id');
|
||||
define('TABLE_BEGIN','tbl_');
|
||||
define('VIEW_BEGIN','vw_');
|
||||
|
||||
//Legt fest ob die Personalnummer beim Anlegen NULL sein soll
|
||||
define('FAS_PERSONALNUMMER_GENERATE_NULL', false);
|
||||
|
||||
?>
|
||||
|
||||
@@ -1721,6 +1721,16 @@ if(!$error)
|
||||
if(isset($_POST['buchungsnr']))
|
||||
{
|
||||
$bnr_arr = explode(';',$_POST['buchungsnr']);
|
||||
$gegenbuchungsdatum = filter_input(INPUT_POST, "gegenbuchungsdatum");
|
||||
if(strlen($gegenbuchungsdatum) != 0)
|
||||
{
|
||||
$gegenbuchungsdatum = date("Y-m-d", strtotime($gegenbuchungsdatum));
|
||||
}
|
||||
else
|
||||
{
|
||||
$gegenbuchungsdatum = date('Y-m-d');
|
||||
}
|
||||
|
||||
$errormsg='';
|
||||
foreach ($bnr_arr as $buchungsnr)
|
||||
{
|
||||
@@ -1745,7 +1755,7 @@ if(!$error)
|
||||
$kto = new konto();
|
||||
//$buchung->betrag*(-1);
|
||||
$buchung->betrag = $kto->getDifferenz($buchungsnr);
|
||||
$buchung->buchungsdatum = date('Y-m-d');
|
||||
$buchung->buchungsdatum = $gegenbuchungsdatum;
|
||||
$buchung->mahnspanne = '0';
|
||||
$buchung->buchungsnr_verweis = $buchung->buchungsnr;
|
||||
$buchung->new = true;
|
||||
|
||||
@@ -1,325 +1,326 @@
|
||||
<?php
|
||||
/* Copyright (C) 2006 Technikum-Wien
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
|
||||
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
|
||||
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
|
||||
*/
|
||||
|
||||
header("Cache-Control: no-cache");
|
||||
header("Cache-Control: post-check=0, pre-check=0",false);
|
||||
header("Expires Mon, 26 Jul 1997 05:00:00 GMT");
|
||||
header("Pragma: no-cache");
|
||||
header("Content-type: application/vnd.mozilla.xul+xml");
|
||||
require_once('../../config/vilesci.config.inc.php');
|
||||
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
|
||||
?>
|
||||
|
||||
<overlay id="StudentKonto"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
>
|
||||
<!-- Zeugnis Overlay -->
|
||||
<vbox id="student-konto" style="overflow:auto;margin:0px;" flex="1">
|
||||
<popupset>
|
||||
<menupopup id="student-konto-tree-popup">
|
||||
<menuitem label="Entfernen" oncommand="StudentKontoDelete();" id="student-konto-tree-popup-kontodel" hidden="false"/>
|
||||
</menupopup>
|
||||
</popupset>
|
||||
<hbox flex="1">
|
||||
<grid id="student-konto-grid-detail" style="margin:4px;" flex="1">
|
||||
<columns >
|
||||
<column flex="4"/>
|
||||
<column flex="1"/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<hbox>
|
||||
<spacer flex="1" />
|
||||
<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"/>
|
||||
-->
|
||||
|
||||
<vbox>
|
||||
<spacer flex="1" />
|
||||
<label value="Liste auf nicht gebuchte"/>
|
||||
<sapcer flex="1" />
|
||||
</vbox>
|
||||
<vbox flex="1">
|
||||
<spacer flex="1" />
|
||||
<menulist id="student-konto-menulist-filter-buchungstyp" 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="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-filterbuchungstyp" oncommand="StudentKontoFilterBuchungstyp()" label="filtern"/>
|
||||
|
||||
</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">
|
||||
<label id="student-konto-label-filter" value="alle Buchungen:"/>
|
||||
<tree id="student-konto-tree" seltype="multi" hidecolumnpicker="false" flex="1"
|
||||
datasources="rdf:null" ref="http://www.technikum-wien.at/konto/liste"
|
||||
style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" enableColumnDrag="true"
|
||||
context="student-konto-tree-popup"
|
||||
flags="dont-build-content"
|
||||
>
|
||||
<!-- onselect="StudentKontoAuswahl()" - wird jetzt per JS gesetzt -->
|
||||
<treecols>
|
||||
<treecol id="student-konto-tree-buchungsdatum" label="Buchungsdatum" flex="2" hidden="false" primary="true"
|
||||
class="sortDirectionIndicator"
|
||||
sortActive="true"
|
||||
sortDirection="ascending"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungsdatum_iso"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-buchungstext" label="Buchungstext" flex="5" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungstext"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-betrag" label="Betrag" flex="2" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#betrag" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-studiensemester_kurzbz" label="StSem" flex="2" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#studiensemester_kurzbz" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-buchungstyp_kurzbz" label="Typ" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungstyp_kurzbz" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-buchungsnr" label="buchungs_nr" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungsnr" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-insertvon" label="Angelegt von" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#insertvon" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-insertamum" label="Anlagedatum" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#insertvon" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-studiengang" label="Studiengang" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#studiengang_kuerzel" />
|
||||
<splitter class="tree-splitter"/>
|
||||
</treecols>
|
||||
|
||||
<template>
|
||||
<treechildren flex="1" >
|
||||
<treeitem uri="rdf:*">
|
||||
<treerow>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungsdatum"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungstext"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#betrag"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#studiensemester_kurzbz"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungstyp_kurzbz"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungsnr"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#insertvon"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#insertamum"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#studiengang_kuerzel"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</template>
|
||||
</tree>
|
||||
</vbox>
|
||||
<vbox flex="1">
|
||||
<hbox>
|
||||
<button id="student-konto-button-neu" label="Neu" oncommand="StudentKontoNeu();" disabled="true"/>
|
||||
<button id="student-konto-button-gegenbuchung" label="Gegenbuchung" oncommand="StudentKontoGegenbuchung();" disabled="true"/>
|
||||
<button id="student-konto-button-loeschen" label="Loeschen" oncommand="StudentKontoDelete();" disabled="true"/>
|
||||
<spacer flex="1"/>
|
||||
<button id="student-konto-button-zahlungsbestaetigung" label="Zahlungsbestaetigung drucken" oncommand="StudentKontoZahlungsbestaetigung();" disabled="true"/>
|
||||
</hbox>
|
||||
<vbox hidden="true">
|
||||
<label value="Buchungsnr" control="student-konto-textbox-buchungsnr"/>
|
||||
<textbox id="student-konto-textbox-buchungsnr" disabled="true"/>
|
||||
</vbox>
|
||||
<groupbox id="student-konto-groupbox">
|
||||
<caption label="Details"/>
|
||||
<grid id="student-konto-grid-detail" style="overflow:auto;margin:4px;" flex="1">
|
||||
<columns >
|
||||
<column flex="1"/>
|
||||
<column flex="5"/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<label value="Betrag" control="student-konto-textbox-betrag"/>
|
||||
<hbox>
|
||||
<textbox id="student-konto-textbox-betrag" disabled="true" maxlength="9" size="9"/>
|
||||
<spacer flex="1" />
|
||||
</hbox>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Buchungsdatum" control="student-konto-textbox-buchungsdatum"/>
|
||||
<hbox>
|
||||
<box class="Datum" id="student-konto-textbox-buchungsdatum" disabled="true"/>
|
||||
<!--<textbox id="student-konto-textbox-buchungsdatum" disabled="true" maxlength="10" size="10"/>-->
|
||||
<spacer flex="1" />
|
||||
</hbox>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Buchungstext" control="student-konto-textbox-buchungstext"/>
|
||||
<textbox id="student-konto-textbox-buchungstext" disabled="true" maxlength="256"/>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Mahnspanne" control="student-konto-textbox-mahnspanne"/>
|
||||
<hbox>
|
||||
<textbox id="student-konto-textbox-mahnspanne" disabled="true" maxlength="4" size="4"/>
|
||||
<spacer flex="1" />
|
||||
</hbox>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Typ" control="student-konto-menulist-buchungstyp"/>
|
||||
<menulist id="student-konto-menulist-buchungstyp" disabled="true"
|
||||
xmlns:TYP="http://www.technikum-wien.at/buchungstyp/rdf#"
|
||||
datasources="<?php echo APP_ROOT ?>rdf/buchungstyp.rdf.php" flex="1"
|
||||
ref="http://www.technikum-wien.at/buchungstyp/liste" >
|
||||
<template>
|
||||
<rule TYP:aktiv="false">
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/buchungstyp/rdf#buchungstyp_kurzbz"
|
||||
label="rdf:http://www.technikum-wien.at/buchungstyp/rdf#beschreibung"
|
||||
uri="rdf:*" style="text-decoration:line-through;"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
<rule>
|
||||
<menupopup>
|
||||
<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>
|
||||
</rule>
|
||||
|
||||
</template>
|
||||
</menulist>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Studiensemester" control="student-konto-menulist-studiensemester"/>
|
||||
<menulist id="student-konto-menulist-studiensemester" disabled="true"
|
||||
datasources="<?php echo APP_ROOT ?>rdf/studiensemester.rdf.php" flex="1"
|
||||
ref="http://www.technikum-wien.at/studiensemester/liste" >
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/studiensemester/rdf#kurzbz"
|
||||
label="rdf:http://www.technikum-wien.at/studiensemester/rdf#kurzbz"
|
||||
uri="rdf:*"/>
|
||||
</menupopup>
|
||||
</template>
|
||||
</menulist>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Studiengang" control="student-konto-menulist-studiengang_kz"/>
|
||||
<menulist id="student-konto-menulist-studiengang_kz" disabled="true"
|
||||
xmlns:STG="http://www.technikum-wien.at/studiengang/rdf#"
|
||||
datasources="<?php echo APP_ROOT ?>rdf/studiengang.rdf.php" flex="1"
|
||||
ref="http://www.technikum-wien.at/studiengang/liste" >
|
||||
<template>
|
||||
<!--<rule STG:aktiv="false">
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/buchungstyp/rdf#buchungstyp_kurzbz"
|
||||
label="rdf:http://www.technikum-wien.at/buchungstyp/rdf#beschreibung"
|
||||
uri="rdf:*" style="text-decoration:line-through;"/>
|
||||
</menupopup>
|
||||
</rule>-->
|
||||
<rule>
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/studiengang/rdf#studiengang_kz"
|
||||
label="rdf:http://www.technikum-wien.at/studiengang/rdf#kuerzel"
|
||||
uri="rdf:*"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
|
||||
</template>
|
||||
</menulist>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Credit Points" control="student-konto-textbox-credit_points"/>
|
||||
<hbox>
|
||||
<textbox id="student-konto-textbox-credit_points" disabled="true" maxlength="9" size="9"/>
|
||||
<spacer flex="1" />
|
||||
</hbox>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Zahlungsreferenz" control="student-konto-textbox-zahlungsreferenz"/>
|
||||
<hbox>
|
||||
<textbox id="student-konto-textbox-zahlungsreferenz" disabled="true" maxlength="20" size="20"/>
|
||||
<spacer flex="1" />
|
||||
</hbox>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<hbox>
|
||||
<spacer flex="1" />
|
||||
<button id="student-konto-button-speichern" oncommand="StudentKontoDetailSpeichern()" label="Speichern" disabled="true"/>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
</vbox>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
</hbox>
|
||||
</vbox>
|
||||
<?php
|
||||
/* Copyright (C) 2006 Technikum-Wien
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
|
||||
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
|
||||
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
|
||||
*/
|
||||
|
||||
header("Cache-Control: no-cache");
|
||||
header("Cache-Control: post-check=0, pre-check=0",false);
|
||||
header("Expires Mon, 26 Jul 1997 05:00:00 GMT");
|
||||
header("Pragma: no-cache");
|
||||
header("Content-type: application/vnd.mozilla.xul+xml");
|
||||
require_once('../../config/vilesci.config.inc.php');
|
||||
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
|
||||
?>
|
||||
|
||||
<overlay id="StudentKonto"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
>
|
||||
<!-- Zeugnis Overlay -->
|
||||
<vbox id="student-konto" style="overflow:auto;margin:0px;" flex="1">
|
||||
<popupset>
|
||||
<menupopup id="student-konto-tree-popup">
|
||||
<menuitem label="Entfernen" oncommand="StudentKontoDelete();" id="student-konto-tree-popup-kontodel" hidden="false"/>
|
||||
</menupopup>
|
||||
</popupset>
|
||||
<hbox flex="1">
|
||||
<grid id="student-konto-grid-detail" style="margin:4px;" flex="1">
|
||||
<columns >
|
||||
<column flex="4"/>
|
||||
<column flex="1"/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<hbox>
|
||||
<spacer flex="1" />
|
||||
<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"/>
|
||||
-->
|
||||
|
||||
<vbox>
|
||||
<spacer flex="1" />
|
||||
<label value="Liste auf nicht gebuchte"/>
|
||||
<sapcer flex="1" />
|
||||
</vbox>
|
||||
<vbox flex="1">
|
||||
<spacer flex="1" />
|
||||
<menulist id="student-konto-menulist-filter-buchungstyp" 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="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-filterbuchungstyp" oncommand="StudentKontoFilterBuchungstyp()" label="filtern"/>
|
||||
|
||||
</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">
|
||||
<label id="student-konto-label-filter" value="alle Buchungen:"/>
|
||||
<tree id="student-konto-tree" seltype="multi" hidecolumnpicker="false" flex="1"
|
||||
datasources="rdf:null" ref="http://www.technikum-wien.at/konto/liste"
|
||||
style="margin-left:10px;margin-right:10px;margin-bottom:5px;margin-top: 10px;" enableColumnDrag="true"
|
||||
context="student-konto-tree-popup"
|
||||
flags="dont-build-content"
|
||||
>
|
||||
<!-- onselect="StudentKontoAuswahl()" - wird jetzt per JS gesetzt -->
|
||||
<treecols>
|
||||
<treecol id="student-konto-tree-buchungsdatum" label="Buchungsdatum" flex="2" hidden="false" primary="true"
|
||||
class="sortDirectionIndicator"
|
||||
sortActive="true"
|
||||
sortDirection="ascending"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungsdatum_iso"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-buchungstext" label="Buchungstext" flex="5" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungstext"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-betrag" label="Betrag" flex="2" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#betrag" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-studiensemester_kurzbz" label="StSem" flex="2" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#studiensemester_kurzbz" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-buchungstyp_kurzbz" label="Typ" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungstyp_kurzbz" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-buchungsnr" label="buchungs_nr" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#buchungsnr" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-insertvon" label="Angelegt von" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#insertvon" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-insertamum" label="Anlagedatum" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#insertvon" />
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-konto-tree-studiengang" label="Studiengang" flex="2" hidden="true"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/konto/rdf#studiengang_kuerzel" />
|
||||
<splitter class="tree-splitter"/>
|
||||
</treecols>
|
||||
|
||||
<template>
|
||||
<treechildren flex="1" >
|
||||
<treeitem uri="rdf:*">
|
||||
<treerow>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungsdatum"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungstext"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#betrag"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#studiensemester_kurzbz"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungstyp_kurzbz"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#buchungsnr"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#insertvon"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#insertamum"/>
|
||||
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#studiengang_kuerzel"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</template>
|
||||
</tree>
|
||||
</vbox>
|
||||
<vbox flex="1">
|
||||
<hbox>
|
||||
<button id="student-konto-button-neu" label="Neu" oncommand="StudentKontoNeu();" disabled="true"/>
|
||||
<button id="student-konto-button-gegenbuchung" label="Gegenbuchung" oncommand="StudentKontoGegenbuchung();" disabled="true"/>
|
||||
<box class="Datum" id="student-konto-textbox-gegenbuchungsdatum" disabled="true"/>
|
||||
<button id="student-konto-button-loeschen" label="Loeschen" oncommand="StudentKontoDelete();" disabled="true"/>
|
||||
<spacer flex="1"/>
|
||||
<button id="student-konto-button-zahlungsbestaetigung" label="Zahlungsbestaetigung drucken" oncommand="StudentKontoZahlungsbestaetigung();" disabled="true"/>
|
||||
</hbox>
|
||||
<vbox hidden="true">
|
||||
<label value="Buchungsnr" control="student-konto-textbox-buchungsnr"/>
|
||||
<textbox id="student-konto-textbox-buchungsnr" disabled="true"/>
|
||||
</vbox>
|
||||
<groupbox id="student-konto-groupbox">
|
||||
<caption label="Details"/>
|
||||
<grid id="student-konto-grid-detail" style="overflow:auto;margin:4px;" flex="1">
|
||||
<columns >
|
||||
<column flex="1"/>
|
||||
<column flex="5"/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<label value="Betrag" control="student-konto-textbox-betrag"/>
|
||||
<hbox>
|
||||
<textbox id="student-konto-textbox-betrag" disabled="true" maxlength="9" size="9"/>
|
||||
<spacer flex="1" />
|
||||
</hbox>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Buchungsdatum" control="student-konto-textbox-buchungsdatum"/>
|
||||
<hbox>
|
||||
<box class="Datum" id="student-konto-textbox-buchungsdatum" disabled="true"/>
|
||||
<!--<textbox id="student-konto-textbox-buchungsdatum" disabled="true" maxlength="10" size="10"/>-->
|
||||
<spacer flex="1" />
|
||||
</hbox>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Buchungstext" control="student-konto-textbox-buchungstext"/>
|
||||
<textbox id="student-konto-textbox-buchungstext" disabled="true" maxlength="256"/>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Mahnspanne" control="student-konto-textbox-mahnspanne"/>
|
||||
<hbox>
|
||||
<textbox id="student-konto-textbox-mahnspanne" disabled="true" maxlength="4" size="4"/>
|
||||
<spacer flex="1" />
|
||||
</hbox>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Typ" control="student-konto-menulist-buchungstyp"/>
|
||||
<menulist id="student-konto-menulist-buchungstyp" disabled="true"
|
||||
xmlns:TYP="http://www.technikum-wien.at/buchungstyp/rdf#"
|
||||
datasources="<?php echo APP_ROOT ?>rdf/buchungstyp.rdf.php" flex="1"
|
||||
ref="http://www.technikum-wien.at/buchungstyp/liste" >
|
||||
<template>
|
||||
<rule TYP:aktiv="false">
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/buchungstyp/rdf#buchungstyp_kurzbz"
|
||||
label="rdf:http://www.technikum-wien.at/buchungstyp/rdf#beschreibung"
|
||||
uri="rdf:*" style="text-decoration:line-through;"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
<rule>
|
||||
<menupopup>
|
||||
<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>
|
||||
</rule>
|
||||
|
||||
</template>
|
||||
</menulist>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Studiensemester" control="student-konto-menulist-studiensemester"/>
|
||||
<menulist id="student-konto-menulist-studiensemester" disabled="true"
|
||||
datasources="<?php echo APP_ROOT ?>rdf/studiensemester.rdf.php" flex="1"
|
||||
ref="http://www.technikum-wien.at/studiensemester/liste" >
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/studiensemester/rdf#kurzbz"
|
||||
label="rdf:http://www.technikum-wien.at/studiensemester/rdf#kurzbz"
|
||||
uri="rdf:*"/>
|
||||
</menupopup>
|
||||
</template>
|
||||
</menulist>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Studiengang" control="student-konto-menulist-studiengang_kz"/>
|
||||
<menulist id="student-konto-menulist-studiengang_kz" disabled="true"
|
||||
xmlns:STG="http://www.technikum-wien.at/studiengang/rdf#"
|
||||
datasources="<?php echo APP_ROOT ?>rdf/studiengang.rdf.php" flex="1"
|
||||
ref="http://www.technikum-wien.at/studiengang/liste" >
|
||||
<template>
|
||||
<!--<rule STG:aktiv="false">
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/buchungstyp/rdf#buchungstyp_kurzbz"
|
||||
label="rdf:http://www.technikum-wien.at/buchungstyp/rdf#beschreibung"
|
||||
uri="rdf:*" style="text-decoration:line-through;"/>
|
||||
</menupopup>
|
||||
</rule>-->
|
||||
<rule>
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/studiengang/rdf#studiengang_kz"
|
||||
label="rdf:http://www.technikum-wien.at/studiengang/rdf#kuerzel"
|
||||
uri="rdf:*"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
|
||||
</template>
|
||||
</menulist>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Credit Points" control="student-konto-textbox-credit_points"/>
|
||||
<hbox>
|
||||
<textbox id="student-konto-textbox-credit_points" disabled="true" maxlength="9" size="9"/>
|
||||
<spacer flex="1" />
|
||||
</hbox>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Zahlungsreferenz" control="student-konto-textbox-zahlungsreferenz"/>
|
||||
<hbox>
|
||||
<textbox id="student-konto-textbox-zahlungsreferenz" disabled="true" maxlength="20" size="20"/>
|
||||
<spacer flex="1" />
|
||||
</hbox>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<hbox>
|
||||
<spacer flex="1" />
|
||||
<button id="student-konto-button-speichern" oncommand="StudentKontoDetailSpeichern()" label="Speichern" disabled="true"/>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
</vbox>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</overlay>
|
||||
@@ -2496,6 +2496,7 @@ function StudentKontoDisableFields(val)
|
||||
document.getElementById('student-konto-button-gegenbuchung').disabled=val;
|
||||
document.getElementById('student-konto-button-loeschen').disabled=val;
|
||||
document.getElementById('student-konto-button-zahlungsbestaetigung').disabled=val;
|
||||
document.getElementById('student-konto-textbox-gegenbuchungsdatum').disabled=val;
|
||||
StudentKontoDetailDisableFields(true);
|
||||
}
|
||||
|
||||
@@ -2588,6 +2589,7 @@ function StudentKontoGegenbuchung()
|
||||
var end = new Object();
|
||||
var numRanges = tree.view.selection.getRangeCount();
|
||||
var paramList= '';
|
||||
var gegenbuchungsdatum = document.getElementById("student-konto-textbox-gegenbuchungsdatum").value;
|
||||
|
||||
for (var t = 0; t < numRanges; t++)
|
||||
{
|
||||
@@ -2605,6 +2607,7 @@ function StudentKontoGegenbuchung()
|
||||
req.add('type', 'savegegenbuchung');
|
||||
|
||||
req.add('buchungsnr', paramList);
|
||||
req.add('gegenbuchungsdatum', gegenbuchungsdatum);
|
||||
|
||||
var response = req.executePOST();
|
||||
|
||||
|
||||
+1208
-1201
File diff suppressed because it is too large
Load Diff
+65
-29
@@ -45,6 +45,7 @@ require_once('../include/studiengang.class.php');
|
||||
require_once('../include/lehrveranstaltung.class.php');
|
||||
require_once('../include/mitarbeiter.class.php');
|
||||
require_once('../include/organisationsform.class.php');
|
||||
require_once('../include/konto.class.php');
|
||||
|
||||
// *********** Funktionen *************************
|
||||
function convdate($date)
|
||||
@@ -565,42 +566,77 @@ if($xmlformat=='rdf')
|
||||
{
|
||||
if($filter!='')
|
||||
{
|
||||
if(substr_compare($filter, "#ref", 0, 4,true)==0)
|
||||
{
|
||||
$zahlungsreferenz = explode(" ", $filter);
|
||||
unset($zahlungsreferenz[0]);
|
||||
|
||||
foreach($zahlungsreferenz as $ref)
|
||||
{
|
||||
$konto = new konto();
|
||||
$konto->loadFromZahlungsreferenz($ref);
|
||||
$prestudent=new prestudent();
|
||||
$prestudent->getPrestudenten($konto->person_id);
|
||||
if(!empty($prestudent->result))
|
||||
{
|
||||
$prestudent_temp = new prestudent($prestudent->result[0]->prestudent_id);
|
||||
$student = new student();
|
||||
$uid = $student->getUid($prestudent_temp->prestudent_id);
|
||||
|
||||
if($uid!='' && $uid != false)
|
||||
{
|
||||
if(!$student->load($uid, $studiensemester_kurzbz))
|
||||
$student->load($uid);
|
||||
draw_content($student);
|
||||
draw_prestudent($prestudent_temp);
|
||||
}
|
||||
else
|
||||
{
|
||||
draw_content($prestudent_temp);
|
||||
draw_prestudent($prestudent_temp);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//$filter = utf8_decode($filter);
|
||||
$qry = "SELECT prestudent_id
|
||||
FROM
|
||||
public.tbl_person JOIN tbl_prestudent USING (person_id) LEFT JOIN tbl_student using(prestudent_id)
|
||||
WHERE
|
||||
nachname||' '||vorname ~* '".addslashes($filter)."' OR
|
||||
vorname||' '||nachname ~* '".addslashes($filter)."' OR
|
||||
student_uid ~* '".addslashes($filter)."' OR
|
||||
matrikelnr = '".addslashes($filter)."' OR
|
||||
svnr = '".addslashes($filter)."';";
|
||||
FROM
|
||||
public.tbl_person JOIN tbl_prestudent USING (person_id) LEFT JOIN tbl_student using(prestudent_id)
|
||||
WHERE
|
||||
nachname||' '||vorname ~* '".addslashes($filter)."' OR
|
||||
vorname||' '||nachname ~* '".addslashes($filter)."' OR
|
||||
student_uid ~* '".addslashes($filter)."' OR
|
||||
matrikelnr = '".addslashes($filter)."' OR
|
||||
svnr = '".addslashes($filter)."';";
|
||||
if($db->db_query($qry))
|
||||
{
|
||||
while($row = $db->db_fetch_object())
|
||||
while($row = $db->db_fetch_object())
|
||||
{
|
||||
$student=new student();
|
||||
if($uid = $student->getUid($row->prestudent_id))
|
||||
{
|
||||
$student=new student();
|
||||
if($uid = $student->getUid($row->prestudent_id))
|
||||
{
|
||||
//Wenn kein Eintrag fuers aktuelle Studiensemester da ist, dann
|
||||
//nochmal laden aber ohne studiensemester
|
||||
if(!$student->load($uid, $studiensemester_kurzbz))
|
||||
$student->load($uid);
|
||||
}
|
||||
$prestd = new prestudent();
|
||||
$prestd->load($row->prestudent_id);
|
||||
if($uid!='')
|
||||
{
|
||||
draw_content($student);
|
||||
draw_prestudent($prestd);
|
||||
}
|
||||
else
|
||||
{
|
||||
draw_content($prestd);
|
||||
draw_prestudent($prestd);
|
||||
}
|
||||
//Wenn kein Eintrag fuers aktuelle Studiensemester da ist, dann
|
||||
//nochmal laden aber ohne studiensemester
|
||||
if(!$student->load($uid, $studiensemester_kurzbz))
|
||||
$student->load($uid);
|
||||
}
|
||||
$prestd = new prestudent();
|
||||
$prestd->load($row->prestudent_id);
|
||||
if($uid!='')
|
||||
{
|
||||
draw_content($student);
|
||||
draw_prestudent($prestd);
|
||||
}
|
||||
else
|
||||
{
|
||||
draw_content($prestd);
|
||||
draw_prestudent($prestd);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
elseif(isset($prestudent_id))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user