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

autocomplete bei den kompatiblen lvs beruecksichtigen

Browse Source
This commit is contained in:
ma0048
2025-09-01 09:20:33 +02:00
parent db61320b8c
commit 0d1cf2b043
3 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
+3
View File
@@ -288,6 +288,8 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
terminezusammenlegen(termine, erste_lvid);
}
})
loadPruefungStudiengang();
});
</script>
<h1><?php echo $p->t('pruefung/anmeldungenVerwalten'); ?></h1>
@@ -318,6 +320,7 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
<div id='prfWrapper'>
<div id='pruefungen'>
<h2><?php echo $p->t('pruefung/pruefungPruefungenTitle'); ?></h2>
<button id="zusammenlegen">Termine zusammenlegen</button>
<table id="table4" class="tablesorter" style="display:none">
<thead>
<tr>
system/dbupdate_3.4.php
-1
View File
@@ -77,7 +77,6 @@ require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
require_once('dbupdate_3.4/25999_C4_dashboard.php');
require_once('dbupdate_3.4/61730_Dashboard_Anpassungen.php');
require_once('dbupdate_3.4/40128_search.php');
require_once('dbupdate_3.4/60882_lehrfaecherverteilung_favorites.php');
require_once('dbupdate_3.4/47972_pruefungsverwaltung_ects_angabe.php');
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
vilesci/lehre/lehrveranstaltung_kompatibel_vergleichen.php
+39 -7
View File
@@ -140,12 +140,17 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
let uebernahmenCheckboxen = $("input[name='lvUebernehmenCheckbox']:checked");
let checkboxenUebernahmeCount = uebernahmenCheckboxen.length;
if (!lvidFrom || !lvidTo)
let lvidautoFrom = $('#autocompleteFrom').data("lv-id");
let lvidautoTo = $('#autocompleteTo').data("lv-id");
if ((!lvidFrom && !lvidautoFrom) || (!lvidTo && !lvidautoTo))
{
alert("Bitte in beiden Dropdowns eine LV auswählen!");
return;
}
lvidTo = lvidTo || lvidautoTo;
if (checkboxenUebernahmeCount === 0)
{
alert("Bitte Kompatible LV´s auswählen die übernommen werden sollen!");
@@ -159,7 +164,18 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
done++;
if (done === checkboxenUebernahmeCount)
{
$('#lvDropdownTo').trigger('change');
let drodpwonval = $('#lvDropdownTo').val();
const autocompleteval = $('#autocompleteTo').data('lv-id');
if (drodpwonval)
{
$('#lvDropdownTo').trigger('change');
}
else if (autocompleteval)
{
callLoadKompatibleLvs(autocompleteval, 'To');
}
}
});
});
@@ -211,9 +227,7 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
loadKompatibleLvs(side)
})
$('#kompatibleLVs' + side).tablesorter({
widgets: ["zebra"]
});
$('#kompatibleLVs' + side).data('ts-initialized', false);
$("#autocomplete" + side).autocomplete({
source: "lehrveranstaltung_kompatibel_vergleichen.php?autocomplete=" + side,
@@ -230,6 +244,7 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
},
select: function(event, ui) {
callLoadKompatibleLvs(ui.item.lehrveranstaltung_id, side)
$(this).data("lv-id", ui.item.lehrveranstaltung_id);
$("#lvBezeichnung" + side).html(ui.item.bezeichnung);
}
});
@@ -237,6 +252,16 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
}
function sortTable(side)
{
if ($("#kompatibleLVs" + side + " tbody tr").length > 0 && !$('#kompatibleLVs' + side).data('ts-initialized'))
{
$('#kompatibleLVs' + side).tablesorter({
widgets: ["zebra"],
});
}
}
function loadSemester(side)
{
var studiengang_kz = $("#stgDropdown" + side).val();
@@ -318,6 +343,7 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
});
$("#kompatibleLVs" + side + " tbody").html(html);
sortTable(side);
markDifferences();
},
error: function(jqXHR, textStatus, errorThrown)
@@ -328,8 +354,14 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
}
function markDifferences() {
const fromVal = $("#lvDropdownFrom").val();
const toVal = $("#lvDropdownTo").val();
let fromVal = $("#lvDropdownFrom").val();
let toVal = $("#lvDropdownTo").val();
let lvidautoFrom = $('#autocompleteFrom').data("lv-id");
let lvidautoTo = $('#autocompleteTo').data("lv-id");
fromVal = fromVal || lvidautoFrom;
toVal = toVal || lvidautoTo;
if (!fromVal || fromVal === "null" || !toVal || toVal === "null")
{