From e8ce185c093aaecc5e8611c82ece474146065c2b Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Fri, 23 Oct 2015 21:27:53 +0200
Subject: [PATCH] =?UTF-8?q?Best=C3=A4tigungsdatum=20von=20Assistenz=20korr?=
 =?UTF-8?q?igierbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/student/studentDBDML.php           | 4 ++++
 content/student/studentoverlay.js.php      | 7 +++++++
 content/student/studentrolledialog.js.php  | 3 +++
 content/student/studentrolledialog.xul.php | 4 ++++
 4 files changed, 18 insertions(+)

diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 98c4a1986..33b86b51f 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -1137,6 +1137,10 @@ if(!$error)
 					    $rolle->ausbildungssemester = $_POST['ausbildungssemester'];
 					    $rolle->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
 					    $rolle->datum = $_POST['datum'];
+					    $rolle->bestaetigtam = $_POST['bestaetigtam'];
+					    if($_POST['bestaetigtam']=='')
+					    	$rolle->bestaetigtvon = null;
+					    
 					    $rolle->orgform_kurzbz = $_POST['orgform_kurzbz'];
 					    $rolle->studienplan_id = $_POST['studienplan_id'];
                         $rolle->anmerkung_status = $_POST['anmerkung'];
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index fc5a3d395..ddc2043b5 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -1864,6 +1864,7 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_
 	studiensemester_kurzbz = dialog.getElementById('student-rolle-menulist-studiensemester').value;
 	ausbildungssemester = dialog.getElementById('student-rolle-menulist-ausbildungssemester').value;
 	datum = dialog.getElementById('student-rolle-datum-datum').value;
+	bestaetigt_datum = dialog.getElementById('student-rolle-datum-bestaetigt_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;
@@ -1873,6 +1874,11 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_
 		alert('Datum ist ungueltig');
 		return false;
 	}
+	if(bestaetigt_datum!='' && !CheckDatum(bestaetigt_datum))
+	{
+		alert('Bestaetigungsdatum ist ungueltig');
+		return false;
+	}
 	
 	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
 	var req = new phpRequest(url,'','');
@@ -1886,6 +1892,7 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_
 	req.add('ausbildungssemester_old', ausbildungssemester_old);
 	req.add('ausbildungssemester', ausbildungssemester);
 	req.add('datum', ConvertDateToISO(datum));
+	req.add('bestaetigtam', ConvertDateToISO(bestaetigt_datum));
 	req.add('orgform_kurzbz', orgform_kurzbz);
 	req.add('studienplan_id', studienplan_id);
 	req.add('anmerkung', anmerkung);
diff --git a/content/student/studentrolledialog.js.php b/content/student/studentrolledialog.js.php
index 3500896ff..0ae225c53 100644
--- a/content/student/studentrolledialog.js.php
+++ b/content/student/studentrolledialog.js.php
@@ -55,6 +55,7 @@ function StudentRolleInit(prestudent_id, status_kurzbz, studiensemester_kurzbz,
 	
 		//RDF parsen	
 		datum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#datum" ));
+		bestaetigt_datum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bestaetigt_am" ));
 		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" ));
@@ -73,6 +74,7 @@ function StudentRolleInit(prestudent_id, status_kurzbz, studiensemester_kurzbz,
 		studiensemester_kurzbz=window.opener.getStudiensemester();
 		ausbildungssemester='1';
 		datum = '<?php echo date('d.m.Y') ?>';
+		bestaetigt_datum = '<?php echo date('d.m.Y') ?>';
 		orgform_kurzbz='';
 		studienplan_id='';
 		anmerkung='';
@@ -83,6 +85,7 @@ function StudentRolleInit(prestudent_id, status_kurzbz, studiensemester_kurzbz,
 	document.getElementById('student-rolle-menulist-studiensemester').value=studiensemester_kurzbz;
 	document.getElementById('student-rolle-menulist-ausbildungssemester').value=ausbildungssemester;
 	document.getElementById('student-rolle-datum-datum').value=datum;
+	document.getElementById('student-rolle-datum-bestaetigt_datum').value=bestaetigt_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 d80f72196..277efcbf3 100644
--- a/content/student/studentrolledialog.xul.php
+++ b/content/student/studentrolledialog.xul.php
@@ -181,6 +181,10 @@ $db = new basis_db();
 					<label value="Datum" control="student-rolle-datum-datum"/>
 					<box class='Datum' id="student-rolle-datum-datum" />
 				</row>
+				<row>
+					<label value="Bestätigt am" control="student-rolle-datum-bestaetigt_datum"/>
+					<box class='Datum' id="student-rolle-datum-bestaetigt_datum" />
+				</row>
 				<row>
 					<label value="Studienplan" control="student-rolle-menulist-studienplan"/>
 					<menulist id="student-rolle-menulist-studienplan" >