diff --git a/application/config/stv.php b/application/config/stv.php index b0db82b34..4ca40f62b 100644 --- a/application/config/stv.php +++ b/application/config/stv.php @@ -147,7 +147,7 @@ $config['stv_prestudent_tags'] = [ 'prewh_auto' => ['readonly' => true], 'out_auto' => ['readonly' => false], 'zgv_auto' => ['readonly' => true], - 'unterbrecher_auto' => ['readonly' => true], + 'unterbrecher_auto' => ['readonly' => false], 'stbtr_erh_auto' => ['readonly' => true], 'jgv_auto' => ['readonly' => false], ]; diff --git a/application/core/Tag_Controller.php b/application/core/Tag_Controller.php index b3726ceed..ecfb6f5de 100644 --- a/application/core/Tag_Controller.php +++ b/application/core/Tag_Controller.php @@ -43,7 +43,6 @@ class Tag_Controller extends FHCAPI_Controller public function getTag($readonly_tags = null) { - $language = $this->_getLanguageIndex(); $id = $this->input->get('id'); if (is_array($readonly_tags) && !isEmptyArray($readonly_tags)) @@ -68,7 +67,7 @@ class Tag_Controller extends FHCAPI_Controller $this->NotizModel->addSelect( "tbl_notiz.titel, tbl_notiz.text, - array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $language. " as bezeichnung, + array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung, tbl_notiz.notiz_id, tbl_notiz_typ.style, tbl_notiz_typ.automatisiert, @@ -97,14 +96,16 @@ class Tag_Controller extends FHCAPI_Controller public function getTags($tags = null) { + $language = $this->_getLanguageIndex(); + $this->NotiztypModel->addSelect( - 'typ_kurzbz as tag_typ_kurzbz, - array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung, + "typ_kurzbz as tag_typ_kurzbz, + array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $language. " as bezeichnung, style, beschreibung, tag, automatisiert - ' + " ); $this->NotiztypModel->addOrder('prioritaet'); @@ -283,7 +284,6 @@ class Tag_Controller extends FHCAPI_Controller } public function getAllTags($readonly_tags = false){ - $language = $this->_getLanguageIndex(); $prestudent_id = $this->input->get('prestudent_id'); //TODO check for readonly: necessary? @@ -305,11 +305,10 @@ class Tag_Controller extends FHCAPI_Controller END as readonly "); } - $this->NotizModel->addSelect( "tbl_notiz.titel, tbl_notiz.text, - array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $language. " as bezeichnung, + array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung, tbl_notiz.notiz_id, tbl_notiz_typ.style, tbl_notiz_typ.automatisiert, diff --git a/public/js/components/Tag/tagFormatter.js b/public/js/components/Tag/tagFormatter.js index 76471ec42..e438c4c55 100644 --- a/public/js/components/Tag/tagFormatter.js +++ b/public/js/components/Tag/tagFormatter.js @@ -3,6 +3,7 @@ export function idTagFormatter (id, tagData, tagComponent, typeId) { if (!id) return; + console.log(tagData); const parsedTags = tagData.map(tag => ({ id: tag.notiz_id, diff --git a/public/js/tabulator/formatter/tags.js b/public/js/tabulator/formatter/tags.js index 0af1953fd..b9578dbd4 100644 --- a/public/js/tabulator/formatter/tags.js +++ b/public/js/tabulator/formatter/tags.js @@ -46,8 +46,7 @@ export function tagFormatter(cell, tagComponent) const tagDef = mappedData.find(t => t.typ_kurzbz === tag.typ_kurzbz); - //todo: check trigger manually after creation of manual automatic tag - if (!tagDef && tag.typ_kurzbz.includes("_auto") || tagDef?.automatisiert) { + if (!tagDef && tag.typ_kurzbz?.includes("_auto") || tagDef?.automatisiert) { tagElement.className += " tag_auto"; tagElement.innerHTML = " " + tag.beschreibung; }