blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-279/FAS_AliasgenerierungMitSonderzeichen

Browse Source
This commit is contained in:
Andreas Österreicher
2021-12-02 09:37:41 +01:00
parent 410772b230 b4eb2d426a
commit 1613a9837b
132 changed files with 62987 additions and 54369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vilesci/personen/funktion_det.php
+5 -3
View File
@@ -236,7 +236,9 @@ if (! $funktion->load ( $kurzbz )) {
<link rel="stylesheet" href="../../skin/jquery-ui-1.9.2.custom.min.css" type="text/css">
<script type="text/javascript" src="../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
<?php
include("../../include/meta/jquery-tablesorter.php");
?>
<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>
@@ -265,8 +267,8 @@ if (! $funktion->load ( $kurzbz )) {
});
$("#t1").tablesorter({
sortList: [[0,0]],
widgets: ["zebra"],
headers: {9:{sorter:false},10:{sorter:false}}
widgets: ["zebra", "filter", "stickyHeaders"],
headers: {9:{sorter:false, filter: false},10:{sorter:false, filter: false}}
});
$('#t1').checkboxes('range', true);
$( ".datepicker_datumvon" ).datepicker({
vilesci/personen/import/interessentenimport.php
+4
View File
@@ -720,6 +720,10 @@ if (isset($_POST['save']))
$prestudent->reihungstestangetreten = false;
$prestudent->bismelden = true;
// Incomings und ausserordentliche sind bei Meldung nicht förderrelevant
if ($incoming === true || substr($studiengang_kz, 0, 1) == '9')
$prestudent->foerderrelevant = false;
//Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen
$qry_zgv = "
SELECT