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

Merge branch 'bug-25904/studentenmeldung_xml_standort_code_Ambiguitaet'

Browse Source
This commit is contained in:
Andreas Österreicher
2022-11-21 15:53:58 +01:00
parent 7cd4eaf5a2 71c953bac7
commit 9f8d9f1df6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vilesci/bis/studentenmeldung.php
+7 -4
View File
@@ -271,7 +271,8 @@ if (CAMPUS_NAME == 'FH Technikum Wien' && $stg_kz==10006)
DISTINCT ON(student_uid, nachname, vorname) *, DISTINCT ON(student_uid, nachname, vorname) *,
public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat, public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat,
public.tbl_prestudent.foerderrelevant as pre_foerderrelevant, public.tbl_prestudent.foerderrelevant as pre_foerderrelevant,
public.tbl_studiengang.foerderrelevant as stg_foerderrelevant public.tbl_studiengang.foerderrelevant as stg_foerderrelevant,
COALESCE(tbl_prestudent.standort_code, tbl_studiengang.standort_code) AS bis_standort_code
FROM FROM
public.tbl_student public.tbl_student
JOIN public.tbl_benutzer ON(student_uid=uid) JOIN public.tbl_benutzer ON(student_uid=uid)
@@ -295,7 +296,8 @@ elseif ($stg_kz == 'alleBaMa')
DISTINCT ON(tbl_student.studiengang_kz, matrikelnr, nachname, vorname) *, DISTINCT ON(tbl_student.studiengang_kz, matrikelnr, nachname, vorname) *,
public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat, public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat,
public.tbl_prestudent.foerderrelevant as pre_foerderrelevant, public.tbl_prestudent.foerderrelevant as pre_foerderrelevant,
public.tbl_studiengang.foerderrelevant as stg_foerderrelevant public.tbl_studiengang.foerderrelevant as stg_foerderrelevant,
COALESCE(tbl_prestudent.standort_code, tbl_studiengang.standort_code) AS bis_standort_code
FROM FROM
public.tbl_student public.tbl_student
JOIN public.tbl_benutzer ON(student_uid=uid) JOIN public.tbl_benutzer ON(student_uid=uid)
@@ -327,7 +329,8 @@ else
DISTINCT ON(student_uid, nachname, vorname) *, DISTINCT ON(student_uid, nachname, vorname) *,
public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat, public.tbl_person.person_id AS pers_id, to_char(gebdatum, 'ddmmyy') AS vdat,
public.tbl_prestudent.foerderrelevant as pre_foerderrelevant, public.tbl_prestudent.foerderrelevant as pre_foerderrelevant,
public.tbl_studiengang.foerderrelevant as stg_foerderrelevant public.tbl_studiengang.foerderrelevant as stg_foerderrelevant,
COALESCE(tbl_prestudent.standort_code, tbl_studiengang.standort_code) AS bis_standort_code
FROM FROM
public.tbl_student public.tbl_student
JOIN public.tbl_benutzer ON(student_uid=uid) JOIN public.tbl_benutzer ON(student_uid=uid)
@@ -1637,7 +1640,7 @@ function GenerateXMLStudentBlock($row)
if(!$ausserordentlich) if(!$ausserordentlich)
{ {
$datei.=" $datei.="
<StandortCode>".$row->standort_code."</StandortCode>"; <StandortCode>".$row->bis_standort_code."</StandortCode>";
} }
/* /*
* BMWFFoerderrung derzeit fuer alle Studierende auf Ja gesetzt * BMWFFoerderrung derzeit fuer alle Studierende auf Ja gesetzt