blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +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/lvplanung/lehrveranstaltungdetailoverlay.xul.php
+16 -4
View File
@@ -469,12 +469,24 @@ $p = new phrasen($sprache);
<label align="end" control="lehrveranstaltung-lehreinheitmitarbeiter-menulist-lektor" value="LektorIn:"/>
<menulist id="lehrveranstaltung-lehreinheitmitarbeiter-menulist-lektor" disabled="true" oncommand="LeMitarbeiterLektorChange(); LeMitarbeiterValueChanged();"
datasources="<?php echo APP_ROOT; ?>rdf/mitarbeiter.rdf.php"
xmlns:MITARBEITER="http://www.technikum-wien.at/mitarbeiter/rdf#"
ref="http://www.technikum-wien.at/mitarbeiter/_alle" flex="1">
<template>
<menupopup>
<menuitem uri="rdf:*" label="rdf:http://www.technikum-wien.at/mitarbeiter/rdf#nachname rdf:http://www.technikum-wien.at/mitarbeiter/rdf#vorname"
value="rdf:http://www.technikum-wien.at/mitarbeiter/rdf#uid"/>
</menupopup>
<rule MITARBEITER:aktiv='inaktiv'>
<menupopup>
<menuitem uri="rdf:*" label="rdf:http://www.technikum-wien.at/mitarbeiter/rdf#nachname rdf:http://www.technikum-wien.at/mitarbeiter/rdf#vorname"
value="rdf:http://www.technikum-wien.at/mitarbeiter/rdf#uid"
style="text-decoration:line-through;"
/>
</menupopup>
</rule>
<rule>
<menupopup>
<menuitem uri="rdf:*" label="rdf:http://www.technikum-wien.at/mitarbeiter/rdf#nachname rdf:http://www.technikum-wien.at/mitarbeiter/rdf#vorname"
value="rdf:http://www.technikum-wien.at/mitarbeiter/rdf#uid"/>
</menupopup>
</rule>
</template>
</menulist>
<label control="lehrveranstaltung-lehreinheitmitarbeiter-textbox-anmerkung" value="<?php echo $p->t('lehrveranstaltung/LehreinheitmitarbeiterAnmerkung'); ?>"/>
content/statistik/StudierendeZGV.php
+1 -1
View File
@@ -53,7 +53,7 @@ echo '<!DOCTYPE html>
<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css"/>
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
<script type="text/javascript" src="../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
content/statistik/dropout.php
+1 -1
View File
@@ -57,7 +57,7 @@ $html.= '<!DOCTYPE html>
<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css"/>
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
<script type="text/javascript" src="../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
content/statistik/dropoutZGV.php
+1 -1
View File
@@ -53,7 +53,7 @@ echo '<!DOCTYPE html>
<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css"/>
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
<script type="text/javascript" src="../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
content/statistik/lvplanung.xls.php
+32 -2
View File
@@ -181,7 +181,9 @@ SELECT tbl_lehrveranstaltung.bezeichnung AS lf_bezeichnung,
AND tbl_lehrveranstaltung.lehrform_kurzbz = slv.lehrform_kurzbz
AND sle.studiensemester_kurzbz = " . $db->db_add_param($previousStsem) . "
) AS vorjahr_lektor,
tbl_lehrveranstaltung.lehrform_kurzbz
tbl_lehrveranstaltung.lehrform_kurzbz,
tbl_lehrveranstaltung.las,
tbl_lehrveranstaltung.alvs
FROM lehre.tbl_lehrveranstaltung
JOIN lehre.tbl_lehreinheit USING (lehrveranstaltung_id)
JOIN lehre.tbl_lehreinheitmitarbeiter USING (lehreinheit_id)
@@ -274,7 +276,7 @@ $maxlength[$spalte]=9;
$worksheet->write($zeile,++$spalte,"LV-Nummer", $format_bold);
$maxlength[$spalte]=9;
$worksheet->write($zeile,++$spalte,"Semesterstunden", $format_bold);
$worksheet->write($zeile,++$spalte,"Lehrauftragsstunden", $format_bold);
$maxlength[$spalte]=15;
$worksheet->write($zeile,++$spalte,"ECTS", $format_bold);
@@ -295,6 +297,14 @@ $maxlength[$spalte]=10;
$worksheet->write($zeile,++$spalte,"Start in KW", $format_bold);
$maxlength[$spalte]=10;
$worksheet->write($zeile,++$spalte,"LAS der LV", $format_bold);
$maxlength[$spalte]=10;
$worksheet->write($zeile,++$spalte,"ALVS der LV", $format_bold);
$maxlength[$spalte]=10;
$worksheet->write($zeile,++$spalte,"Anzahl Studierende", $format_bold);
$maxlength[$spalte]=16;
if($result = $db->db_query($qry))
{
@@ -445,6 +455,26 @@ if($result = $db->db_query($qry))
//Start in KW
$worksheet->write($zeile,++$spalte,$row->start_kw);
//LAS der LV
$worksheet->write($zeile,++$spalte,$row->las);
//ALVS der LV
$worksheet->write($zeile,++$spalte,$row->alvs);
// Anzahl Studierende in Lehreinheit
$anzahlStudierende = 0;
$qry_anz_std = "SELECT count(DISTINCT uid) as anzahl FROM campus.vw_student_lehrveranstaltung WHERE lehreinheit_id=".$db->db_add_param($row->lehreinheit_id, FHC_INTEGER);
if($result_anz_std = $db->db_query($qry_anz_std))
{
if ($row_anz_std = $db->db_fetch_object($result_anz_std))
{
$anzahlStudierende = $row_anz_std->anzahl;
}
}
$worksheet->write($zeile,++$spalte,$anzahlStudierende);
}
//Betreuungen
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', '');