mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-25 16:44:28 +00:00
fixed uebersicht nicht abgeschickt
This commit is contained in:
@@ -184,6 +184,32 @@
|
|||||||
)
|
)
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
) AS "StgNichtAbgeschickt",
|
) AS "StgNichtAbgeschickt",
|
||||||
|
(
|
||||||
|
SELECT COUNT(*)
|
||||||
|
FROM public.tbl_prestudentstatus pss
|
||||||
|
JOIN public.tbl_prestudent ps USING(prestudent_id)
|
||||||
|
JOIN public.tbl_studiengang sg USING(studiengang_kz)
|
||||||
|
JOIN lehre.tbl_studienplan sp USING(studienplan_id)
|
||||||
|
WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
|
||||||
|
AND pss.bewerbung_abgeschicktamum IS NULL
|
||||||
|
AND pss.bestaetigtam IS NULL
|
||||||
|
AND ps.person_id = p.person_id
|
||||||
|
AND (sg.typ IN ('.$STUDIENGANG_TYP.')
|
||||||
|
OR
|
||||||
|
sg.studiengang_kz in('.$ADDITIONAL_STG.')
|
||||||
|
)
|
||||||
|
AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
|
||||||
|
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1
|
||||||
|
FROM tbl_prestudentstatus spss
|
||||||
|
WHERE spss.prestudent_id = pss.prestudent_id
|
||||||
|
AND spss.status_kurzbz = '.$REJECTED_STATUS.'
|
||||||
|
AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >
|
||||||
|
(SELECT start FROM public.tbl_studiensemester sss WHERE studiensemester_kurzbz = '.$STUDIENSEMESTER.'))
|
||||||
|
)
|
||||||
|
LIMIT 1
|
||||||
|
) AS "AnzahlStgNichtAbgeschickt",
|
||||||
(
|
(
|
||||||
SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz) || \':\' || sp.orgform_kurzbz), \', \')
|
SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz) || \':\' || sp.orgform_kurzbz), \', \')
|
||||||
FROM public.tbl_prestudentstatus pss
|
FROM public.tbl_prestudentstatus pss
|
||||||
@@ -322,6 +348,7 @@
|
|||||||
ucfirst($this->p->t('global', 'abgeschickt')).' ('.$this->p->t('global', 'anzahl').')',
|
ucfirst($this->p->t('global', 'abgeschickt')).' ('.$this->p->t('global', 'anzahl').')',
|
||||||
ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'gesendet').')',
|
ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'gesendet').')',
|
||||||
ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'nichtGesendet').')',
|
ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'nichtGesendet').')',
|
||||||
|
ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'anzahlNichtGesendet').')',
|
||||||
ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'aktiv').')',
|
ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'aktiv').')',
|
||||||
'ZGV Nation BA',
|
'ZGV Nation BA',
|
||||||
'ZGV Nation MA',
|
'ZGV Nation MA',
|
||||||
|
|||||||
@@ -122,10 +122,10 @@ $filters = array(
|
|||||||
],
|
],
|
||||||
"filters": [
|
"filters": [
|
||||||
{
|
{
|
||||||
"name": "SendDate",
|
"name": "AnzahlStgNichtAbgeschickt",
|
||||||
"option": "",
|
"option": "",
|
||||||
"condition": "",
|
"condition": "0",
|
||||||
"operation": "nset"
|
"operation": "gt"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -568,6 +568,26 @@ $phrases = array(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
|
array(
|
||||||
|
'app' => 'core',
|
||||||
|
'category' => 'global',
|
||||||
|
'phrase' => 'anzahlNichtGesendet',
|
||||||
|
'insertvon' => 'system',
|
||||||
|
'phrases' => array(
|
||||||
|
array(
|
||||||
|
'sprache' => 'German',
|
||||||
|
'text' => 'Anzahl (nicht gesendet)',
|
||||||
|
'description' => '',
|
||||||
|
'insertvon' => 'system'
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'sprache' => 'English',
|
||||||
|
'text' => 'amount (not sent)',
|
||||||
|
'description' => '',
|
||||||
|
'insertvon' => 'system'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
),
|
||||||
array(
|
array(
|
||||||
'app' => 'core',
|
'app' => 'core',
|
||||||
'category' => 'global',
|
'category' => 'global',
|
||||||
|
|||||||
Reference in New Issue
Block a user