blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-22 01:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Anmerkung in tbl_konto und FAS-GUI

Browse Source 
+ CreditPoints-Anzeige Konfigurierbar
This commit is contained in:
kindlm
2016-10-21 16:56:59 +02:00
parent be24ea74be
commit 4fdb7167f0
7 changed files with 88 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/student/studentDBDML.php
+3
View File
@@ -1866,6 +1866,7 @@ if(!$error)
$buchung->new = false;
$buchung->updateamum = date('Y-m-d H:i:s');
$buchung->updatevon = $user;
$buchung->anmerkung = $_POST['anmerkung'];
if($buchung->save())
{
@@ -1936,6 +1937,7 @@ if(!$error)
$buchung->new = true;
$buchung->insertamum = date('Y-m-d H:i:s');
$buchung->insertvon = $user;
$buchung->anmerkung = '';
if($buchung->save())
{
@@ -2051,6 +2053,7 @@ if(!$error)
$buchung->credit_points = $_POST["credit_points"];
$buchung->insertamum = date('Y-m-d H:i:s');
$buchung->insertvon = $user;
$buchung->anmerkung = $_POST['anmerkung'];
$buchung->new = true;
if($buchung->save())
content/student/studentkontoneudialog.xul.php
+24 -6
View File
@@ -27,6 +27,7 @@ header("Pragma: no-cache");
header("Content-type: application/vnd.mozilla.xul+xml");
include('../../config/vilesci.config.inc.php');
include('../../config/global.config.inc.php');
echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
echo '<?xml-stylesheet href="'.APP_ROOT.'skin/tempus.css" type="text/css"?>';
@@ -65,7 +66,12 @@ echo '<?xml-stylesheet href="'.APP_ROOT.'content/datepicker/datepicker.css" type
label="rdf:http://www.technikum-wien.at/buchungstyp/rdf#beschreibung"
standardbetrag="rdf:http://www.technikum-wien.at/buchungstyp/rdf#standardbetrag"
standardtext="rdf:http://www.technikum-wien.at/buchungstyp/rdf#standardtext"
credit_points="rdf:http://www.technikum-wien.at/buchungstyp/rdf#credit_points"
<?php
// Credit Points werden nur angezeigt, wenn diese im Config aktiviert wurden
if(defined('FAS_KONTO_SHOW_CREDIT_POINTS') && FAS_KONTO_SHOW_CREDIT_POINTS=='true')
echo 'credit_points="rdf:http://www.technikum-wien.at/buchungstyp/rdf#credit_points"';
?>
anmerkung="rdf:http://www.technikum-wien.at/buchungstyp/rdf#anmerkung"
uri="rdf:*"/>
</menupopup>
</rule>
@@ -111,12 +117,24 @@ echo '<?xml-stylesheet href="'.APP_ROOT.'content/datepicker/datepicker.css" type
</template>
</menulist>
</row>
<?php
// Credit Points werden nur angezeigt, wenn diese im Config aktiviert wurden
if(defined('FAS_KONTO_SHOW_CREDIT_POINTS') && FAS_KONTO_SHOW_CREDIT_POINTS=='true')
$hidden='';
else
$hidden='hidden="true"';
echo ' <row '.$hidden.'>
<label value="Credit Points" control="student-konto-neu-textbox-credit_points" '.$hidden.'/>
<hbox '.$hidden.'>
<textbox id="student-konto-neu-textbox-credit_points" maxlength="9" size="9" value="0.00" '.$hidden.'/>
<spacer flex="1" />
</hbox>
</row>';
?>
<row>
<label value="Credit Points" control="student-konto-neu-textbox-credit_points"/>
<hbox>
<textbox id="student-konto-neu-textbox-credit_points" maxlength="9" size="9" value='0.00'/>
<spacer flex="1" />
</hbox>
<label value="Anmerkung" control="student-konto-neu-textbox-anmerkung"/>
<textbox id="student-konto-neu-textbox-anmerkung" multiline="true"/>
</row>
</rows>
</grid>
content/student/studentkontooverlay.xul.php
+25 -8
View File
@@ -26,6 +26,7 @@ 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');
require_once('../../config/global.config.inc.php');
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
?>
@@ -126,7 +127,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
>
<!-- onselect="StudentKontoAuswahl()" - wird jetzt per JS gesetzt -->
<treecols>
<treecol id="student-konto-tree-buchungsdatum" label="Buchungsdatum" flex="2" hidden="false" primary="true"
<treecol id="student-konto-tree-buchungsdatum" label="Buchungsdatum" flex="1" hidden="false" primary="true"
class="sortDirectionIndicator"
sortActive="true"
sortDirection="ascending"
@@ -164,6 +165,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/konto/rdf#studiengang_kuerzel" />
<splitter class="tree-splitter"/>
<treecol id="student-konto-tree-anmerkung" label="Anmerkung" flex="2" hidden="false"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/konto/rdf#anmerkung" />
<splitter class="tree-splitter"/>
</treecols>
<template>
@@ -179,6 +184,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<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"/>
<treecell label="rdf:http://www.technikum-wien.at/konto/rdf#anmerkung"/>
</treerow>
</treeitem>
</treechildren>
@@ -296,13 +302,20 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
</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>
<?php
// Credit Points werden nur angezeigt, wenn diese im Config aktiviert wurden
if(defined('FAS_KONTO_SHOW_CREDIT_POINTS') && FAS_KONTO_SHOW_CREDIT_POINTS=='true')
$hidden='';
else
$hidden='hidden="true"';
echo ' <row '.$hidden.'>
<label value="Credit Points" control="student-konto-textbox-credit_points" '.$hidden.'/>
<hbox '.$hidden.'>
<textbox id="student-konto-textbox-credit_points" disabled="true" maxlength="9" size="9" '.$hidden.'/>
<spacer flex="1" />
</hbox>
</row>';
?>
<row>
<label value="Zahlungsreferenz" control="student-konto-textbox-zahlungsreferenz"/>
<hbox>
@@ -310,6 +323,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<spacer flex="1" />
</hbox>
</row>
<row>
<label value="Anmerkung" control="student-konto-textbox-anmerkung"/>
<textbox id="student-konto-textbox-anmerkung" multiline="true"/>
</row>
</rows>
</grid>
<hbox>
content/student/studentoverlay.js.php
+7
View File
@@ -2335,6 +2335,7 @@ function StudentKontoAuswahl()
buchungstyp_kurzbz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#buchungstyp_kurzbz" ));
credit_points = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#credit_points" ));
zahlungsreferenz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zahlungsreferenz" ));
anmerkung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkung" ));
document.getElementById('student-konto-textbox-betrag').value=betrag;
document.getElementById('student-konto-textbox-buchungsdatum').value=buchungsdatum;
@@ -2346,6 +2347,7 @@ function StudentKontoAuswahl()
document.getElementById('student-konto-menulist-studiengang_kz').value=studiengang_kz;
document.getElementById('student-konto-textbox-credit_points').value=credit_points;
document.getElementById('student-konto-textbox-zahlungsreferenz').value=zahlungsreferenz;
document.getElementById('student-konto-textbox-anmerkung').value=anmerkung;
}
// ****
@@ -2564,6 +2566,7 @@ function StudentKontoDetailDisableFields(val)
document.getElementById('student-konto-menulist-buchungstyp').disabled=val;
document.getElementById('student-konto-menulist-studiensemester').disabled=val;
document.getElementById('student-konto-menulist-studiengang_kz').disabled=val;
document.getElementById('student-konto-textbox-anmerkung').disabled=val;
document.getElementById('student-konto-button-speichern').disabled=val;
}
@@ -2583,6 +2586,7 @@ function StudentKontoDetailSpeichern()
studiensemester_kurzbz = document.getElementById('student-konto-menulist-studiensemester').value;
studiengang_kz = document.getElementById('student-konto-menulist-studiengang_kz').value;
credit_points = document.getElementById('student-konto-textbox-credit_points').value;
anmerkung = document.getElementById('student-konto-textbox-anmerkung').value;
if(buchungsdatum!='' && !CheckDatum(buchungsdatum))
{
@@ -2603,6 +2607,7 @@ function StudentKontoDetailSpeichern()
req.add('studiensemester_kurzbz', studiensemester_kurzbz);
req.add('studiengang_kz', studiengang_kz);
req.add('credit_points', credit_points);
req.add('anmerkung', anmerkung);
var response = req.executePOST();
@@ -2753,6 +2758,7 @@ function StudentKontoNeuSpeichern(dialog, person_ids, studiengang_kz)
buchungstyp_kurzbz = dialog.getElementById('student-konto-neu-menulist-buchungstyp').value;
studiensemester_kurzbz = dialog.getElementById('student-konto-neu-menulist-studiensemester').value;
credit_points = dialog.getElementById('student-konto-neu-textbox-credit_points').value;
anmerkung = dialog.getElementById('student-konto-neu-textbox-anmerkung').value;
if(buchungsdatum!='' && !CheckDatum(buchungsdatum))
{
@@ -2771,6 +2777,7 @@ function StudentKontoNeuSpeichern(dialog, person_ids, studiengang_kz)
req.add('buchungstyp_kurzbz', buchungstyp_kurzbz);
req.add('studiensemester_kurzbz', studiensemester_kurzbz);
req.add('credit_points', credit_points);
req.add('anmerkung', anmerkung);
var response = req.executePOST();