diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php index b9a13ae5c..6fdbd7306 100644 --- a/content/student/studentDBDML.php +++ b/content/student/studentDBDML.php @@ -1209,7 +1209,8 @@ if(!$error) $rolle->bestaetigtam = $_POST['bestaetigtam']; if($_POST['bestaetigtam']=='') $rolle->bestaetigtvon = null; - + + $rolle->bewerbung_abgeschicktamum = $_POST['bewerbung_abgeschicktamum']; $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 356a7305c..28e715346 100644 --- a/content/student/studentoverlay.js.php +++ b/content/student/studentoverlay.js.php @@ -1896,6 +1896,7 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_ anmerkung = dialog.getElementById('student-rolle-textbox-anmerkung').value; rt_stufe = dialog.getElementById('student-rolle-menulist-stufe').value; statusgrund_id = dialog.getElementById('student-rolle-menulist-statusgrund').value; + bewerbung_abgeschicktamum = dialog.getElementById('student-rolle-datum-bewerbung_abgeschicktamum').value; if(!CheckDatum(datum)) { @@ -1908,6 +1909,29 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_ return false; } + // Convert bewerbung_abgeschicktamum to ISO-Date + if(bewerbung_abgeschicktamum != '') + { + if(bewerbung_abgeschicktamum.length != 19) + { + bewerbung_abgeschicktamum = ''; + } + else + { + datepart = bewerbung_abgeschicktamum.substring(0, 10); + timepart = bewerbung_abgeschicktamum.substring(11); + arr = datepart.split('.'); + + if(arr[0].length==1) + arr[0]='0'+arr[0]; + + if(arr[1].length==1) + arr[1]='0'+arr[1]; + + bewerbung_abgeschicktamum = arr[2]+'-'+arr[1]+'-'+arr[0]+' '+timepart; + } + } + var url = 'content/student/studentDBDML.php'; var req = new phpRequest(url,'',''); @@ -1926,6 +1950,7 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_ req.add('anmerkung', anmerkung); req.add('rt_stufe', rt_stufe); req.add('statusgrund_id', statusgrund_id); + req.add('bewerbung_abgeschicktamum', bewerbung_abgeschicktamum); var response = req.executePOST(); diff --git a/content/student/studentrolledialog.js.php b/content/student/studentrolledialog.js.php index 79d01ad59..ef0291fe4 100644 --- a/content/student/studentrolledialog.js.php +++ b/content/student/studentrolledialog.js.php @@ -56,6 +56,7 @@ function StudentRolleInit(prestudent_id, status_kurzbz, studiensemester_kurzbz, //RDF parsen var datum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#datum" )); var bestaetigt_datum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bestaetigt_am" )); + var bewerbung_abgeschicktamum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bewerbung_abgeschicktamum" )); var orgform_kurzbz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#orgform_kurzbz" )); var studienplan_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studienplan_id" )); var anmerkung= getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkung" )); @@ -78,6 +79,7 @@ function StudentRolleInit(prestudent_id, status_kurzbz, studiensemester_kurzbz, var ausbildungssemester='1'; var datum = ''; var bestaetigt_datum = ''; + var bewerbung_abgeschicktamum = ''; var orgform_kurzbz = ''; var studienplan_id = ''; var anmerkung = ''; @@ -92,6 +94,7 @@ function StudentRolleInit(prestudent_id, status_kurzbz, 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-datum-bewerbung_abgeschicktamum').value=bewerbung_abgeschicktamum; 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 8e5a8be95..d41843377 100644 --- a/content/student/studentrolledialog.xul.php +++ b/content/student/studentrolledialog.xul.php @@ -30,6 +30,7 @@ require_once('../../config/global.config.inc.php'); require_once('../../include/person.class.php'); require_once('../../include/prestudent.class.php'); require_once('../../include/studienplan.class.php'); +require_once('../../include/benutzerberechtigung.class.php'); echo ''."\n"; @@ -68,6 +69,7 @@ if($prestudent_id!='') $nachname = $prestudent->nachname; } $db = new basis_db(); +$user=get_uid(); ?> + getBerechtigungen($user); + if($rechte->isBerechtigt('basis/prestudentstatus')) + $readonly = ''; + ?> + +