From 4fdb7167f0fa232d12166d0d89db361da1aca2f9 Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Fri, 21 Oct 2016 16:56:59 +0200
Subject: [PATCH] Anmerkung in tbl_konto und FAS-GUI

+ CreditPoints-Anzeige Konfigurierbar
---
 content/student/studentDBDML.php              |  3 ++
 content/student/studentkontoneudialog.xul.php | 30 +++++++++++++----
 content/student/studentkontooverlay.xul.php   | 33 ++++++++++++++-----
 content/student/studentoverlay.js.php         |  7 ++++
 include/konto.class.php                       | 16 +++++++--
 rdf/konto.rdf.php                             |  4 +++
 system/dbupdate_3.2.php                       | 13 +++++++-
 7 files changed, 88 insertions(+), 18 deletions(-)

diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index a0d9c8518..5d1925009 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -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())
diff --git a/content/student/studentkontoneudialog.xul.php b/content/student/studentkontoneudialog.xul.php
index 92b81975d..f2408b0f4 100644
--- a/content/student/studentkontoneudialog.xul.php
+++ b/content/student/studentkontoneudialog.xul.php
@@ -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>
diff --git a/content/student/studentkontooverlay.xul.php b/content/student/studentkontooverlay.xul.php
index d76fb9859..a14fa9b5f 100644
--- a/content/student/studentkontooverlay.xul.php
+++ b/content/student/studentkontooverlay.xul.php
@@ -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>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 563ba72e2..b0e1d01dd 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -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();
 
diff --git a/include/konto.class.php b/include/konto.class.php
index 3255da3d6..5ddd244b3 100644
--- a/include/konto.class.php
+++ b/include/konto.class.php
@@ -60,6 +60,7 @@ class konto extends basis_db
 	public $aktiv;
 	public $credit_points;
 	public $zahlungsreferenz;
