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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Manfred Kindl
2020-01-09 14:53:26 +01:00
parent cb47937e54 2073b7ceda
commit f589a3dd15
9 changed files with 247 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/lehre/benotungstool/nachpruefungeintragen.php
+3
View File
@@ -170,7 +170,9 @@ if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '') )
if($pr->getPruefungen($student_uid, "Termin1", $lvid, $stsem))
{
if ($pr->result)
{
$termin1 = 1;
}
else
{
$lvnote = new lvgesamtnote();
@@ -183,6 +185,7 @@ if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '') )
else
{
$pr_note = 9;
$pr_punkte = '';
$benotungsdatum = $jetzt;
}
cis/private/lehre/pruefung/pruefung.js.php
+26 -23
View File
@@ -575,8 +575,8 @@ function saveAnmeldung(lehrveranstaltung_id, termin_id)
studienverpflichtung_id = $("#studienverpflichtung option:selected").val();
var studiengang_kz = null;
if($('#select_studiengang').length)
studiengang_kz = $('#select_studiengang option:selected').val();
if($('#prestudent_studiengang').length)
studiengang_kz = $('#prestudent_studiengang option:selected').val();
$.ajax({
dataType: 'json',
@@ -892,28 +892,31 @@ function saveReihung(terminId, lehrveranstaltung_id)
anmeldung.uid = v.id;
reihung.push(anmeldung);
});
$.ajax({
dataType: 'json',
url: "./pruefungsanmeldung.json.php",
type: "POST",
data: {
method: "saveReihung",
reihung: reihung
},
error: loadError,
success: function(data){
if(data.error === 'false' && data.result === true)
{
messageBox("message", "<?php echo $p->t('pruefung/reihunghErfolgreichGeaendert'); ?>", "green", "highlight", 1000);
}
else
{
messageBox("message", data.errormsg, "red", "highlight", 1000);
}
showAnmeldungen(terminId, lehrveranstaltung_id);
}
});
if (reihung.length > 0) {
$.ajax({
dataType: 'json',
url: "./pruefungsanmeldung.json.php",
type: "POST",
data: {
method: "saveReihung",
reihung: reihung
},
error: loadError,
success: function(data){
if(data.error === 'false' && data.result === true)
{
messageBox("message", "<?php echo $p->t('pruefung/reihunghErfolgreichGeaendert'); ?>", "green", "highlight", 1000);
}
else
{
messageBox("message", data.errormsg, "red", "highlight", 1000);
}
showAnmeldungen(terminId, lehrveranstaltung_id);
}
});
}
}
/**
cis/private/lehre/pruefung/pruefungsanmeldung.json.php
+13 -16
View File
@@ -632,24 +632,11 @@ function saveAnmeldung($aktStudiensemester = null, $uid = null)
{
foreach ($prestudenten as $ps)
{
if($ps->studiengang_kz === $studiengang_kz)
if ($ps->getLaststatus($ps->prestudent_id, $stdsem))
{
if ($ps->getLaststatus($ps->prestudent_id, $stdsem))
if (($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
{
if (($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
{
$prestudent_id = $ps->prestudent_id;
}
else
{
if ($ps->getLaststatus($ps->prestudent_id, $stdsem_lv_besuch))
{
if (($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
{
$prestudent_id = $ps->prestudent_id;
}
}
}
$prestudent_id = $ps->prestudent_id;
}
else
{
@@ -662,6 +649,16 @@ function saveAnmeldung($aktStudiensemester = null, $uid = null)
}
}
}
else
{
if ($ps->getLaststatus($ps->prestudent_id, $stdsem_lv_besuch))
{
if (($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
{
$prestudent_id = $ps->prestudent_id;
}
}
}
}
}
else