diff --git a/application/config/stv.php b/application/config/stv.php
index 34a30a96e..639c5d23b 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -60,7 +60,13 @@ $config['tabs'] =
],
'notes' => [
//if true, the count of Messages will be shown in the header of the Tab Messages
- 'showCountNotes' => true
+ 'showCountNotes' => true,
+
+ //if true: section with following fields will be displayed: 'verfasser', 'bearbeiter', 'von', 'bis' and 'erledigt'
+ 'showErweitert' => false,
+
+ //notizlayout: choose of "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal"
+ 'notizLayout' => 'popupModal'
],
'combinePeople' => [
//multitab should only be shown with this length of selection
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;
}
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 {
-
+
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"
>
-