diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php index de2bd1bca..656736d08 100644 --- a/application/views/system/infocenter/infocenterData.php +++ b/application/views/system/infocenter/infocenterData.php @@ -14,6 +14,7 @@ $ADDITIONAL_STG = $this->config->item('infocenter_studiengang_kz'); $AKTE_TYP = '\'identity\', \'zgv_bakk\''; $STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\''; + $STUDIENGEBUEHR_ANZAHLUNG = '\'StudiengebuehrAnzahlung\''; $ORG_NAME = '\'InfoCenter\''; $ONLINE = '\'online\''; @@ -291,7 +292,15 @@ LIMIT 1 ) LIMIT 1 - ) AS "InfoCenterMitarbeiter" + ) AS "InfoCenterMitarbeiter", + ( + SELECT SUM(konto.betrag) + FROM public.tbl_konto konto + LEFT JOIN tbl_konto skonto ON (skonto.buchungsnr_verweis = konto.buchungsnr) + WHERE konto.person_id = p.person_id + AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .' + AND konto.buchungstyp_kurzbz = '. $STUDIENGEBUEHR_ANZAHLUNG .' + ) AS "Kaution" FROM public.tbl_person p LEFT JOIN ( SELECT tpl.person_id, @@ -383,7 +392,8 @@ 'ZGV Nation MA', 'ZGV Gruppe BA', 'ZGV Gruppe MA', - 'InfoCenter Mitarbeiter' + 'InfoCenter Mitarbeiter', + ucfirst($this->p->t('infocenter', 'kaution')) ), 'formatRow' => function($datasetRaw) { @@ -493,6 +503,19 @@ $datasetRaw->{'InfoCenterMitarbeiter'} = 'Ja'; } + if ($datasetRaw->{'Kaution'} === null) + { + $datasetRaw->{'Kaution'} = '-'; + } + else if ($datasetRaw->{'Kaution'} === '0.00') + { + $datasetRaw->{'Kaution'} = 'Bezahlt'; + } + else + { + $datasetRaw->{'Kaution'} = 'Offen'; + } + return $datasetRaw; }, 'markRow' => function($datasetRaw) { diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 561559363..df598dc8f 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -4114,6 +4114,26 @@ When on hold, the date is only a reminder.', ) ) ), + array( + 'app' => 'infocenter', + 'category' => 'infocenter', + 'phrase' => 'kaution', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Kaution', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Deposit', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'password',