diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php index 5fa5df947..27beb7cab 100644 --- a/content/student/studentDBDML.php +++ b/content/student/studentDBDML.php @@ -443,6 +443,7 @@ if(!$error) $prestudent->bismelden = ($_POST['bismelden']=='true'?true:false); $prestudent->dual = ($_POST['dual']=='true'?true:false); $prestudent->anmerkung = $_POST['anmerkung']; + $prestudent->mentor = $_POST['mentor']; //$prestudent->insertamum = date('Y-m-d H:i:s'); //$prestudent->insertvon = $user; $prestudent->updateamum = date('Y-m-d H:i:s'); diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php index d08f2411c..692aead9c 100644 --- a/content/student/studentdetailoverlay.xul.php +++ b/content/student/studentdetailoverlay.xul.php @@ -512,6 +512,10 @@ echo ''; + + diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php index b97342377..90415f7a6 100644 --- a/content/student/studentoverlay.js.php +++ b/content/student/studentoverlay.js.php @@ -966,6 +966,7 @@ function StudentAuswahl() punkte3 = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte3" )); bismelden = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bismelden" )); anmerkung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkungpre" )); + mentor = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#mentor" )); dual = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#dual" )); document.getElementById('student-prestudent-menulist-aufmerksamdurch').value=aufmerksamdurch_kurzbz; @@ -1010,6 +1011,7 @@ function StudentAuswahl() document.getElementById('student-prestudent-menulist-studiengang_kz').value=studiengang_kz_prestudent; document.getElementById('student-prestudent-textbox-anmerkung').value=anmerkung; + document.getElementById('student-prestudent-textbox-mentor').value=mentor; document.getElementById('student-detail-groupbox-caption').label='Zugangsvoraussetzung für '+nachname+' '+vorname; rollentree = document.getElementById('student-prestudent-tree-rolle'); @@ -1456,6 +1458,7 @@ function StudentPrestudentDisableFields(val) document.getElementById('student-prestudent-button-save').disabled=val; //document.getElementById('student-prestudent-menulist-studiengang_kz').disabled=val; document.getElementById('student-prestudent-textbox-anmerkung').disabled=val; + document.getElementById('student-prestudent-textbox-mentor').disabled=val; //Status Tree leeren rollentree = document.getElementById('student-prestudent-tree-rolle'); @@ -1508,6 +1511,7 @@ function StudentPrestudentSave() neu = document.getElementById('student-prestudent-checkbox-new').checked; studiengang_kz = document.getElementById('student-prestudent-menulist-studiengang_kz').value; anmerkung = document.getElementById('student-prestudent-textbox-anmerkung').value; + mentor = document.getElementById('student-prestudent-textbox-mentor').value; if(zgvdatum!='' && !CheckDatum(zgvdatum)) { @@ -1561,6 +1565,7 @@ function StudentPrestudentSave() req.add('prestudent_id', prestudent_id); req.add('studiengang_kz', studiengang_kz); req.add('anmerkung', anmerkung); + req.add('mentor', mentor); var response = req.executePOST(); diff --git a/include/prestudent.class.php b/include/prestudent.class.php index 5466a8b7a..bb603a08d 100644 --- a/include/prestudent.class.php +++ b/include/prestudent.class.php @@ -47,6 +47,7 @@ class prestudent extends person public $rt_punkte3=0; public $bismelden=true; public $anmerkung; + public $mentor; public $ext_id_prestudent; public $dual=false; public $zgvdoktor_code; @@ -127,6 +128,7 @@ class prestudent extends person $this->bismelden = $this->db_parse_bool($row->bismelden); $this->person_id = $row->person_id; $this->anmerkung = $row->anmerkung; + $this->mentor = $row->mentor; $this->ext_id_prestudent = $row->ext_id; $this->dual = $this->db_parse_bool($row->dual); $this->ausstellungsstaat = $row->ausstellungsstaat; @@ -206,7 +208,7 @@ class prestudent extends person zgvmas_code, zgvmaort, zgvmadatum, aufnahmeschluessel, facheinschlberuf, reihungstest_id, anmeldungreihungstest, reihungstestangetreten, rt_gesamtpunkte, rt_punkte1, rt_punkte2, rt_punkte3, bismelden, insertamum, insertvon, - updateamum, updatevon, ext_id, anmerkung, dual, ausstellungsstaat) VALUES('. + updateamum, updatevon, ext_id, anmerkung, dual, ausstellungsstaat, mentor) VALUES('. $this->db_add_param($this->aufmerksamdurch_kurzbz).",". $this->db_add_param($this->person_id).",". $this->db_add_param($this->studiengang_kz).",". @@ -235,7 +237,8 @@ class prestudent extends person $this->db_add_param($this->ext_id_prestudent).",". $this->db_add_param($this->anmerkung).",". $this->db_add_param($this->dual, FHC_BOOLEAN).",". - $this->db_add_param($this->ausstellungsstaat).");"; + $this->db_add_param($this->ausstellungsstaat).",". + $this->db_add_param($this->mentor).");"; } else { @@ -265,6 +268,7 @@ class prestudent extends person ' updatevon='.$this->db_add_param($this->updatevon).",". ' ext_id='.$this->db_add_param($this->ext_id_prestudent).",". ' anmerkung='.$this->db_add_param($this->anmerkung).",". + ' mentor='.$this->db_add_param($this->mentor).",". ' dual='.$this->db_add_param($this->dual, FHC_BOOLEAN).",". ' ausstellungsstaat='.$this->db_add_param($this->ausstellungsstaat). " WHERE prestudent_id=".$this->db_add_param($this->prestudent_id).";"; @@ -1045,6 +1049,7 @@ class prestudent extends person $obj->bismelden = $this->db_parse_bool($row->bismelden); $obj->person_id = $row->person_id; $obj->anmerkung = $row->anmerkung; + $obj->mentor = $row->mentor; $obj->ext_id_prestudent = $row->ext_id; $obj->dual = $this->db_parse_bool($row->dual); $obj->ausstellungsstaat = $row->ausstellungsstaat; diff --git a/rdf/prestudent.rdf.php b/rdf/prestudent.rdf.php index 20cc17e25..e59561644 100644 --- a/rdf/prestudent.rdf.php +++ b/rdf/prestudent.rdf.php @@ -80,6 +80,7 @@ if(isset($_GET['prestudent_id']) && is_numeric($_GET['prestudent_id'])) punkte; ?>]]> bismelden?'true':'false'); ?>]]> anmerkung; ?>]]> + mentor; ?>]]> dual?'true':'false').']]> dual?'Ja':'Nein').']]> anmerkung.']]> + mentor.']]> '; }