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

Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig

Browse Source
This commit is contained in:
Andreas Österreicher
2021-01-29 15:30:22 +01:00
parent 943961127f 7dc21fde5a
commit 5b3daa76df
8 changed files with 356 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/betriebsmitteloverlay.xul.php
+2 -2
View File
@@ -197,7 +197,7 @@ else
<label value="Nummer" control="betriebsmittel-textbox-nummer"/>
<hbox>
<textbox id="betriebsmittel-textbox-nummerold" hidden="true"/>
<textbox id="betriebsmittel-textbox-nummer" disabled="true" maxlength="12"/>
<textbox id="betriebsmittel-textbox-nummer" disabled="true" maxlength="32"/>
<spacer flex="1" />
</hbox>
</row>
@@ -269,4 +269,4 @@ else
</hbox>
<spacer flex="1" />
</vbox>
</window>
</window>
content/statistik/studentenexportextended.xls.php
+11
View File
@@ -35,6 +35,7 @@ require_once('../../include/person.class.php');
require_once('../../include/benutzer.class.php');
require_once('../../include/student.class.php');
require_once('../../include/prestudent.class.php');
require_once('../../include/statusgrund.class.php');
require_once('../../include/datum.class.php');
require_once('../../include/Excel/excel.php');
require_once('../../include/udf.class.php');
@@ -156,6 +157,8 @@ $maxlength[$i] = 16;
$worksheet->write($zeile, ++$i, "STATUS", $format_bold);
$maxlength[$i] = 6;
$worksheet->write($zeile, ++$i, "STATUSGRUND", $format_bold);
$maxlength[$i] = 6;
$worksheet->write($zeile, ++$i, "STATUS IN ANDEREN STUDIENGÄNGEN", $format_bold);
$maxlength[$i] = 8;
$worksheet->write($zeile, ++$i, "EMail Intern", $format_bold);
@@ -258,6 +261,8 @@ function draw_content($row)
$prestudent = new prestudent();
$prestudent->getLastStatus($row->prestudent_id);
$statusgrundObj = new statusgrund($prestudent->statusgrund_id);
$statusgrund = $statusgrundObj->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE];
$status = $prestudent->status_kurzbz;
$orgform = $prestudent->orgform_kurzbz;
$prio_relativ = new prestudent();
@@ -523,6 +528,12 @@ function draw_content($row)
$worksheet->write($zeile, $i, $status);
$i++;
//Statusgrund
if (mb_strlen($statusgrund) > $maxlength[$i])
$maxlength[$i] = mb_strlen($statusgrund);
$worksheet->write($zeile, $i, $statusgrund);
$i++;
//Stati in anderen Studiengaengen
$stati='';
$qry_1 = "
content/student/studentdetailoverlay.xul.php
+8 -4
View File
@@ -300,7 +300,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<label value="ZGV" control="student-prestudent-menulist-zgvcode"/>
<menulist id="student-prestudent-menulist-zgvcode" disabled="true"
datasources="<?php echo APP_ROOT ?>rdf/zgv.rdf.php?optional=true" flex="1"
ref="http://www.technikum-wien.at/zgv/alle" >
ref="http://www.technikum-wien.at/zgv/alle"
style="min-width: 130px">
<template>
<menupopup>
<menuitem value="rdf:http://www.technikum-wien.at/zgv/rdf#code"
@@ -320,7 +321,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<hbox>
<menulist id="student-prestudent-menulist-zgvnation" disabled="true"
datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
ref="http://www.technikum-wien.at/nation/liste">
ref="http://www.technikum-wien.at/nation/liste"
style="min-width: 100px">
<template>
<menupopup>
<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
@@ -335,7 +337,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<label value="ZGV Master" control="student-prestudent-menulist-zgvmastercode"/>
<menulist id="student-prestudent-menulist-zgvmastercode" disabled="true"
datasources="<?php echo APP_ROOT ?>rdf/zgvmaster.rdf.php?optional=true" flex="1"
ref="http://www.technikum-wien.at/zgvmaster/alle" >
ref="http://www.technikum-wien.at/zgvmaster/alle"
style="min-width: 130px" >
<template>
<menupopup>
<menuitem value="rdf:http://www.technikum-wien.at/zgvmaster/rdf#code"
@@ -354,7 +357,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<hbox>
<menulist id="student-prestudent-menulist-zgvmasternation" disabled="true"
datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
ref="http://www.technikum-wien.at/nation/liste" >
ref="http://www.technikum-wien.at/nation/liste"
style="min-width: 100px">
<template>
<menupopup>
<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"