From 9108b62b131dba3cfb7138278862e071b6a785c9 Mon Sep 17 00:00:00 2001 From: Stefan Puraner Date: Tue, 17 Dec 2013 11:49:19 +0000 Subject: [PATCH] Anzeige/Speichern von Credit Points; FAS -> Konto --- content/student/studentDBDML.php | 2 ++ content/student/studentkontoneudialog.js.php | 4 ++++ content/student/studentkontoneudialog.xul.php | 8 ++++++++ content/student/studentoverlay.js.php | 7 +++++++ include/konto.class.php | 3 ++- rdf/buchungstyp.rdf.php | 1 + 6 files changed, 24 insertions(+), 1 deletion(-) diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php index bf445ef02..b76df9ebc 100644 --- a/content/student/studentDBDML.php +++ b/content/student/studentDBDML.php @@ -1441,6 +1441,7 @@ if(!$error) $buchung->buchungstyp_kurzbz = $_POST['buchungstyp_kurzbz']; $buchung->studiensemester_kurzbz = $_POST['studiensemester_kurzbz']; $buchung->studiengang_kz = $_POST['studiengang_kz']; + $buchung->credit_points = $_POST['credit_points']; $buchung->new = false; $buchung->updateamum = date('Y-m-d H:i:s'); $buchung->updatevon = $user; @@ -1616,6 +1617,7 @@ if(!$error) $buchung->buchungstext = $_POST['buchungstext']; $buchung->mahnspanne = $_POST['mahnspanne']; $buchung->buchungstyp_kurzbz = $_POST['buchungstyp_kurzbz']; + $buchung->credit_points = $_POST["credit_points"]; $buchung->insertamum = date('Y-m-d H:i:s'); $buchung->insertvon = $user; $buchung->new = true; diff --git a/content/student/studentkontoneudialog.js.php b/content/student/studentkontoneudialog.js.php index 90426e612..f1c5aad2b 100644 --- a/content/student/studentkontoneudialog.js.php +++ b/content/student/studentkontoneudialog.js.php @@ -108,6 +108,7 @@ function StudentKontoNeuDefaultBetrag() var typmenulist = document.getElementById('student-konto-neu-menulist-buchungstyp'); var betrag = typmenulist.selectedItem.getAttribute('standardbetrag'); var text = typmenulist.selectedItem.getAttribute('standardtext'); + var credit_points = typmenulist.selectedItem.getAttribute('credit_points'); if(betrag=='') betrag='-0.00'; @@ -117,4 +118,7 @@ function StudentKontoNeuDefaultBetrag() if(document.getElementById('student-konto-neu-textbox-buchungstext').value=='') document.getElementById('student-konto-neu-textbox-buchungstext').value=text; + + if(document.getElementById('student-konto-neu-textbox-credit_points').value=='0.00') + document.getElementById('student-konto-neu-textbox-credit_points').value=credit_points; } \ No newline at end of file diff --git a/content/student/studentkontoneudialog.xul.php b/content/student/studentkontoneudialog.xul.php index 3acbda3eb..92b81975d 100644 --- a/content/student/studentkontoneudialog.xul.php +++ b/content/student/studentkontoneudialog.xul.php @@ -65,6 +65,7 @@ echo ' @@ -110,6 +111,13 @@ echo ' + + diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php index c9b55181a..4bf2a427c 100644 --- a/content/student/studentoverlay.js.php +++ b/content/student/studentoverlay.js.php @@ -2048,6 +2048,7 @@ function StudentKontoAuswahl() buchungstext = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#buchungstext" )); mahnspanne = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#mahnspanne" )); buchungstyp_kurzbz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#buchungstyp_kurzbz" )); + credit_points = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#credit_points" )); document.getElementById('student-konto-textbox-betrag').value=betrag; document.getElementById('student-konto-textbox-buchungsdatum').value=buchungsdatum; @@ -2057,6 +2058,7 @@ function StudentKontoAuswahl() document.getElementById('student-konto-textbox-buchungsnr').value=buchungsnr; document.getElementById('student-konto-menulist-studiensemester').value=studiensemester_kurzbz; document.getElementById('student-konto-menulist-studiengang_kz').value=studiengang_kz; + document.getElementById('student-konto-textbox-credit_points').value=credit_points; } // **** @@ -2267,6 +2269,7 @@ function StudentKontoDetailDisableFields(val) document.getElementById('student-konto-textbox-buchungsdatum').disabled=val; document.getElementById('student-konto-textbox-buchungstext').disabled=val; document.getElementById('student-konto-textbox-mahnspanne').disabled=val; + document.getElementById('student-konto-textbox-credit_points').disabled=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; @@ -2288,6 +2291,7 @@ function StudentKontoDetailSpeichern() buchungsnr = document.getElementById('student-konto-textbox-buchungsnr').value; 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; if(buchungsdatum!='' && !CheckDatum(buchungsdatum)) { @@ -2307,6 +2311,7 @@ function StudentKontoDetailSpeichern() req.add('buchungsnr', buchungsnr); req.add('studiensemester_kurzbz', studiensemester_kurzbz); req.add('studiengang_kz', studiengang_kz); + req.add('credit_points', credit_points); var response = req.executePOST(); @@ -2454,6 +2459,7 @@ function StudentKontoNeuSpeichern(dialog, person_ids, studiengang_kz) mahnspanne = dialog.getElementById('student-konto-neu-textbox-mahnspanne').value; 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; if(buchungsdatum!='' && !CheckDatum(buchungsdatum)) { @@ -2471,6 +2477,7 @@ function StudentKontoNeuSpeichern(dialog, person_ids, studiengang_kz) req.add('mahnspanne', mahnspanne); req.add('buchungstyp_kurzbz', buchungstyp_kurzbz); req.add('studiensemester_kurzbz', studiensemester_kurzbz); + req.add('credit_points', credit_points); var response = req.executePOST(); diff --git a/include/konto.class.php b/include/konto.class.php index 5d14e9482..62c534042 100644 --- a/include/konto.class.php +++ b/include/konto.class.php @@ -222,7 +222,7 @@ class konto extends basis_db ' updatevon='.$this->addslashes($this->updatevon).','. ' insertamum='.$this->addslashes($this->insertamum).','. ' insertvon='.$this->addslashes($this->insertvon).','. - ' ext_id='.$this->addslashes($this->ext_id). + ' ext_id='.$this->addslashes($this->ext_id).','. ' credit_points='.$this->addslashes($this->credit_points). " WHERE buchungsnr='".addslashes($this->buchungsnr)."';"; @@ -415,6 +415,7 @@ class konto extends basis_db $typ->beschreibung = $row->beschreibung; $typ->standardbetrag = $row->standardbetrag; $typ->standardtext = $row->standardtext; + $typ->credit_points = $row->credit_points; $typ->aktiv = ($row->aktiv=='t'?true:false); $this->result[] = $typ; diff --git a/rdf/buchungstyp.rdf.php b/rdf/buchungstyp.rdf.php index ccfd80121..1ba9c480d 100644 --- a/rdf/buchungstyp.rdf.php +++ b/rdf/buchungstyp.rdf.php @@ -66,6 +66,7 @@ foreach ($typ->result as $row) beschreibung ?>]]> standardbetrag!=''?$row->standardbetrag:'-0.00'); ?>]]> standardtext; ?>]]> + credit_points; ?>]]> aktiv?'true':'false'); ?>]]>