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

- Prestudent_model.php: added getStandortCode and getFoerderrelevant methods

Browse Source 
- indent formatting
This commit is contained in:
KarpAlex
2021-06-25 13:19:02 +02:00
parent 9a24d2d7c7
commit 1ce0045f86
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/crm/Prestudent_model.php
+30 -1
View File
@@ -290,7 +290,6 @@ class Prestudent_model extends DB_Model
$prestudentdata->prestudentstatus = $lastStatusData;
if ($this->hasUDF())
{
$prestudentdata->prestudentUdfs = $this->getUDFs($prestudent_id);
@@ -581,4 +580,34 @@ class Prestudent_model extends DB_Model
return $this->execQuery($query, array($person_id));
}
/**
* Gets förderrelevant flag for a prestudent, from prestudent, or, if not set on prestudent level, from studiengang
* @param int $prestudent_id
* @return object
*/
public function getFoerderrelevant($prestudent_id)
{
$query = 'SELECT COALESCE (ps.foerderrelevant, stg.foerderrelevant) AS foerderrelevant
FROM public.tbl_prestudent ps
LEFT JOIN public.tbl_studiengang stg USING (studiengang_kz)
WHERE prestudent_id = ?';
return $this->execQuery($query, array($prestudent_id));
}
/**
* Gets bis standort_code for a prestudent, from prestudent, or, if not set on prestudent level, from studiengang
* @param int $prestudent_id
* @return object
*/
public function getStandortCode($prestudent_id)
{
$query = 'SELECT COALESCE (ps.standort_code, stg.standort_code) AS standort_code
FROM public.tbl_prestudent ps
LEFT JOIN public.tbl_studiengang stg USING (studiengang_kz)
WHERE prestudent_id = ?';
return $this->execQuery($query, array($prestudent_id));
}
}
system/dbupdate_3.3.php
+1 -1
View File
@@ -4920,7 +4920,7 @@ if (!$result = @$db->db_query("SELECT foerderrelevant, standort_code FROM public
JOIN public.tbl_person USING (person_id)
LEFT JOIN public.tbl_student USING (prestudent_id)
LEFT JOIN bis.tbl_gsstudientyp USING (gsstudientyp_kurzbz)
WHERE prestudent_id = ps.prestudent_id
WHERE prestudent_id = ps.prestudent_id
AND (SUBSTRING(matrikelnr, 4, 1) = '9' -- ausserordentlich
OR studientyp_code = 'E')); -- extern
COMMENT ON COLUMN public.tbl_prestudent.foerderrelevant IS 'Zeigt an, ob Studierende bei Meldung für Förderungen relevant sind. Überschreibt förderrelevant auf Studienganglevel.';