From d391d1f09c35fcc9f940008dc1720942296336a5 Mon Sep 17 00:00:00 2001 From: chfhtw Date: Thu, 16 Jul 2026 11:43:51 +0200 Subject: [PATCH] Move computed to the correct position to avoid merge conflicts --- .../components/LVVerwaltung/LVVerwaltung.js | 135 +++++++++--------- 1 file changed, 67 insertions(+), 68 deletions(-) diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js index 4fa7064a3..a71c2b7b7 100644 --- a/public/js/components/LVVerwaltung/LVVerwaltung.js +++ b/public/js/components/LVVerwaltung/LVVerwaltung.js @@ -112,6 +112,73 @@ export default { }, } }, + computed: { + appMenuExtraItems() + { + let extraItems = []; + + const studiengang_kz = this.stg || ''; + const studiensemester = this.selectedStudiensemester; + const semester = this.semester || ''; + const uid = this.emp || ''; + + + extraItems.push( + { + description: 'lehre/berichte', + requires: ['stg'], + children: [ + { + link: FHC_JS_DATA_STORAGE_OBJECT.app_root + + 'content/statistik/lvplanung.xls.php' + + '?studiengang_kz=' + studiengang_kz + + '&studiensemester_kurzbz=' + studiensemester + + '&semester=' + semester, + description: 'lehre/lvplanung', + requires: ['stg'] + }, + { + link: FHC_JS_DATA_STORAGE_OBJECT.app_root + + 'content/statistik/lehrauftragsliste_gst.xls.php' + + '?studiengang_kz=' + studiengang_kz + + '&studiensemester_kurzbz=' + studiensemester + + '&semester=' + semester, + description: 'lehre/lehrauftragsliste', + requires: ['stg'] + }, + { + link: FHC_JS_DATA_STORAGE_OBJECT.app_root + + 'content/pdfExport.php?xml=lehrauftrag.xml.php' + + '&xsl=Lehrauftrag' + + '&stg_kz=' + studiengang_kz + + '&ss=' + studiensemester, + description: 'lehre/lehrauftraege', + requires: ['stg'] + }, + { + link: FHC_JS_DATA_STORAGE_OBJECT.app_root + + 'content/pdfExport.php?xml=lehrauftrag.xml.php' + + '&xsl=Lehrauftrag' + + '&stg_kz=' + studiengang_kz + + '&ss=' + studiensemester + + '&uid=' + uid, + description: 'lehre/lehrauftragslisteemp', + requires: ['emp'] + } + ] + }, + { + link: FHC_JS_DATA_STORAGE_OBJECT.app_root + + 'vilesci/lehre/lehrveranstaltung.php' + + '?stg_kz=' + studiengang_kz, + description: 'lehre/extrakvverwaltung', + requires: ['stg'] + } + ); + + return extraItems; + } + }, methods: { updateFilter() { @@ -259,74 +326,6 @@ export default { }) .catch(this.$fhcAlert.handleSystemError); }, - computed: - { - appMenuExtraItems() - { - let extraItems = []; - - const studiengang_kz = this.stg || ''; - const studiensemester = this.selectedStudiensemester; - const semester = this.semester || ''; - const uid = this.emp || ''; - - - extraItems.push( - { - description: 'lehre/berichte', - requires: ['stg'], - children: [ - { - link: FHC_JS_DATA_STORAGE_OBJECT.app_root - + 'content/statistik/lvplanung.xls.php' - + '?studiengang_kz=' + studiengang_kz - + '&studiensemester_kurzbz=' + studiensemester - + '&semester=' + semester, - description: 'lehre/lvplanung', - requires: ['stg'] - }, - { - link: FHC_JS_DATA_STORAGE_OBJECT.app_root - + 'content/statistik/lehrauftragsliste_gst.xls.php' - + '?studiengang_kz=' + studiengang_kz - + '&studiensemester_kurzbz=' + studiensemester - + '&semester=' + semester, - description: 'lehre/lehrauftragsliste', - requires: ['stg'] - }, - { - link: FHC_JS_DATA_STORAGE_OBJECT.app_root - + 'content/pdfExport.php?xml=lehrauftrag.xml.php' - + '&xsl=Lehrauftrag' - + '&stg_kz=' + studiengang_kz - + '&ss=' + studiensemester, - description: 'lehre/lehrauftraege', - requires: ['stg'] - }, - { - link: FHC_JS_DATA_STORAGE_OBJECT.app_root - + 'content/pdfExport.php?xml=lehrauftrag.xml.php' - + '&xsl=Lehrauftrag' - + '&stg_kz=' + studiengang_kz - + '&ss=' + studiensemester - + '&uid=' + uid, - description: 'lehre/lehrauftragslisteemp', - requires: ['emp'] - } - ] - }, - { - link: FHC_JS_DATA_STORAGE_OBJECT.app_root - + 'vilesci/lehre/lehrveranstaltung.php' - + '?stg_kz=' + studiengang_kz, - description: 'lehre/extrakvverwaltung', - requires: ['stg'] - } - ); - - return extraItems; - } - }, template: /* html */`