From 2d1e5c2376ff4b77f0dde96ce1c632a75103a1cb Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Mon, 16 Mar 2015 18:05:11 +0100
Subject: [PATCH] Anmerkung bei Prestudentstatus im FAS sichtbar und editierbar

---
 content/student/studentDBDML.php             |  1 +
 content/student/studentdetailoverlay.xul.php | 15 ++++++++++-----
 content/student/studentoverlay.js.php        |  2 ++
 content/student/studentrolledialog.js.php    |  3 +++
 content/student/studentrolledialog.xul.php   |  4 ++++
 include/prestudent.class.php                 |  1 +
 rdf/prestudentrolle.rdf.php                  |  1 +
 7 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 093457a38..7171370c9 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -950,6 +950,7 @@ if(!$error)
 						$rolle->datum = $_POST['datum'];
 						$rolle->orgform_kurzbz = $_POST['orgform_kurzbz'];
 						$rolle->studienplan_id = $_POST['studienplan_id'];
+						$rolle->anmerkung_status = $_POST['anmerkung'];
 						
 						if($rolle->save_rolle())
 							$return = true;
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index d44839b69..318861910 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -533,14 +533,14 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 								class="sortDirectionIndicator"
 								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#status_kurzbz"/>
 							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-studiensemester_kurzbz" label="StSem" flex="5" hidden="false" persist="hidden, width, ordinal"
+							<treecol id="student-prestudent-tree-rolle-studiensemester_kurzbz" label="StSem" flex="3" hidden="false" persist="hidden, width, ordinal"
 							   class="sortDirectionIndicator"
 								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
 							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-ausbildungssemester" label="Semester" flex="2" hidden="false" persist="hidden, width, ordinal"
+							<treecol id="student-prestudent-tree-rolle-ausbildungssemester" label="Semester" flex="1" hidden="false" persist="hidden, width, ordinal"
 								class="sortDirectionIndicator"
 								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester" 
-                                                                sorthints="integer"/>
+                                sorthints="integer"/>
 							<splitter class="tree-splitter"/>
 							<treecol id="student-prestudent-tree-rolle-datum" label="Datum" flex="2" hidden="false" persist="hidden, width, ordinal"
 								class="sortDirectionIndicator"
@@ -562,11 +562,15 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 								class="sortDirectionIndicator"
 								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung" />
 							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-bestaetigt_von" label="BestaetigtVon" flex="2" hidden="false" persist="hidden, width, ordinal"
+							<treecol id="student-prestudent-tree-rolle-anmerkung" label="Anmerkung" flex="2" hidden="false" persist="hidden, width, ordinal"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#anmerkung" />
+							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-bestaetigt_von" label="BestaetigtVon" flex="1" hidden="true" persist="hidden, width, ordinal"
 								class="sortDirectionIndicator"
 								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_von" />
 							<splitter class="tree-splitter"/>
-							<treecol id="student-prestudent-tree-rolle-bestaetigt_am" label="BestaetigtAm" flex="2" hidden="false" persist="hidden, width, ordinal"
+							<treecol id="student-prestudent-tree-rolle-bestaetigt_am" label="BestaetigtAm" flex="1" hidden="false" persist="hidden, width, ordinal"
 								class="sortDirectionIndicator"
 								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_Am" />
 							<splitter class="tree-splitter"/>
@@ -585,6 +589,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id"/>
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id"/>
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung"/>
+											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#anmerkung"/>
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_von"/>
 											<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_am"/>
 										</treerow>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 083987b30..7d717759d 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -1833,6 +1833,7 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_
 	datum = dialog.getElementById('student-rolle-datum-datum').value;
 	orgform_kurzbz = dialog.getElementById('student-rolle-menulist-orgform_kurzbz').value;
 	studienplan_id = dialog.getElementById('student-rolle-menulist-studienplan').value;
