mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-25 08:34:29 +00:00
Merge branch 'master' into feature-18571/EntwicklungsteamBisMeldung
This commit is contained in:
Andreas Österreicher
+8
-1
@@ -125,7 +125,8 @@ foreach($addon_obj->result as $addon)
|
||||
<command id="menu-statistic-studentendetails:command" oncommand="StatistikPrintStudentExportExtended();"/>
|
||||
<command id="menu-statistic-stromanalyse:command" oncommand="StatistikPrintStromanalyse();"/>
|
||||
<command id="menu-dokumente-bewerberakt:command" oncommand="StudentPrintBewerberakt(event);"/>
|
||||
<command id="menu-dokumente-inskriptionsbestaetigung:command" oncommand="StudentPrintInskriptionsbestaetigung(event);"/>
|
||||
<command id="menu-dokumente-inskriptionsbestaetigung:command" oncommand="StudentPrintInskriptionsbestaetigung(event, 'Inskription');"/>
|
||||
<command id="menu-dokumente-inskriptionsbestaetigungeng:command" oncommand="StudentPrintInskriptionsbestaetigung(event, 'InskriptionEng');"/>
|
||||
<command id="menu-dokumente-zeugnis:command" oncommand="StudentCreateZeugnis('Zeugnis',event);"/>
|
||||
<command id="menu-dokumente-zeugniseng:command" oncommand="StudentCreateZeugnis('ZeugnisEng',event);"/>
|
||||
<command id="menu-dokumente-diplsupplement:command" oncommand="StudentCreateDiplSupplement(event);"/>
|
||||
@@ -513,6 +514,12 @@ foreach($addon_obj->result as $addon)
|
||||
label = "&menu-dokumente-inskriptionsbestaetigung.label;"
|
||||
command = "menu-dokumente-inskriptionsbestaetigung:command"
|
||||
accesskey = "&menu-dokumente-inskriptionsbestaetigung.accesskey;"/>
|
||||
<menuitem
|
||||
id = "menu-dokumente-inskriptionsbestaetigungeng"
|
||||
key = "menu-dokumente-inskriptionsbestaetigungeng:key"
|
||||
label = "&menu-dokumente-inskriptionsbestaetigungeng.label;"
|
||||
command = "menu-dokumente-inskriptionsbestaetigungeng:command"
|
||||
accesskey = "&menu-dokumente-inskriptionsbestaetigungeng.accesskey;"/>
|
||||
<menuitem
|
||||
id = "menu-statistic-lehrauftraege"
|
||||
key = "menu-statistic-lehrauftraege:key"
|
||||
|
||||
@@ -199,26 +199,46 @@ $p = new phrasen($sprache);
|
||||
<label value="Raumtyp" />
|
||||
<menulist id="lehrveranstaltung-detail-menulist-raumtyp" disabled="true"
|
||||
datasources="<?php echo APP_ROOT ?>rdf/raumtyp.rdf.php" flex="1"
|
||||
xmlns:RAUMTYP="http://www.technikum-wien.at/raumtyp/rdf#"
|
||||
ref="http://www.technikum-wien.at/raumtyp/liste" >
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/raumtyp/rdf#kurzbz"
|
||||
label="rdf:http://www.technikum-wien.at/raumtyp/rdf#kurzbz rdf:http://www.technikum-wien.at/raumtyp/rdf#beschreibung"
|
||||
uri="rdf:*"/>
|
||||
</menupopup>
|
||||
</template>
|
||||
<template>
|
||||
<rule RAUMTYP:aktiv='true'>
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/raumtyp/rdf#kurzbz"
|
||||
label="rdf:http://www.technikum-wien.at/raumtyp/rdf#kurzbz rdf:http://www.technikum-wien.at/raumtyp/rdf#beschreibung"
|
||||
uri="rdf:*"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
<rule>
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/raumtyp/rdf#kurzbz"
|
||||
label="rdf:http://www.technikum-wien.at/raumtyp/rdf#kurzbz rdf:http://www.technikum-wien.at/raumtyp/rdf#beschreibung"
|
||||
uri="rdf:*" style="text-decoration:line-through;"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
</template>
|
||||
</menulist>
|
||||
<label value="Raumtyp alternativ" />
|
||||
<menulist id="lehrveranstaltung-detail-menulist-raumtypalternativ" disabled="true"
|
||||
datasources="<?php echo APP_ROOT ?>rdf/raumtyp.rdf.php" flex="1"
|
||||
datasources="<?php echo APP_ROOT ?>rdf/raumtyp.rdf.php" flex="1"
|
||||
xmlns:RAUMTYP="http://www.technikum-wien.at/raumtyp/rdf#"
|
||||
ref="http://www.technikum-wien.at/raumtyp/liste" >
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/raumtyp/rdf#kurzbz"
|
||||
label="rdf:http://www.technikum-wien.at/raumtyp/rdf#kurzbz rdf:http://www.technikum-wien.at/raumtyp/rdf#beschreibung"
|
||||
uri="rdf:*"/>
|
||||
</menupopup>
|
||||
</template>
|
||||
<template>
|
||||
<rule RAUMTYP:aktiv='true'>
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/raumtyp/rdf#kurzbz"
|
||||
label="rdf:http://www.technikum-wien.at/raumtyp/rdf#kurzbz rdf:http://www.technikum-wien.at/raumtyp/rdf#beschreibung"
|
||||
uri="rdf:*"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
<rule>
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/raumtyp/rdf#kurzbz"
|
||||
label="rdf:http://www.technikum-wien.at/raumtyp/rdf#kurzbz rdf:http://www.technikum-wien.at/raumtyp/rdf#beschreibung"
|
||||
uri="rdf:*" style="text-decoration:line-through;"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
</template>
|
||||
</menulist>
|
||||
</row>
|
||||
|
||||
|
||||
@@ -253,7 +253,7 @@ else
|
||||
array('uid', 'stg_kz', 'person_id', 'id', 'prestudent_id', 'buchungsnummern', 'ss', 'abschlusspruefung_id',
|
||||
'typ', 'all', 'preoutgoing_id', 'lvid', 'projekt_kurzbz', 'von', 'bis', 'stundevon', 'stundebis',
|
||||
'sem', 'lehreinheit', 'mitarbeiter_uid', 'studienordnung_id', 'fixangestellt', 'standort',
|
||||
'abrechnungsmonat', 'form', 'projektarbeit_id', 'betreuerart_kurzbz')
|
||||
'abrechnungsmonat', 'form', 'projektarbeit_id', 'betreuerart_kurzbz', 'studiensemester_kurzbz')
|
||||
)
|
||||
)
|
||||
{
|
||||
|
||||
@@ -27,8 +27,14 @@ header("Pragma: no-cache");
|
||||
header("Content-type: application/vnd.mozilla.xul+xml");
|
||||
require_once('../../config/vilesci.config.inc.php');
|
||||
require_once('../../config/global.config.inc.php');
|
||||
require_once('../../include/functions.inc.php');
|
||||
require_once('../../include/benutzerberechtigung.class.php');
|
||||
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
|
||||
$user = get_uid();
|
||||
$rechte = new benutzerberechtigung();
|
||||
$rechte->getBerechtigungen($user);
|
||||
|
||||
?>
|
||||
|
||||
<overlay id="StudentKonto"
|
||||
@@ -206,10 +212,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
<spacer flex="1"/>
|
||||
<button id="student-konto-button-zahlungsbestaetigung" label="Zahlungsbestaetigung drucken" oncommand="StudentKontoZahlungsbestaetigung();" disabled="true" hidden="<?php echo $is_hidden?>"/>
|
||||
</hbox>
|
||||
<vbox hidden="true">
|
||||
<label value="Buchungsnr" control="student-konto-textbox-buchungsnr"/>
|
||||
<textbox id="student-konto-textbox-buchungsnr" disabled="true"/>
|
||||
</vbox>
|
||||
<groupbox id="student-konto-groupbox">
|
||||
<caption label="Details"/>
|
||||
<grid id="student-konto-grid-detail" style="overflow:auto;margin:4px;" flex="1">
|
||||
@@ -218,6 +220,20 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
<column flex="5"/>
|
||||
</columns>
|
||||
<rows>
|
||||
<?php
|
||||
$hidden = 'hidden="true"';
|
||||
$rechte = new benutzerberechtigung();
|
||||
$rechte->getBerechtigungen($user);
|
||||
if($rechte->isBerechtigt('admin'))
|
||||
$hidden = '';
|
||||
?>
|
||||
<row <?php echo $hidden ?>>
|
||||
<label value="Buchungsnr" control="student-konto-textbox-buchungsnr"/>
|
||||
<hbox>
|
||||
<textbox id="student-konto-textbox-buchungsnr" readonly="true" size="9"/>
|
||||
<spacer flex="1" />
|
||||
</hbox>
|
||||
</row>
|
||||
<row>
|
||||
<label value="Betrag" control="student-konto-textbox-betrag"/>
|
||||
<hbox>
|
||||
|
||||
@@ -2385,7 +2385,7 @@ function StudentAddRolle(rolle, semester, studiensemester, statusgrund_id)
|
||||
// ****
|
||||
// * Druckt die Instkriptionsbestaetigung
|
||||
// ****
|
||||
function StudentPrintInskriptionsbestaetigung(event)
|
||||
function StudentPrintInskriptionsbestaetigung(event, xsl)
|
||||
{
|
||||
tree = document.getElementById('student-tree');
|
||||
//Alle markierten Studenten holen
|
||||
@@ -2422,7 +2422,7 @@ function StudentPrintInskriptionsbestaetigung(event)
|
||||
var output='pdf';
|
||||
|
||||
if(anzahl>0)
|
||||
window.open('<?php echo APP_ROOT; ?>content/pdfExport.php?xml=student.rdf.php&xsl=Inskription&stg_kz='+stg_kz+'&uid='+paramList+'&ss='+stsem+'&output='+output,'Inskriptionsbestaetigung', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
|
||||
window.open('<?php echo APP_ROOT; ?>content/pdfExport.php?xml=student.rdf.php&xsl='+ xsl +'&stg_kz='+stg_kz+'&uid='+paramList+'&ss='+stsem+'&output='+output,'Inskriptionsbestaetigung', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
|
||||
else
|
||||
alert('Bitte einen Studenten auswaehlen');
|
||||
}
|
||||
@@ -3452,6 +3452,10 @@ function StudentZeugnisDokumentArchivieren()
|
||||
xml = 'ausbildungsvertrag.xml.php';
|
||||
break;
|
||||
|
||||
case 'AbschlussdokumentLehrgaenge':
|
||||
xml = 'abschlussdokument_lehrgaenge.xml.php';
|
||||
break;
|
||||
|
||||
default:
|
||||
alert('Das Archivieren fuer diesen Dokumenttyp wird derzeit nicht unterstuetzt');
|
||||
return
|
||||
|
||||
@@ -270,7 +270,8 @@ foreach ($uid_arr as $uid)
|
||||
'matrikelnummer' => rtrim($student->matrikelnr),
|
||||
'matr_nr' => $person->matr_nr,
|
||||
'ausstellungsdatum' => date('M.Y'),
|
||||
'gueltigbis' => $datum_obj->formatDatum($gueltigbis, 'd.m.Y')
|
||||
'gueltigbis' => $datum_obj->formatDatum($gueltigbis, 'd.m.Y'),
|
||||
'gueltigbis_3jahre' => date('d.m.Y', strtotime('+3 years'))
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user