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

Merge branch 'feature-75873/Noteneingabe-Punkte'

Browse Source
This commit is contained in:
Andreas Österreicher
2026-03-11 13:42:17 +01:00
parent 6287b6aef8 41271711ec
commit 2b527bccd2
1 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/lehre/notenliste.xls.php
+29 -16
View File
@@ -264,7 +264,7 @@ else
tbl_bisio.bisio_id, tbl_bisio.bis, tbl_bisio.von, tbl_bisio.bisio_id, tbl_bisio.bis, tbl_bisio.von,
tbl_zeugnisnote.note,tbl_mobilitaet.mobilitaetstyp_kurzbz, tbl_zeugnisnote.note,tbl_mobilitaet.mobilitaetstyp_kurzbz,
(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN '1' ELSE '' END) as doubledegree, (CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN '1' ELSE '' END) as doubledegree,
tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung, tbl_zeugnisnote.punkte
FROM FROM
campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid) campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid)
JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid) JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid)
@@ -306,7 +306,14 @@ else
&& $elem->von < $stsemdatumbis && (anzahlTage($elem->von, $elem->bis) >= 30)) && $elem->von < $stsemdatumbis && (anzahlTage($elem->von, $elem->bis) >= 30))
$inc.=' (o)'; $inc.=' (o)';
$note = $elem->note; if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
{
$note = $elem->punkte;
}
else
{
$note = $elem->note;
}
if($elem->lkt_ueberschreibbar == 'f') // angerechnet / intern angerechnet / nicht zugelassen if($elem->lkt_ueberschreibbar == 'f') // angerechnet / intern angerechnet / nicht zugelassen
{ {
@@ -339,20 +346,23 @@ else
{ {
$worksheet->write($lines,8, trim($elem->matrikelnr), $format_highlight); $worksheet->write($lines,8, trim($elem->matrikelnr), $format_highlight);
$pr = new Pruefung(); $pr = new Pruefung();
$pr->getPruefungen($elem->uid, "Termin2", $lvid, $sem); $pr->getPruefungen($elem->uid, "Termin2", $lvid, $stsem);
$output2 = $pr->result; $output2 = $pr->result;
if ($output2) if ($output2)
{ {
$resultPr = $output2[0]; $resultPr = $output2[0];
$worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date); $worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
$worksheet->write($lines,10, $resultPr->note, $format_highlightright); if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
$worksheet->write($lines,10, $resultPr->punkte, $format_highlightright);
else
$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
}
else
{
$worksheet->write($lines,9, '', $format_highlightright_date);
$worksheet->write($lines,10, '', $format_highlightright);
} }
else
{
$worksheet->write($lines,9, '', $format_highlightright_date);
$worksheet->write($lines,10, '', $format_highlightright);
}
} }
// Nachprüfung // Nachprüfung
@@ -360,20 +370,23 @@ else
{ {
$worksheet->write($lines,12, trim($elem->matrikelnr), $format_highlight); $worksheet->write($lines,12, trim($elem->matrikelnr), $format_highlight);
$pr = new Pruefung(); $pr = new Pruefung();
$pr->getPruefungen($elem->uid, "Termin3", $lvid, $sem); $pr->getPruefungen($elem->uid, "Termin3", $lvid, $stsem);
$output3 = $pr->result; $output3 = $pr->result;
if ($output3) if ($output3)
{ {
$resultPr = $output3[0]; $resultPr = $output3[0];
$worksheet->write($lines,13, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date); $worksheet->write($lines,13, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
$worksheet->write($lines,14, $resultPr->note, $format_highlightright); if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
$worksheet->write($lines,14, $resultPr->punkte, $format_highlightright);
else
$worksheet->write($lines,14, $resultPr->note, $format_highlightright);
}
else
{
$worksheet->write($lines,13, '', $format_highlightright_date);
$worksheet->write($lines,14, '', $format_highlightright);
} }
else
{
$worksheet->write($lines,13, '', $format_highlightright_date);
$worksheet->write($lines,14, '', $format_highlightright);
}
} }
$i++; $i++;