mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-23 09:52:22 +00:00
neues Feld beim Prestudenten: DUAL
This commit is contained in:
@@ -162,6 +162,8 @@ if($typ=='xls')
|
||||
}
|
||||
$worksheet->write($zeile,++$spalte,'Notendurchschnitt', $format_bold);
|
||||
$maxlength[$spalte]=15;
|
||||
$worksheet->write($zeile,++$spalte,'Gewichteter Notendurchschnitt', $format_bold);
|
||||
$maxlength[$spalte]=15;
|
||||
|
||||
$anzahl_lv=array();
|
||||
$summe_lv=array();
|
||||
|
||||
@@ -395,6 +395,7 @@ if(!$error)
|
||||
$prestudent->reihungstestangetreten = ($_POST['reihungstestangetreten']=='true'?true:false);
|
||||
$prestudent->punkte = str_replace(',','.',$_POST['punkte']);
|
||||
$prestudent->bismelden = ($_POST['bismelden']=='true'?true:false);
|
||||
$prestudent->dual = ($_POST['dual']=='true'?true:false);
|
||||
$prestudent->anmerkung = $_POST['anmerkung'];
|
||||
//$prestudent->insertamum = date('Y-m-d H:i:s');
|
||||
//$prestudent->insertvon = $user;
|
||||
|
||||
@@ -440,16 +440,22 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
<grid style="margin:4px;" flex="1">
|
||||
<columns >
|
||||
<column flex="1"/>
|
||||
<column flex="11"/>
|
||||
<column flex="1"/>
|
||||
<column flex="5"/>
|
||||
<column flex="12"/>
|
||||
<column flex="3"/>
|
||||
<column flex="3"/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<label value="Anmerkung" control="student-prestudent-textbox-anmerkung"/>
|
||||
<textbox id="student-prestudent-textbox-anmerkung" disabled="true"/>
|
||||
<label value="Bismelden" control="student-prestudent-checkbox-bismelden"/>
|
||||
<checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
|
||||
<hbox>
|
||||
<label value="Bismelden" control="student-prestudent-checkbox-bismelden"/>
|
||||
<checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<label value="Dual" control="student-prestudent-checkbox-dual"/>
|
||||
<checkbox id="student-prestudent-checkbox-dual" checked="false" disabled="true"/>
|
||||
</hbox>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
|
||||
@@ -242,6 +242,10 @@ else
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#punkte" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-dual" label="Dual" flex="1" hidden="true" persist="hidden, width, ordinal"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#dual" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
</treecols>
|
||||
|
||||
<template>
|
||||
@@ -274,6 +278,7 @@ else
|
||||
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#orgform" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#aufmerksamdurch_kurzbz" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte" />
|
||||
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#dual" />
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
||||
@@ -888,6 +888,7 @@ function StudentAuswahl()
|
||||
punkte = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#punkte" ));
|
||||
bismelden = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bismelden" ));
|
||||
anmerkung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkungpre" ));
|
||||
dual = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#dual" ));
|
||||
|
||||
document.getElementById('student-prestudent-menulist-aufmerksamdurch').value=aufmerksamdurch_kurzbz;
|
||||
document.getElementById('student-prestudent-menulist-berufstaetigkeit').value=berufstaetigkeit_code;
|
||||
@@ -915,6 +916,11 @@ function StudentAuswahl()
|
||||
document.getElementById('student-prestudent-checkbox-bismelden').checked=true;
|
||||
else
|
||||
document.getElementById('student-prestudent-checkbox-bismelden').checked=false;
|
||||
|
||||
if(dual=='true')
|
||||
document.getElementById('student-prestudent-checkbox-dual').checked=true;
|
||||
else
|
||||
document.getElementById('student-prestudent-checkbox-dual').checked=false;
|
||||
|
||||
document.getElementById('student-prestudent-textbox-person_id').value=person_id;
|
||||
document.getElementById('student-prestudent-textbox-prestudent_id').value=prestudent_id;
|
||||
@@ -1329,6 +1335,7 @@ function StudentPrestudentDisableFields(val)
|
||||
document.getElementById('student-prestudent-checkbox-reihungstestangetreten').disabled=val;
|
||||
document.getElementById('student-prestudent-textbox-punkte').disabled=val;
|
||||
document.getElementById('student-prestudent-checkbox-bismelden').disabled=val;
|
||||
document.getElementById('student-prestudent-checkbox-dual').disabled=val;
|
||||
document.getElementById('student-prestudent-button-anmeldungreihungstest-heute').disabled=val;
|
||||
document.getElementById('student-prestudent-button-save').disabled=val;
|
||||
//document.getElementById('student-prestudent-menulist-studiengang_kz').disabled=val;
|
||||
@@ -1375,6 +1382,7 @@ function StudentPrestudentSave()
|
||||
reihungstestangetreten = document.getElementById('student-prestudent-checkbox-reihungstestangetreten').checked;
|
||||
punkte = document.getElementById('student-prestudent-textbox-punkte').value;
|
||||
bismelden = document.getElementById('student-prestudent-checkbox-bismelden').checked;
|
||||
dual = document.getElementById('student-prestudent-checkbox-dual').checked;
|
||||
person_id = document.getElementById('student-prestudent-textbox-person_id').value;
|
||||
prestudent_id = document.getElementById('student-prestudent-textbox-prestudent_id').value;
|
||||
neu = document.getElementById('student-prestudent-checkbox-new').checked;
|
||||
@@ -1424,6 +1432,7 @@ function StudentPrestudentSave()
|
||||
req.add('reihungstestangetreten', reihungstestangetreten);
|
||||
req.add('punkte', punkte);
|
||||
req.add('bismelden', bismelden);
|
||||
req.add('dual', dual);
|
||||
req.add('person_id', person_id);
|
||||
req.add('prestudent_id', prestudent_id);
|
||||
req.add('studiengang_kz', studiengang_kz);
|
||||
|
||||
Reference in New Issue
Block a user