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

Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer

Browse Source
This commit is contained in:
KarpAlex
2021-09-21 00:59:26 +02:00
parent 4c21d5364c d336c8ce10
commit 45e4d5576c
40 changed files with 855 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/prestudent.class.php
+9 -7
View File
@@ -2432,13 +2432,15 @@ class prestudent extends person
return false;
}
$qry = "SELECT kurzbzlang
FROM public.tbl_prestudent
JOIN public.tbl_prestudentstatus USING (prestudent_id)
JOIN public.tbl_studiengang USING (studiengang_kz)
$qry = "SELECT
UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) as kuerzel
FROM
public.tbl_prestudent
JOIN public.tbl_prestudentstatus USING (prestudent_id)
JOIN public.tbl_studiengang USING (studiengang_kz)
WHERE person_id = ".$this->db_add_param($person_id, FHC_INTEGER)."
AND status_kurzbz in ('Absolvent','Diplomand','Unterbrecher','Student')
AND typ in ('b','m','d')
AND status_kurzbz in ('Absolvent','Diplomand','Unterbrecher','Student')
AND typ in ('b','m','d')
ORDER BY status_kurzbz ASC
LIMIT 1;";
@@ -2446,7 +2448,7 @@ class prestudent extends person
{
if ($row = $this->db_fetch_object())
{
$stg = $row->kurzbzlang;
$stg = $row->kuerzel;
return $stg;
}
else