blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-19 16:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Textfeld "Mentor" bei PreStudent im FAS hinzugefügt

Browse Source
This commit is contained in:
Nikolaus Krondraf
2014-10-23 11:37:20 +00:00
parent 358274ea18
commit 13230aa781
6 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/student/studentDBDML.php
+1
View File
@@ -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');
content/student/studentdetailoverlay.xul.php
+4
View File
@@ -512,6 +512,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<checkbox id="student-prestudent-checkbox-dual" checked="false" disabled="true"/>
</hbox>
</row>
<row>
<label value="Mentor" control="student-prestudent-textbox-mentor"/>
<textbox id="student-prestudent-textbox-mentor" disabled="true"/>
</row>
</rows>
</grid>
</groupbox>
content/student/studentoverlay.js.php
+5
View File
@@ -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();
include/prestudent.class.php
+7 -2
View File
@@ -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;
rdf/prestudent.rdf.php
+1
View File
@@ -80,6 +80,7 @@ if(isset($_GET['prestudent_id']) && is_numeric($_GET['prestudent_id']))
<PRESTD:punkte><![CDATA[<?php echo $prestd->punkte; ?>]]></PRESTD:punkte>
<PRESTD:bismelden><![CDATA[<?php echo ($prestd->bismelden?'true':'false'); ?>]]></PRESTD:bismelden>
<PRESTD:anmerkung><![CDATA[<?php echo $prestd->anmerkung; ?>]]></PRESTD:anmerkung>
<PRESTD:mentor><![CDATA[<?php echo $prestd->mentor; ?>]]></PRESTD:mentor>
</RDF:Description>
</RDF:li>
<?php
rdf/student.rdf.php
+1
View File
@@ -287,6 +287,7 @@ function draw_prestudent($row)
<STUDENT:dual><![CDATA['.($row->dual?'true':'false').']]></STUDENT:dual>
<STUDENT:dual_bezeichnung><![CDATA['.($row->dual?'Ja':'Nein').']]></STUDENT:dual_bezeichnung>
<STUDENT:anmerkungpre><![CDATA['.$row->anmerkung.']]></STUDENT:anmerkungpre>
<STUDENT:mentor><![CDATA['.$row->mentor.']]></STUDENT:mentor>
</RDF:Description>
</RDF:li>';
}