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

Merge branch 'master' into feature-24768/fas_zgv_bezeichnung

Browse Source
This commit is contained in:
Andreas Österreicher
2022-11-11 09:53:23 +01:00
parent b4d86744f2 7558614145
commit b69e79685d
293 changed files with 7475 additions and 2205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/student/studentDBDML.php
+1
View File
@@ -3128,6 +3128,7 @@ if(!$error)
$bisio->bisio_id = (isset($_POST['bisio_id'])?$_POST['bisio_id']:'');
$bisio->mobilitaetsprogramm_code = $_POST['mobilitaetsprogramm_code'];
$bisio->nation_code = $_POST['nation_code'];
$bisio->herkunftsland_code = $_POST['herkunftsland_code'];
$bisio->von = $_POST['von'];
$bisio->bis = $_POST['bis'];
$bisio->student_uid = $_POST['student_uid'];
content/student/studentdetailoverlay.xul.php
+1 -1
View File
@@ -679,7 +679,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
</hbox>
<hbox>
<label value="Dual" control="student-prestudent-checkbox-dual"/>
<label value="Duales Studium" control="student-prestudent-checkbox-dual"/>
<checkbox id="student-prestudent-checkbox-dual" checked="false" disabled="true"/>
</hbox>
<hbox>
content/student/studentiooverlay.xul.php
+14
View File
@@ -171,6 +171,20 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
</template>
</menulist>
</row>
<row>
<label value="Herkunftsland" control="student-io-menulist-herkunftsland"/>
<menulist id="student-io-menulist-herkunftsland" disabled="true"
datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php" flex="1"
ref="http://www.technikum-wien.at/nation/liste" >
<template>
<menupopup>
<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
uri="rdf:*"/>
</menupopup>
</template>
</menulist>
</row>
<row>
<label value="Zweck" control="student-io-menulist-zweck"/>
<vbox>
content/student/studentoverlay.js.php
+7
View File
@@ -3511,6 +3511,7 @@ function StudentIOAuswahl()
mobilitaetsprogramm_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#mobilitaetsprogramm_code" ));
nation_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#nation_code" ));
herkunftsland_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#herkunftsland_code" ));
von = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#von" ));
bis = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bis" ));
zweck_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zweck_code" ));
@@ -3585,6 +3586,7 @@ function StudentIOAuswahl()
document.getElementById('student-io-menulist-mobilitaetsprogramm').value=mobilitaetsprogramm_code;
document.getElementById('student-io-menulist-nation').value=nation_code;
document.getElementById('student-io-menulist-herkunftsland').value=herkunftsland_code;
document.getElementById('student-io-textbox-von').value=von;
document.getElementById('student-io-textbox-bis').value=bis;
document.getElementById('student-io-detail-textbox-uid').value=student_uid;
@@ -3819,6 +3821,7 @@ function StudentIODetailDisableFields(val)
document.getElementById('student-io-textbox-bis').disabled=val;
document.getElementById('student-io-menulist-mobilitaetsprogramm').disabled=val;
document.getElementById('student-io-menulist-nation').disabled=val;
document.getElementById('student-io-menulist-herkunftsland').disabled=val;
document.getElementById('student-io-menulist-zweck').disabled=val;
document.getElementById('student-io-button-speichern').disabled=val;
document.getElementById('student-io-menulist-lehrveranstaltung').disabled=val;
@@ -3844,6 +3847,7 @@ function StudentIOResetFileds()
document.getElementById('student-io-menulist-mobilitaetsprogramm').value='7';
document.getElementById('student-io-menulist-zweck').value='2';
document.getElementById('student-io-menulist-nation').value='A';
document.getElementById('student-io-menulist-herkunftsland').value='A';
document.getElementById('student-io-textbox-ort').value='';
document.getElementById('student-io-textbox-universitaet').value='';
document.getElementById('student-io-textbox-ects_angerechnet').value='';
@@ -3861,6 +3865,7 @@ function StudentIODetailSpeichern()
bis = document.getElementById('student-io-textbox-bis').value;
mobilitaetsprogramm = document.getElementById('student-io-menulist-mobilitaetsprogramm').value;
nation_code = document.getElementById('student-io-menulist-nation').value;
herkunftsland_code = document.getElementById('student-io-menulist-herkunftsland').value;
zweck_code = document.getElementById('student-io-menulist-zweck').value;
uid = document.getElementById('student-io-detail-textbox-uid').value;
neu = document.getElementById('student-io-detail-checkbox-neu').checked;
@@ -3898,6 +3903,7 @@ function StudentIODetailSpeichern()
req.add('bis', ConvertDateToISO(bis));
req.add('mobilitaetsprogramm_code', mobilitaetsprogramm);
req.add('nation_code', nation_code);
req.add('herkunftsland_code', herkunftsland_code);
req.add('zweck_code', zweck_code);
req.add('student_uid', uid);
req.add('studiengang_kz', studiengang_kz);
@@ -4035,6 +4041,7 @@ function StudentIONeu()
req.add('bis', ConvertDateToISO(defaultdatum));
req.add('mobilitaetsprogramm_code', mobilitaetsprogramm);
req.add('nation_code', 'A');
req.add('herkunftsland_code', 'A');
req.add('student_uid', uid);
req.add('studiengang_kz', stg_kz);
req.add('lehreinheit_id', '');