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

Abmeldung durch Stgl: status => typ

Browse Source
This commit is contained in:
cgfhtw
2023-07-10 10:19:06 +02:00
parent 5eca034911
commit 3fce448451
12 changed files with 204 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/education/Studierendenantrag_model.php
+1
View File
@@ -3,6 +3,7 @@ class Studierendenantrag_model extends DB_Model
{
const TYP_ABMELDUNG = 'Abmeldung';
const TYP_ABMELDUNG_STGL = 'AbmeldungStgl';
const TYP_UNTERBRECHUNG = 'Unterbrechung';
const TYP_WIEDERHOLUNG = 'Wiederholung';
application/models/organisation/Studiengang_model.php
+1 -1
View File
@@ -567,7 +567,7 @@ class Studiengang_model extends DB_Model
if ($not_antrag_typ !== null && is_array($not_antrag_typ)) {
foreach($not_antrag_typ as $k => $v)
$not_antrag_typ[$k] = $this->db->escape($v);
$this->addJoin('campus.tbl_studierendenantrag a', 'a.prestudent_id=p.prestudent_id and a.typ in ('. implode(',', $not_antrag_typ ).')', 'LEFT');
$this->addJoin('campus.tbl_studierendenantrag a', 'a.prestudent_id=p.prestudent_id and a.typ in ('. implode(',', $not_antrag_typ ).") AND campus.get_status_studierendenantrag (a.studierendenantrag_id)<>'" . Studierendenantragstatus_model::STATUS_CANCELLED . "'", 'LEFT');
$this->db->where('a.typ IS NULL');
}