diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php
index 643991191..2c9d0d382 100644
--- a/application/views/lehre/Antrag/Create.php
+++ b/application/views/lehre/Antrag/Create.php
@@ -35,13 +35,13 @@ $this->load->view(
antrag-type="= $antrag_type; ?>"
studierendenantrag-id="= $studierendenantrag_id; ?>"
v-model:info-array="infoArray"
- v-model:status-msg="statusMsg"
- v-model:status-severity="statusSeverity"
+ v-model:status-msg="status.msg"
+ v-model:status-severity="status.severity"
>
diff --git a/public/js/components/Studierendenantrag/Form/Abmeldung.js b/public/js/components/Studierendenantrag/Form/Abmeldung.js
index ba6a054ad..513b8b542 100644
--- a/public/js/components/Studierendenantrag/Form/Abmeldung.js
+++ b/public/js/components/Studierendenantrag/Form/Abmeldung.js
@@ -1,5 +1,4 @@
import {CoreFetchCmpt} from '../../Fetch.js';
-import Phrasen from '../../../mixins/Phrasen.js';
var _uuid = 0;
@@ -7,9 +6,6 @@ export default {
components: {
CoreFetchCmpt
},
- mixins: [
- Phrasen
- ],
emits: [
'setInfos',
'setStatus'
@@ -56,7 +52,7 @@ export default {
this.data = result.data.retval;
if (this.data.status) {
this.$emit("setStatus", {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
severity: this.statusSeverity
});
}
@@ -67,7 +63,7 @@ export default {
createAntrag() {
bootstrap.Modal.getOrCreateInstance(this.$refs.modal).hide();
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')})),
severity: 'warning'
});
this.saving = true;
@@ -93,7 +89,7 @@ export default {
this.errors.default.push(result.data.retval[k]);
}
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
severity: 'danger'
});
}
@@ -104,13 +100,13 @@ export default {
this.data = result.data.retval;
if (this.data.status) {
this.$emit("setStatus", {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
severity: this.statusSeverity
});
}
else
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_open')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_open')})),
severity:'success'
});
}
@@ -120,7 +116,7 @@ export default {
},
cancelAntrag() {
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelling')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelling')})),
severity: 'warning'
});
this.saving = true;
@@ -144,7 +140,7 @@ export default {
this.errors.default.push(result.data.retval[k]);
}
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
severity:'danger'
});
}
@@ -156,13 +152,13 @@ export default {
this.data = result.data.retval;
if (this.data.status) {
this.$emit("setStatus", {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
severity: this.statusSeverity
});
}
else
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelled')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelled')})),
severity: 'danger'
});
}
@@ -183,37 +179,37 @@ export default {
@@ -239,7 +235,7 @@ export default {
@click="cancelAntrag"
:disabled="saving"
>
- {{p.t('studierendenantrag', 'btn_cancel')}}
+ {{$p.t('studierendenantrag', 'btn_cancel')}}
- {{p.t('studierendenantrag', 'title_Abmeldung')}}
+ {{$p.t('studierendenantrag', 'title_Abmeldung')}}
-
+
-
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index a9214893a..1650d3638 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -1,5 +1,4 @@
import {CoreFetchCmpt} from '../../Fetch.js';
-import Phrasen from '../../../mixins/Phrasen.js';
var _uuid = 0;
@@ -7,9 +6,6 @@ export default {
components: {
CoreFetchCmpt
},
- mixins: [
- Phrasen
- ],
emits: [
'setInfos',
'setStatus'
@@ -56,7 +52,7 @@ export default {
this.data = result.data.retval;
if (this.data.status) {
this.$emit("setStatus", {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
severity: this.statusSeverity
});
}
@@ -67,7 +63,7 @@ export default {
createAntrag() {
bootstrap.Modal.getOrCreateInstance(this.$refs.modal).hide();
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')})),
severity: 'warning'
});
this.saving = true;
@@ -93,7 +89,7 @@ export default {
this.errors.default.push(result.data.retval[k]);
}
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
severity: 'danger'
});
}
@@ -104,13 +100,13 @@ export default {
this.data = result.data.retval;
if (this.data.status) {
this.$emit("setStatus", {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
severity: this.statusSeverity
});
}
else
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_open')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_open')})),
severity:'success'
});
}
@@ -123,7 +119,7 @@ export default {
if(event.target.value)
{
- let templateT= this.p.t('studierendenantrag', event.target.value);
+ let templateT= this.$p.t('studierendenantrag', event.target.value);
templateText.value = templateT;
}
else
@@ -140,38 +136,38 @@ export default {
- | {{p.t('lehre', 'studiengang')}} |
- {{data?.bezeichnung}} |
+ {{$p.t('lehre', 'studiengang')}} |
+ {{data.bezeichnung}} |
- | {{p.t('lehre', 'organisationsform')}} |
- {{data?.orgform_bezeichnung}} |
+ {{$p.t('lehre', 'organisationsform')}} |
+ {{data.orgform_bezeichnung}} |
- | {{p.t('projektarbeitsbeurteilung', 'nameStudierende')}} |
- {{data?.name}} |
+ {{$p.t('projektarbeitsbeurteilung', 'nameStudierende')}} |
+ {{data.name}} |
- | {{p.t('person', 'personenkennzeichen')}} |
- {{data?.matrikelnr}} |
+ {{$p.t('person', 'personenkennzeichen')}} |
+ {{data.matrikelnr}} |
- | {{p.t('lehre', 'studienjahr')}} |
- {{data?.studienjahr_kurzbz}} |
+ {{$p.t('lehre', 'studienjahr')}} |
+ {{data.studienjahr_kurzbz}} |
- | {{p.t('lehre', 'studiensemester')}} |
- {{data?.studiensemester_kurzbz}} |
+ {{$p.t('lehre', 'studiensemester')}} |
+ {{data.studiensemester_kurzbz}} |
- | {{p.t('lehre', 'semester')}} |
- {{data?.semester}} |
+ {{$p.t('lehre', 'semester')}} |
+ {{data.semester}} |
-
-
{{p.t('studierendenantrag', 'antrag_grund')}}:
+
+
{{$p.t('studierendenantrag', 'antrag_grund')}}:
{{data?.grund}}
@@ -181,19 +177,19 @@ export default {
@@ -220,7 +216,7 @@ export default {
:data-bs-target="'#studierendenantrag-form-abmeldung-' + uuid + '-modal'"
:disabled="saving"
>
- {{p.t('studierendenantrag', 'btn_create_Abmeldung')}}
+ {{$p.t('studierendenantrag', 'btn_create_Abmeldung')}}
- {{p.t('studierendenantrag', 'title_Abmeldung')}}
+ {{$p.t('studierendenantrag', 'title_Abmeldung')}}
-
+
-
diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
index 2459dec17..a0e84af63 100644
--- a/public/js/components/Studierendenantrag/Form/Unterbrechung.js
+++ b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
@@ -1,6 +1,5 @@
import {CoreFetchCmpt} from '../../Fetch.js';
import VueDatepicker from '../../vueDatepicker.js.php';
-import Phrasen from '../../../mixins/Phrasen.js';
var _uuid = 0;
@@ -9,9 +8,6 @@ export default {
CoreFetchCmpt,
VueDatepicker
},
- mixins: [
- Phrasen
- ],
emits: [
'setInfos',
'setStatus'
@@ -79,7 +75,7 @@ export default {
this.data = result.data.retval;
if (this.data.status) {
this.$emit("setStatus", {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
severity: this.statusSeverity
});
}
@@ -89,7 +85,7 @@ export default {
},
createAntrag() {
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')})),
severity: 'warning'
});
this.saving = true;
@@ -126,7 +122,7 @@ export default {
this.errors.default.push(result.data.retval[k]);
}
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
severity: 'danger'
});
}
@@ -137,13 +133,13 @@ export default {
this.data = result.data.retval;
if (this.data.status) {
this.$emit("setStatus", {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
severity: this.statusSeverity
});
}
else
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_created')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_created')})),
severity: 'info'
});
}
@@ -153,7 +149,7 @@ export default {
},
cancelAntrag() {
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelling')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelling')})),
severity: 'warning'
});
this.saving = true;
@@ -177,7 +173,7 @@ export default {
this.errors.default.push(result.data.retval[k]);
}
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
severity: 'danger'
});
}
@@ -189,13 +185,13 @@ export default {
this.data = result.data.retval;
if (this.data.status) {
this.$emit("setStatus", {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
severity: this.statusSeverity
});
}
else
this.$emit('setStatus', {
- msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelled')}),
+ msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelled')})),
severity: 'danger'
});
}
@@ -216,28 +212,28 @@ export default {