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-25999/C4

Browse Source
This commit is contained in:
Harald Bamberger
2024-10-17 14:49:43 +02:00
parent e475fe568e 24ce443e95
commit 0ab1ec1fc8
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/education/Pruefung_model.php
+2
View File
@@ -204,6 +204,8 @@ class Pruefung_model extends DB_Model
$this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status'); $this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
$this->addSelect('pss.ausbildungssemester'); $this->addSelect('pss.ausbildungssemester');
$this->addJoin('(SELECT MAX(datum) AS datum, lehreinheit_id AS le_id, student_uid AS stud_uid FROM lehre.tbl_pruefung p WHERE pruefungstyp_kurzbz IN (\'kommPruef\', \'zusKommPruef\') GROUP BY lehreinheit_id, student_uid) lpd',
'p.datum = lpd.datum AND p.lehreinheit_id = lpd.le_id AND p.student_uid = lpd.stud_uid');
$this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id'); $this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id'); $this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
$this->addJoin('public.tbl_student s', 'student_uid'); $this->addJoin('public.tbl_student s', 'student_uid');
application/models/education/Studierendenantrag_model.php
+1 -1
View File
@@ -355,7 +355,7 @@ class Studierendenantrag_model extends DB_Model
$this->db->where([ $this->db->where([
'prestudent_id' => $prestudent_id, 'prestudent_id' => $prestudent_id,
'typ' => Studierendenantrag_model::TYP_UNTERBRECHUNG, 'typ' => Studierendenantrag_model::TYP_UNTERBRECHUNG,
'campus.get_status_studierendenantrag(studierendenantrag_id) !=' => Studierendenantragstatus_model::STATUS_CANCELLED, 'campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN (\'' . Studierendenantragstatus_model::STATUS_CANCELLED . '\', \'' . Studierendenantragstatus_model::STATUS_REJECTED . '\')' => null,
'start < ' . $end => null, 'start < ' . $end => null,
'datum_wiedereinstieg > ' . $start => null, 'datum_wiedereinstieg > ' . $start => null,
]); ]);