blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 09:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Semester Filter to top component

Browse Source
This commit is contained in:
cgfhtw
2024-11-25 11:20:44 +01:00
parent 334fc870d0
commit 28e4454409
6 changed files with 86 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Grades.php
+2 -2
View File
@@ -113,11 +113,11 @@ class Grades extends FHCAPI_Controller
$this->terminateWithSuccess($grades);
}
public function getRepeaterGrades($prestudent_id)
public function getRepeaterGrades($prestudent_id, $all = null)
{
$this->load->library('AntragLib');
$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
$studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : false;
$result = $this->antraglib->getLvsForPrestudent($prestudent_id, $studiensemester_kurzbz);
application/models/education/Studierendenantraglehrveranstaltung_model.php
+41 -27
View File
@@ -66,39 +66,53 @@ class Studierendenantraglehrveranstaltung_model extends DB_Model
);
$this->addJoin('public.tbl_student s', 'prestudent_id');
// NOTE(chris): last offizell note
$this->addJoin('(
SELECT z.*
FROM lehre.tbl_zeugnisnote z
LEFT JOIN public.tbl_studiensemester zs
USING(studiensemester_kurzbz)
JOIN (
SELECT zi.lehrveranstaltung_id, zi.student_uid, MAX(zis.start) AS start
FROM lehre.tbl_zeugnisnote zi
LEFT JOIN lehre.tbl_note zin
USING(note)
LEFT JOIN public.tbl_studiensemester zis
USING(studiensemester_kurzbz)
WHERE zin.aktiv AND zin.offiziell
GROUP BY zi.lehrveranstaltung_id, zi.student_uid
) zx
ON (
z.lehrveranstaltung_id=zx.lehrveranstaltung_id
AND z.student_uid=zx.student_uid
AND zs.start = zx.start
)) z', 'z.lehrveranstaltung_id=lv.lehrveranstaltung_id AND z.student_uid=s.student_uid', 'LEFT');
$this->addJoin('lehre.tbl_note zn', 'z.note = zn.note', 'LEFT');
$this->load->config('studierendenantrag');
$note_intern_angerechntet = $this->config->item('wiederholung_note_angerechnet');
return $this->loadWhere([
$where = [
'ps.prestudent_id' => $prestudent_id,
'a.typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
'stat.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
'n.note <> ' => 0,
$this->dbTable . '.studiensemester_kurzbz' => $studiensemester_kurzbz,
'(n.note<>' . $this->db->escape($note_intern_angerechntet) . ' OR (z.note IS NOT NULL AND zn.positiv))' => null
]);
// NOTE(chris): grade "intern angerechnet" needs an official grade beforehand (the subquery gets the last positive offical grade)
"(n.note<>" . $this->db->escape($note_intern_angerechntet) . " OR EXISTS (
SELECT
1
FROM
lehre.tbl_zeugnisnote z
LEFT JOIN public.tbl_studiensemester zs USING(studiensemester_kurzbz)
JOIN (
SELECT
zi.lehrveranstaltung_id,
zi.student_uid,
MAX(zis.start) AS start
FROM
lehre.tbl_zeugnisnote zi
LEFT JOIN lehre.tbl_note zin USING(note)
LEFT JOIN public.tbl_studiensemester zis USING(studiensemester_kurzbz)
WHERE
zin.aktiv
AND zin.offiziell
GROUP BY
zi.lehrveranstaltung_id,
zi.student_uid
) zx ON (
z.lehrveranstaltung_id = zx.lehrveranstaltung_id
AND z.student_uid = zx.student_uid
AND zs.start = zx.start
)
JOIN lehre.tbl_note zn USING (note)
WHERE
z.lehrveranstaltung_id = lv.lehrveranstaltung_id
AND z.student_uid = s.student_uid
AND zn.positiv
))" => null
];
if ($studiensemester_kurzbz !== false)
$where[$this->dbTable . '.studiensemester_kurzbz'] = $studiensemester_kurzbz;
return $this->loadWhere($where);
}
}