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

Usability: Added column 'ZGV' to STGL and lectors Overview site

Browse Source 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
This commit is contained in:
Cris
2021-03-30 18:24:46 +02:00
committed by cris-technikum
parent d53d91d7d1
commit 132b5097ee
5 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+2 -1
View File
@@ -13,7 +13,8 @@ $this->load->view(
'tablewidget' => true,
'phrases' => array(
'global' => array(
'begruendung'
'begruendung',
'zgv'
),
'anrechnung' => array(
'nachweisdokumente',
application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php
+11
View File
@@ -25,6 +25,15 @@ $query = '
begruendung.bezeichnung AS "begruendung",
dmsversion.name AS "dokument_bezeichnung",
anrechnung.anmerkung_student,
(SELECT COALESCE(
array_to_json(zgvmaster.bezeichnung::varchar[])->>' . $LANGUAGE_INDEX . ',
array_to_json(zgv.bezeichnung::varchar[])->>' . $LANGUAGE_INDEX . '
) AS zgv
FROM public.tbl_prestudent
LEFT JOIN bis.tbl_zgv zgv USING (zgv_code)
LEFT JOIN bis.tbl_zgvmaster zgvmaster USING (zgvmas_code)
WHERE prestudent_id = anrechnung.prestudent_id
) AS zgv,
anrechnung.insertamum::date AS "antragsdatum",
empfehlung_anrechnung,
(SELECT status_kurzbz
@@ -73,6 +82,7 @@ $filterWidgetArray = array(
ucfirst($this->p->t('global', 'begruendung')),
ucfirst($this->p->t('anrechnung', 'nachweisdokumente')),
ucfirst($this->p->t('anrechnung', 'herkunft')),
ucfirst($this->p->t('global', 'zgv')),
ucfirst($this->p->t('anrechnung', 'antragdatum')),
ucfirst($this->p->t('anrechnung', 'empfehlung')),
'status_kurzbz',
@@ -123,6 +133,7 @@ $filterWidgetArray = array(
ects: {headerFilter:"input", align:"center"},
student: {headerFilter:"input"},
begruendung: {headerFilter:"input"},
zgv: {visible: false, headerFilter:"input"},
dokument_bezeichnung: {headerFilter:"input", formatter:"link", formatterParams:{
labelField:"dokument_bezeichnung",
url:function(cell){return "'. current_url() .'/download?dms_id=" + cell.getData().dms_id},
application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
+2 -1
View File
@@ -13,7 +13,8 @@ $this->load->view(
'tablewidget' => true,
'phrases' => array(
'global' => array(
'begruendung'
'begruendung',
'zgv'
),
'anrechnung' => array(
'nachweisdokumente',
application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php
+11
View File
@@ -20,6 +20,15 @@ $query = '
begruendung.bezeichnung AS "begruendung",
dmsversion.name AS "dokument_bezeichnung",
anrechnung.anmerkung_student,
(SELECT COALESCE(
array_to_json(zgvmaster.bezeichnung::varchar[])->>' . $LANGUAGE_INDEX . ',
array_to_json(zgv.bezeichnung::varchar[])->>' . $LANGUAGE_INDEX . '
) AS zgv
FROM public.tbl_prestudent
LEFT JOIN bis.tbl_zgv zgv USING (zgv_code)
LEFT JOIN bis.tbl_zgvmaster zgvmaster USING (zgvmas_code)
WHERE prestudent_id = anrechnung.prestudent_id
) AS zgv,
anrechnung.insertamum::date AS "antragsdatum",
empfehlung_anrechnung,
(SELECT status_kurzbz
@@ -76,6 +85,7 @@ $filterWidgetArray = array(
ucfirst($this->p->t('global', 'begruendung')),
ucfirst($this->p->t('anrechnung', 'nachweisdokumente')),
ucfirst($this->p->t('anrechnung', 'herkunft')),
ucfirst($this->p->t('global', 'zgv')),
ucfirst($this->p->t('anrechnung', 'antragdatum')),
ucfirst($this->p->t('anrechnung', 'empfehlung')),
'status_kurzbz',
@@ -123,6 +133,7 @@ $filterWidgetArray = array(
ects: {headerFilter:"input", align:"center"},
student: {headerFilter:"input"},
begruendung: {headerFilter:"input"},
zgv: {visible: false, headerFilter:"input"},
dokument_bezeichnung: {headerFilter:"input", formatter:"link", formatterParams:{
labelField:"dokument_bezeichnung",
url:function(cell){return "'. current_url() .'/download?dms_id=" + cell.getData().dms_id},
system/phrasesupdate.php
+20
View File
@@ -9569,6 +9569,26 @@ Any unusual occurrences
)
)
),
array(
'app' => 'core',
'category' => 'global',
'phrase' => 'zgv',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'ZGV',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'ZGV',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'anrechnung',