From 3aebccbb9def70a31c1d5ab5b74bc94526cd4950 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Fri, 10 Apr 2026 13:01:13 +0200 Subject: [PATCH 1/8] track activeTab in StudVW Details.js and pass it to :default property of fhcTabs instances to attempt to set the last active tab to current, else use the old default tab of route.params.tab --- .../components/Stv/Studentenverwaltung/Details.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js index e59492cf5..a03c7f50f 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details.js +++ b/public/js/components/Stv/Studentenverwaltung/Details.js @@ -15,7 +15,8 @@ export default { data() { return { configStudent: {}, - configStudents: {} + configStudents: {}, + activeTab: null }; }, props: { @@ -74,6 +75,10 @@ export default { }) .catch(this.$fhcAlert.handleSystemError); }, + handleTabChanged(key) { + this.activeTab = key + this.reload() + }, reload() { if (this.$refs.tabs?.$refs?.current?.reload) this.$refs.tabs.$refs.current.reload(); @@ -111,12 +116,12 @@ export default { :useprimevue="true" :modelValue="students[0]" :config="config" - :default="$route.params.tab" + :default="activeTab ?? $route.params.tab" style="flex: 1 1 0%; height: 0%" - @changed="reload" + @changed="handleTabChanged" > - +
Loading... From 0326a01585f5386d8519b93302a8523dd914c29e Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 15 May 2026 14:14:22 +0200 Subject: [PATCH 2/8] disable sendButton, show Spinner and prevent closeModal while sending Message --- .../Messages/Details/NewMessage/Modal.js | 15 ++++++++++++++- .../Messages/Details/NewMessage/NewDiv.js | 15 +++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js index b23eebbcd..36ee5f114 100644 --- a/public/js/components/Messages/Details/NewMessage/Modal.js +++ b/public/js/components/Messages/Details/NewMessage/Modal.js @@ -56,6 +56,7 @@ export default { previewText: null, previewBody: "", replyData: null, + isSending: false } }, methods: { @@ -113,6 +114,9 @@ export default { data.append('data', JSON.stringify(this.formData)); data.append('ids', JSON.stringify(this.id)); + //for disabling sendButton and show Spinner + this.isSending = true; + return this.$refs.formMessage .call(ApiMessages.sendMessage(this.typeId, data)) .then(response => { @@ -121,6 +125,7 @@ export default { this.resetForm(); }).catch(this.$fhcAlert.handleSystemError) .finally(() => { + this.isSending = false; //just emit if no multitasking if(this.id.length == 1){ @@ -288,6 +293,9 @@ export default { dialog-class=" modal-dialog-scrollable modal-xl modal-msg" header-class="flex-wrap pb-0" body-class="px-3 py-2" + :backdrop="isSending ? 'static' : true" + :keyboard="!isSending" + :noCloseBtn="isSending" @hidden.bs.modal="resetForm" > @@ -476,7 +484,12 @@ export default { - +
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js index 00b4e92a8..6a0dfa222 100644 --- a/public/js/components/Messages/Details/NewMessage/NewDiv.js +++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js @@ -55,6 +55,7 @@ export default { previewBody: "", replyData: null, messageSent: false, + isSending: false } }, methods: { @@ -104,16 +105,21 @@ export default { data.append('data', JSON.stringify(this.formData)); data.append('ids', JSON.stringify(this.id)); + //for disabling sendButton and show Spinner + this.isSending = true; + return this.$api .call(ApiMessages.sendMessage(this.typeId, data)) .then(response => { - if(this.openMode == "inSamePage") + if(this.openMode == "inSamePage") { this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent')); + } this.hideTemplate(); this.resetForm(); this.messageSent = true; }).catch(this.$fhcAlert.handleSystemError) .finally(() => { + this.isSending = false; if(this.openMode == "inSamePage" && this.id.length == 1 ){ this.$emit('reloadTable'); } @@ -413,7 +419,12 @@ export default { - + From 81f0b7a4bfe678021c8579cf0126af0eef74f995 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 7 Jul 2026 16:43:01 +0200 Subject: [PATCH 3/8] make showErweitert configurable --- application/config/stv.php | 3 ++- .../components/Stv/Studentenverwaltung/Details/Notizen.js | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/application/config/stv.php b/application/config/stv.php index 34a30a96e..d62e58674 100644 --- a/application/config/stv.php +++ b/application/config/stv.php @@ -60,7 +60,8 @@ $config['tabs'] = ], 'notes' => [ //if true, the count of Messages will be shown in the header of the Tab Messages - 'showCountNotes' => true + 'showCountNotes' => true, + 'showErweitert' => true, ], 'combinePeople' => [ //multitab should only be shown with this length of selection diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index 4acb09156..89ac1bddd 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -8,7 +8,11 @@ export default { CoreNotiz }, props: { - modelValue: Object + modelValue: Object, + config: { + type: Object, + default: {} + } }, data() { return { @@ -31,6 +35,7 @@ export default { :visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']" @reload="$emit('update:suffix')" tabulator-persistence-id="stv-notiz-20260217" + :show-erweitert="config.showErweitert" > From a4c5f9946f803b22d4c29a4d609ea94a205ade2e Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 7 Jul 2026 16:56:35 +0200 Subject: [PATCH 4/8] change doku --- public/js/components/Stv/Studentenverwaltung/Details/Notizen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index 89ac1bddd..d52091cf9 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -57,7 +57,7 @@ type-id: id to which table the notizdata should be connected... eg. person_id, p notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal" showErweitert: if true: section with following fields will be displayed: - 'verfasser', 'bearbeiter', 'von', 'bis' + 'verfasser', 'bearbeiter', 'von', 'bis' and 'erledigt'; is now configurable in config/stv.php showDocument: if true: section with documentHandling will be displayed From 3689c64b7b1df1ac1f636ebb6b8b436e4348a8f2 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 9 Jul 2026 11:01:00 +0200 Subject: [PATCH 5/8] make also notizlayout configurable --- application/config/stv.php | 5 +++++ .../components/Stv/Studentenverwaltung/Details/Notizen.js | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/application/config/stv.php b/application/config/stv.php index d62e58674..d1b364c6e 100644 --- a/application/config/stv.php +++ b/application/config/stv.php @@ -61,7 +61,12 @@ $config['tabs'] = 'notes' => [ //if true, the count of Messages will be shown in the header of the Tab Messages 'showCountNotes' => true, + + //if true: section with following fields will be displayed: 'verfasser', 'bearbeiter', 'von', 'bis' and 'erledigt' 'showErweitert' => true, + + //notizlayout: choose of "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal" + 'notizLayout' => 'popupModal' ], 'combinePeople' => [ //multitab should only be shown with this length of selection diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index d52091cf9..a0b88bdcf 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -27,7 +27,7 @@ export default { class="overflow-hidden" :endpoint="endpoint" ref="formc" - notiz-layout="popupModal" + :notiz-layout="config.notizLayout" type-id="person_id" :id="modelValue.person_id" show-document @@ -54,7 +54,7 @@ ref="formc" type-id: id to which table the notizdata should be connected... eg. person_id, prestudent_id, uid (for mitarbeiter_uid), projekt_kurzbz, projektphase_id, projekttask_id, bestellung_id, lehreinheit_id, anrechnung_id -notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal" +notizLayout: "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal"; is now configurable in config/stv.php showErweitert: if true: section with following fields will be displayed: 'verfasser', 'bearbeiter', 'von', 'bis' and 'erledigt'; is now configurable in config/stv.php @@ -63,7 +63,7 @@ showDocument: if true: section with documentHandling will be displayed showTinyMCE: if true: section with WYSIWYG Editor for Text will be displayed -visibleColumns: list, which fields shoult be showed as default in filter component +visibleColumns: list, which fields should be showed as default in filter component fullVersion: :visibleColumns="['titel','text','bearbeiter','verfasser','von','bis','dokumente','erledigt','notiz_id','notizzuordnung_id','id','lastupdate']" From ab637ded2621e3d4a96ee0d472554555cdd64e38 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 4 Aug 2026 15:12:17 +0200 Subject: [PATCH 6/8] stv config: change default for notes showErweitert to false --- application/config/stv.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/config/stv.php b/application/config/stv.php index d1b364c6e..639c5d23b 100644 --- a/application/config/stv.php +++ b/application/config/stv.php @@ -63,7 +63,7 @@ $config['tabs'] = 'showCountNotes' => true, //if true: section with following fields will be displayed: 'verfasser', 'bearbeiter', 'von', 'bis' and 'erledigt' - 'showErweitert' => true, + 'showErweitert' => false, //notizlayout: choose of "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal" 'notizLayout' => 'popupModal' From cfa4dd8b8af6d4d790aaf29c57857659a838157b Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 4 Aug 2026 15:33:36 +0200 Subject: [PATCH 7/8] add padding to filtercomponent tabulator-tableholder to prevent scrollbar covering a row in tables with few rows --- public/css/components/FilterComponent.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/css/components/FilterComponent.css b/public/css/components/FilterComponent.css index 3edf989a6..7779f78fc 100644 --- a/public/css/components/FilterComponent.css +++ b/public/css/components/FilterComponent.css @@ -70,6 +70,10 @@ margin-top: 20px; } +.filter-table-dataset .tabulator-tableholder { + padding-bottom: 16px; +} + .tabulator { font-size: 1rem; } From dd1a5064e41caae93a7c56be3f7ba807cce7363d Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 4 Aug 2026 16:54:53 +0200 Subject: [PATCH 8/8] tabs: add padding to prevent minimal horizontal scrolling --- public/js/components/Tabs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js index 50a8cf0e7..b0b5aecc1 100644 --- a/public/js/components/Tabs.js +++ b/public/js/components/Tabs.js @@ -219,7 +219,7 @@ export default { :scrollable="true" :lazy="true" :activeIndex="calcActiveIndex" - :pt="{navContainer:{style: 'flex: 0 0 auto;'}, panelContainer:{class: 'overflow-y-scroll p-2', style: 'flex: 1 1 auto;'}}" + :pt="{navContainer:{style: 'flex: 0 0 auto;'}, panelContainer:{class: 'overflow-y-scroll p-2 pe-3', style: 'flex: 1 1 auto;'}}" @tab-click="handleTabClick" >