Merge branch 'master' into FHBGLD-ZGV_Doktor_und_zgv_erfuellt

This commit is contained in:
Andreas Österreicher
2021-10-15 18:30:28 +02:00
160 changed files with 11782 additions and 3846 deletions
+41 -19
View File
@@ -512,7 +512,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
</menupopup>
</template>
</menulist>
<label value="Studientyp" control="student-detail-menulist-gsstudientyp"/>
<menulist id="student-detail-menulist-gsstudientyp" disabled="true"
datasources="<?php echo APP_ROOT ?>rdf/gsstudientyp.rdf.php" flex="1"
@@ -525,6 +524,18 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
</menupopup>
</template>
</menulist>
<label value="Bisstandort" control="student-prestudent-menulist-bisstandort" id="student-prestudent-label-bisstandort"/>
<menulist id="student-prestudent-menulist-bisstandort" disabled="true"
datasources="<?php echo APP_ROOT ?>rdf/bisstandort.rdf.php?optional=true" flex="1"
ref="http://www.technikum-wien.at/bisstandort/alle" >
<template>
<menupopup>
<menuitem value="rdf:http://www.technikum-wien.at/bisstandort/rdf#standort_code"
label="rdf:http://www.technikum-wien.at/bisstandort/rdf#bezeichnung"
uri="rdf:*"/>
</menupopup>
</template>
</menulist>
<label value="Facheinschlaegig berufstaetig" control="student-prestudent-checkbox-facheinschlberuf" hidden="true"/>
<checkbox id="student-prestudent-checkbox-facheinschlberuf" checked="true" disabled="true" hidden="true"/>
</row>
@@ -534,32 +545,43 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<columns>
<column flex="1"/>
<column flex="12"/>
<column flex="3"/>
<column flex="2"/>
<column flex="2"/>
<column flex="3"/>
</columns>
<rows>
<row>
<label value="Anmerkung" control="student-prestudent-textbox-anmerkung"/>
<textbox id="student-prestudent-textbox-anmerkung" disabled="true"/>
<hbox>
<label value="Bismelden" control="student-prestudent-checkbox-bismelden"/>
<checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
</hbox>
<label value="Anmerkung" control="student-prestudent-textbox-anmerkung"/>
<textbox id="student-prestudent-textbox-anmerkung" 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>
<hbox>
<label value="Priorität" control="student-prestudent-textbox-priorisierung"/>
<?php
$readonly = 'readonly="true"';
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($user);
if($rechte->isBerechtigt('basis/prestudent'))
$readonly = '';
?>
<textbox id="student-prestudent-textbox-priorisierung" disabled="true" <?php echo $readonly ?>/>
</hbox>
<hbox>
<label value="Förderrelevant" id="student-prestudent-label-foerderrelevant" control="student-prestudent-menulist-foerderrelevant"/>
<menulist id="student-prestudent-menulist-foerderrelevant" disabled="true">
<menupopup>
<menuitem value="" label="Wie Studiengang"/>
<menuitem value="true" label="Ja"/>
<menuitem value="false" label="Nein"/>
</menupopup>
</menulist>
</hbox>
<hbox>
<label value="Priorität" control="student-prestudent-textbox-priorisierung"/>
<?php
$readonly = 'readonly="true"';
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($user);
if($rechte->isBerechtigt('basis/prestudent'))
$readonly = '';
?>
<textbox id="student-prestudent-textbox-priorisierung" disabled="true" <?php echo $readonly ?>/>
</hbox>
</row>
<row id="student-prestudent-row-mentor">
<label value="MentorIn" control="student-prestudent-textbox-mentor"/>