+	anmerkung = dialog.getElementById('student-rolle-textbox-anmerkung').value;
 	
 	if(!CheckDatum(datum))
 	{
@@ -1854,6 +1855,7 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_
 	req.add('datum', ConvertDateToISO(datum));
 	req.add('orgform_kurzbz', orgform_kurzbz);
 	req.add('studienplan_id', studienplan_id);
+	req.add('anmerkung', anmerkung);
 
 	var response = req.executePOST();
 
diff --git a/content/student/studentrolledialog.js.php b/content/student/studentrolledialog.js.php
index d36e6bcf5..3500896ff 100644
--- a/content/student/studentrolledialog.js.php
+++ b/content/student/studentrolledialog.js.php
@@ -57,6 +57,7 @@ function StudentRolleInit(prestudent_id, status_kurzbz, studiensemester_kurzbz,
 		datum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#datum" ));
 		orgform_kurzbz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#orgform_kurzbz" ));
 		studienplan_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studienplan_id" ));
+		anmerkung= getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkung" ));
 		neu = false;
 	}
 	else
@@ -74,6 +75,7 @@ function StudentRolleInit(prestudent_id, status_kurzbz, studiensemester_kurzbz,
 		datum = '<?php echo date('d.m.Y') ?>';
 		orgform_kurzbz='';
 		studienplan_id='';
+		anmerkung='';
 	}		
 	
 	document.getElementById('student-rolle-textbox-prestudent_id').value=prestudent_id;
@@ -83,6 +85,7 @@ function StudentRolleInit(prestudent_id, status_kurzbz, studiensemester_kurzbz,
 	document.getElementById('student-rolle-datum-datum').value=datum;
 	document.getElementById('student-rolle-menulist-orgform_kurzbz').value=orgform_kurzbz;
 	MenulistSelectItemOnValue('student-rolle-menulist-studienplan', studienplan_id);
+	document.getElementById('student-rolle-textbox-anmerkung').value=anmerkung;
 }
 
 // ****
diff --git a/content/student/studentrolledialog.xul.php b/content/student/studentrolledialog.xul.php
index 63af34d2e..8955c16ac 100644
--- a/content/student/studentrolledialog.xul.php
+++ b/content/student/studentrolledialog.xul.php
@@ -198,6 +198,10 @@ $db = new basis_db();
 						</menupopup>
 					</menulist>
 				</row>
+				<row>
+					<label value="Anmerkung"/>
+					<textbox id="student-rolle-textbox-anmerkung" multiline="true" />
+				</row>
 			</rows>
 	</grid>
 	<hbox>
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 8ab5dcba5..2c8949249 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -445,6 +445,7 @@ class prestudent extends person
 				$rolle->studienplan_bezeichnung = $row->studienplan_bezeichnung;
 				$rolle->bestaetigtam = $row->bestaetigtam;
 				$rolle->bestaetigtvon = $row->bestaetigtvon;
+				$rolle->anmerkung_status = $row->anmerkung;
 				$this->result[] = $rolle;
 			}
 			return true;
diff --git a/rdf/prestudentrolle.rdf.php b/rdf/prestudentrolle.rdf.php
index f279d1760..5f25270f3 100644
--- a/rdf/prestudentrolle.rdf.php
+++ b/rdf/prestudentrolle.rdf.php
@@ -87,6 +87,7 @@ foreach($ps->result as $row)
         	<ROLLE:studienplan_bezeichnung><![CDATA['.$row->studienplan_bezeichnung.']]></ROLLE:studienplan_bezeichnung>
         	<ROLLE:bestaetigt_von><![CDATA['.$row->bestaetigtvon.']]></ROLLE:bestaetigt_von>
         	<ROLLE:bestaetigt_am><![CDATA['.$datum->convertISODate($row->bestaetigtam).']]></ROLLE:bestaetigt_am>
+        	<ROLLE:anmerkung><![CDATA['.$row->anmerkung_status.']]></ROLLE:anmerkung>
       	</RDF:Description>
       </RDF:li>
 	';