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

Merge branch 'feature-61109/infocenter_anzahlung_auf_kaution_aendern'

Browse Source
This commit is contained in:
Andreas Österreicher
2025-03-24 16:45:49 +01:00
parent a6ee6a8c0f 7126ab4561
commit 4c38d88840
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/system/infocenter/infocenterAbgewiesenData.php
+2 -2
View File
@@ -8,7 +8,7 @@
$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\''; $STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';
$LOGDATA_NAME = '\'Message sent\''; $LOGDATA_NAME = '\'Message sent\'';
$LOGDATA_VON = '\'online\''; $LOGDATA_VON = '\'online\'';
$STUDIENGEBUEHR_ANZAHLUNG = '\'StudiengebuehrAnzahlung\''; $KAUTION_DRITT_STAAT = '\'KautionDrittStaat\'';
$query = ' $query = '
SELECT SELECT
@@ -62,7 +62,7 @@ $query = '
FROM public.tbl_konto konto FROM public.tbl_konto konto
WHERE konto.person_id = p.person_id WHERE konto.person_id = p.person_id
AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .' AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
AND konto.buchungstyp_kurzbz = '. $STUDIENGEBUEHR_ANZAHLUNG .' AND konto.buchungstyp_kurzbz = '. $KAUTION_DRITT_STAAT .'
) AS "Kaution" ) AS "Kaution"
FROM FROM
public.tbl_prestudentstatus pss public.tbl_prestudentstatus pss
application/views/system/infocenter/infocenterData.php
+2 -2
View File
@@ -13,7 +13,7 @@
$ADDITIONAL_STG = $this->config->item('infocenter_studiengang_kz'); $ADDITIONAL_STG = $this->config->item('infocenter_studiengang_kz');
$AKTE_TYP = '\'identity\', \'zgv_bakk\''; $AKTE_TYP = '\'identity\', \'zgv_bakk\'';
$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\''; $STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';
$STUDIENGEBUEHR_ANZAHLUNG = '\'StudiengebuehrAnzahlung\''; $KAUTION_DRITT_STAAT = '\'KautionDrittStaat\'';
$ORG_NAME = '\'InfoCenter\''; $ORG_NAME = '\'InfoCenter\'';
$ONLINE = '\'online\''; $ONLINE = '\'online\'';
@@ -302,7 +302,7 @@
FROM public.tbl_konto konto FROM public.tbl_konto konto
WHERE konto.person_id = p.person_id WHERE konto.person_id = p.person_id
AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .' AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
AND konto.buchungstyp_kurzbz = '. $STUDIENGEBUEHR_ANZAHLUNG .' AND konto.buchungstyp_kurzbz = '. $KAUTION_DRITT_STAAT .'
) AS "Kaution" ) AS "Kaution"
FROM public.tbl_person p FROM public.tbl_person p
LEFT JOIN ( LEFT JOIN (
application/views/system/infocenter/infocenterFreigegebenData.php
+3 -2
View File
@@ -13,7 +13,8 @@
$ORG_NAME = '\'InfoCenter\''; $ORG_NAME = '\'InfoCenter\'';
$IDENTITY = '\'identity\''; $IDENTITY = '\'identity\'';
$ONLINE = '\'online\''; $ONLINE = '\'online\'';
$STUDIENGEBUEHR_ANZAHLUNG = '\'StudiengebuehrAnzahlung\''; $KAUTION_DRITT_STAAT = '\'KautionDrittStaat\'';
$query = ' $query = '
SELECT SELECT
@@ -275,7 +276,7 @@ $query = '
FROM public.tbl_konto konto FROM public.tbl_konto konto
WHERE konto.person_id = p.person_id WHERE konto.person_id = p.person_id
AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .' AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
AND konto.buchungstyp_kurzbz = '. $STUDIENGEBUEHR_ANZAHLUNG .' AND konto.buchungstyp_kurzbz = '. $KAUTION_DRITT_STAAT .'
) AS "Kaution" ) AS "Kaution"
FROM public.tbl_person p FROM public.tbl_person p
LEFT JOIN ( LEFT JOIN (
application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
+3 -2
View File
@@ -9,7 +9,8 @@
$ADDITIONAL_STG = $this->config->item('infocenter_studiengang_kz'); $ADDITIONAL_STG = $this->config->item('infocenter_studiengang_kz');
$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\''; $STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';
$ORG_NAME = '\'InfoCenter\''; $ORG_NAME = '\'InfoCenter\'';
$STUDIENGEBUEHR_ANZAHLUNG = '\'StudiengebuehrAnzahlung\''; $KAUTION_DRITT_STAAT = '\'KautionDrittStaat\'';
$query = ' $query = '
SELECT SELECT
@@ -206,7 +207,7 @@ $query = '
FROM public.tbl_konto konto FROM public.tbl_konto konto
WHERE konto.person_id = p.person_id WHERE konto.person_id = p.person_id
AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .' AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
AND konto.buchungstyp_kurzbz = '. $STUDIENGEBUEHR_ANZAHLUNG .' AND konto.buchungstyp_kurzbz = '. $KAUTION_DRITT_STAAT .'
) AS "Kaution" ) AS "Kaution"
FROM public.tbl_person p FROM public.tbl_person p
LEFT JOIN ( LEFT JOIN (