Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc

This commit is contained in:
Harald Bamberger
2026-06-26 15:16:18 +02:00
12 changed files with 191 additions and 54 deletions
@@ -90,6 +90,17 @@ export default {
msg,
severity: this.statusSeverity
});
if (this.data.status === 'Abgelehnt' && this.data?.status_grund?.trim())
{
this.$emit('setInfos', [
{
title: this.$p.t('studierendenantrag', 'status_grund_abgelehnt'),
body: this.data.status_grund,
severity: this.statusSeverity
}
]);
}
}
return result;
}
@@ -18,7 +18,8 @@ export default {
},
props: {
stgL: Array,
stgA: Array
stgA: Array,
abmeldung_enabled: Boolean
},
data() {
return {
@@ -255,6 +256,7 @@ export default {
<leitung-actions
:stg-a="stgkzA"
:stg-l="stgkzL"
:abmeldung_enabled="abmeldung_enabled"
:selectedData="selectedData"
:columns="columns"
@reload="reload"
@@ -10,7 +10,8 @@ export default {
selectedData: Array,
columns: Array,
stgL: Array,
stgA: Array
stgA: Array,
abmeldung_enabled: Boolean,
},
emits: [
'reload',
@@ -64,7 +65,7 @@ export default {
template: `
<div class="studierendenantrag-leitung-actions fhc-table-actions d-flex flex-wrap justify-content-between mb-2">
<div class="d-flex align-items-center gap-2">
<actions-new @reload="$emit('reload')"></actions-new>
<actions-new v-if="abmeldung_enabled" @reload="$emit('reload')"></actions-new>
<button type="button" class="btn btn-outline-secondary" @click="$emit('reload')" :title="$p.t('table','reload')">
<i class="fa-solid fa-rotate-right"></i>
</button>
@@ -55,7 +55,7 @@ export default {
return this.$api
.call(ApiStudstatusLeitung.getHistory(this.lastHistoryClickedId))
.then(res => {
this.historyData = res.data.sort((a, b) => a.insertamum > b.insertamum);
this.historyData = res.data;
})
.catch(this.$fhcAlert.handleSystemError);
},