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

Load Language before Anträge

Browse Source
This commit is contained in:
cgfhtw
2023-12-20 09:30:44 +01:00
parent ba7f60b16e
commit ca55b63e01
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/education/Studierendenantrag_model.php
+7 -3
View File
@@ -26,9 +26,10 @@ class Studierendenantrag_model extends DB_Model
return $this->loadForStudiengaenge($studiengaenge, $typ, $this->StudierendenantragstatusModel::STATUS_CREATED);
}
public function loadForStudiengaenge($studiengaenge, $typ = null, $status = null)
public function loadForStudiengaenge($studiengaenge, $typ = null, $status = null, $sql = null)
{
$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
if ($sql == null)
$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
$this->addSelect('UPPER(stg.typ) || UPPER(stg.kurzbz) || \' \' || stg.bezeichnung AS bezeichnung');
$this->addSelect('bezeichnung_mehrsprachig[(' . $sql . ')] AS orgform', false);
@@ -74,6 +75,9 @@ class Studierendenantrag_model extends DB_Model
}
public function loadActiveForStudiengaenge($studiengaenge) {
// NOTE(chris): get language before changing things in the global db object because getUserLanguage() might use it and it should not have been tampered with
$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
$this->db->group_start();
$this->db->where_not_in('s.studierendenantrag_statustyp_kurzbz', [
Studierendenantragstatus_model::STATUS_CANCELLED,
@@ -87,7 +91,7 @@ class Studierendenantrag_model extends DB_Model
$this->db->group_end();
$this->db->group_end();
return $this->loadForStudiengaenge($studiengaenge);
return $this->loadForStudiengaenge($studiengaenge, null, null, $sql);
}
public function isInStudiengang($studierendenantrag_id, $studiengaenge)