+	public $anmerkung;
 
 	/**
 	 * Konstruktor
@@ -116,6 +117,7 @@ class konto extends basis_db
 				$this->vornamen = $row->vornamen;
 				$this->credit_points = $row->credit_points;
 				$this->zahlungsreferenz = $row->zahlungsreferenz;
+				$this->anmerkung = $row->anmerkung;
 				return true;
 			}
 			else
@@ -191,7 +193,7 @@ class konto extends basis_db
 		{
 
 			//Neuen Datensatz einfuegen
-			$qry='BEGIN;INSERT INTO public.tbl_konto (person_id, studiengang_kz, studiensemester_kurzbz, buchungsnr_verweis, betrag, buchungsdatum, buchungstext, mahnspanne, buchungstyp_kurzbz, updateamum, updatevon, insertamum, insertvon, credit_points) VALUES('.
+			$qry='BEGIN;INSERT INTO public.tbl_konto (person_id, studiengang_kz, studiensemester_kurzbz, buchungsnr_verweis, betrag, buchungsdatum, buchungstext, mahnspanne, buchungstyp_kurzbz, updateamum, updatevon, insertamum, insertvon, credit_points, zahlungsreferenz, anmerkung) VALUES('.
 			     $this->db_add_param($this->person_id, FHC_INTEGER).', '.
 			     $this->db_add_param($this->studiengang_kz, FHC_INTEGER).', '.
 			     $this->db_add_param($this->studiensemester_kurzbz).', '.
@@ -205,7 +207,9 @@ class konto extends basis_db
 			     $this->db_add_param($this->updatevon).', '.
 			     $this->db_add_param($this->insertamum).', '.
 			     $this->db_add_param($this->insertvon).', '.
-				 $this->db_add_param($this->credit_points).');';
+			     $this->db_add_param($this->credit_points).', '.
+			     $this->db_add_param($this->zahlungsreferenz).', '.
+				 $this->db_add_param($this->anmerkung).');';
 		}
 		else
 		{
@@ -224,7 +228,9 @@ class konto extends basis_db
 				   ' updatevon='.$this->db_add_param($this->updatevon).','.
 				   ' insertamum='.$this->db_add_param($this->insertamum).','.
 				   ' insertvon='.$this->db_add_param($this->insertvon).','.
-				   ' credit_points='.$this->db_add_param($this->credit_points).
+				   ' credit_points='.$this->db_add_param($this->credit_points).','.
+				   ' zahlungsreferenz='.$this->db_add_param($this->zahlungsreferenz).','.
+				   ' anmerkung='.$this->db_add_param($this->anmerkung).
 				   " WHERE buchungsnr='".$this->db_add_param($this->buchungsnr, FHC_INTEGER)."';";
 
 		}
@@ -385,6 +391,9 @@ class konto extends basis_db
 				$buchung->nachname = $row->nachname;
 				$buchung->vorname = $row->vorname;
 				$buchung->vornamen = $row->vornamen;
+				$buchung->credit_points = $row->credit_points;
+				$buchung->zahlungsreferenz = $row->zahlungsreferenz;
+				$buchung->anmerkung = $row->anmerkung;
 
 				if($buchung->buchungsnr_verweis!='')
 				{
@@ -899,6 +908,7 @@ class konto extends basis_db
 				$this->insertvon = $row->insertvon;
 				$this->credit_points = $row->credit_points;
 				$this->zahlungsreferenz = $row->zahlungsreferenz;
+				$this->anmerkung = $row->anmerkung;
 				return true;
 			}
 			else
diff --git a/rdf/konto.rdf.php b/rdf/konto.rdf.php
index 875325cf3..afda63e0f 100644
--- a/rdf/konto.rdf.php
+++ b/rdf/konto.rdf.php
@@ -142,6 +142,7 @@ function drawrow($row)
 			<KONTO:buchungstyp_kurzbz><![CDATA[".$row->buchungstyp_kurzbz."]]></KONTO:buchungstyp_kurzbz>
 			<KONTO:credit_points><![CDATA[".$row->credit_points."]]></KONTO:credit_points>
 			<KONTO:zahlungsreferenz><![CDATA[".$row->zahlungsreferenz."]]></KONTO:zahlungsreferenz>
+			<KONTO:anmerkung><![CDATA[".$row->anmerkung."]]></KONTO:anmerkung>
 			<KONTO:updateamum><![CDATA[".$row->updateamum."]]></KONTO:updateamum>
 			<KONTO:updatevon><![CDATA[".$row->updatevon."]]></KONTO:updatevon>
 			<KONTO:insertamum><![CDATA[".$row->insertamum."]]></KONTO:insertamum>
@@ -243,6 +244,9 @@ elseif ($xmlformat=='xml')
 			<updateamum><![CDATA[".$row->updateamum."]]></updateamum>
 			<updatevon><![CDATA[".$row->updatevon."]]></updatevon>
 			<insertamum><![CDATA[".$row->insertamum."]]></insertamum>
+			<credit_points><![CDATA[".$row->credit_points."]]></credit_points>
+			<zahlungsreferenz><![CDATA[".$row->zahlungsreferenz."]]></zahlungsreferenz>
+			<anmerkung><![CDATA[".$row->anmerkung."]]></anmerkung>
 		</buchung>";
 	}
 	function drawperson_xml($row)
diff --git a/system/dbupdate_3.2.php b/system/dbupdate_3.2.php
index b37f62e2e..735f0ddb9 100755
--- a/system/dbupdate_3.2.php
+++ b/system/dbupdate_3.2.php
@@ -1337,6 +1337,17 @@ if(!$result = @$db->db_query("SELECT 1 FROM bis.tbl_mobilitaet LIMIT 1"))
 	else
 		echo '<br>Neue Tabelle fuer Gemeinsame Studien/Mobilitaet hinzugefügt<br>';
 }
+
+// Anmerkung bei Konto
+if(!$result = @$db->db_query("SELECT anmerkung FROM public.tbl_konto LIMIT 1"))
+{
+	$qry = "ALTER TABLE public.tbl_konto ADD COLUMN anmerkung text";
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_konto '.$db->db_last_error().'</strong><br>';
+		else
+			echo 'public.tbl_konto: Spalte Anmerkung hinzugefuegt!<br>';
+}
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
 
@@ -1523,7 +1534,7 @@ $tabellen=array(
 	"public.tbl_kontakt"  => array("kontakt_id","person_id","kontakttyp","anmerkung","kontakt","zustellung","updateamum","updatevon","insertamum","insertvon","ext_id","standort_id"),
 	"public.tbl_kontaktmedium"  => array("kontaktmedium_kurzbz","beschreibung"),
 	"public.tbl_kontakttyp"  => array("kontakttyp","beschreibung"),
-	"public.tbl_konto"  => array("buchungsnr","person_id","studiengang_kz","studiensemester_kurzbz","buchungstyp_kurzbz","buchungsnr_verweis","betrag","buchungsdatum","buchungstext","mahnspanne","updateamum","updatevon","insertamum","insertvon","ext_id","credit_points", "zahlungsreferenz"),
+	"public.tbl_konto"  => array("buchungsnr","person_id","studiengang_kz","studiensemester_kurzbz","buchungstyp_kurzbz","buchungsnr_verweis","betrag","buchungsdatum","buchungstext","mahnspanne","updateamum","updatevon","insertamum","insertvon","ext_id","credit_points", "zahlungsreferenz", "anmerkung"),
 	"public.tbl_lehrverband"  => array("studiengang_kz","semester","verband","gruppe","aktiv","bezeichnung","ext_id","orgform_kurzbz","gid"),
 	"public.tbl_log"  => array("log_id","executetime","mitarbeiter_uid","beschreibung","sql","sqlundo"),
 	"public.tbl_mitarbeiter"  => array("mitarbeiter_uid","personalnummer","telefonklappe","kurzbz","lektor","fixangestellt","bismelden","stundensatz","ausbildungcode","ort_kurzbz","standort_id","anmerkung","insertamum","insertvon","updateamum","updatevon","ext_id","kleriker"),