diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index 5986480e6..5e6a73e7f 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -271,7 +271,8 @@ export default{ actionSem: null, newArray: {}, abbruchData: {}, - newStatus: '' + newStatus: '', + statusNew: true } }, watch: { @@ -287,15 +288,17 @@ export default{ }, methods: { actionNewStatus() { + this.resetModal(); this.statusData.status_kurzbz = 'Interessent'; this.statusData.studiensemester_kurzbz = this.defaultSemester; this.statusData.ausbildungssemester = 1; this.statusData.datum = this.getDefaultDate(); this.statusData.bestaetigtam = this.getDefaultDate(); this.statusData.name = this.modelValue.vorname + ' ' + this.modelValue.nachname; - this.$refs.newStatusModal.show(); + this.$refs.statusModal.show(); }, actionEditStatus(status, stdsem, ausbildungssemester){ + this.statusNew = false; this.statusId = { 'prestudent_id': this.modelValue.prestudent_id, 'status_kurzbz': status, @@ -304,7 +307,7 @@ export default{ }; this.loadStatus(this.statusId).then(() => { if(this.statusData) - this.$refs.editStatusModal.show(); + this.$refs.statusModal.show(); }); }, actionDeleteStatus(status, stdsem, ausbildungssemester){ @@ -367,11 +370,6 @@ export default{ }; console.log(this.updateData); this.newArray = this.updateData.map(objekt => ({ ...objekt, ...abbruchData })); -/* console.log(this.newArray); - - console.log("in changeStatusToAbbrecher" + prestudentIds); - console.log("count: " + prestudentIds.length);*/ - this.addNewStatus(prestudentIds); }, changeStatusToAbbrecherStud(prestudentIds){ @@ -397,6 +395,7 @@ export default{ }; this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData })); + console.log("in changeStatus to Unterbrecher: " + this.deltaData); this.addNewStatus(prestudentIds); }, changeStatusToStudent(prestudentIds){ @@ -517,7 +516,7 @@ export default{ else { this.$reloadList(); } - this.hideModal('newStatusModal'); + this.hideModal('statusModal'); this.resetModal(); }); }, @@ -577,7 +576,7 @@ export default{ .then( result => { this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave')); - this.hideModal('editStatusModal'); + this.hideModal('statusModal'); this.resetModal(); }) .catch(this.$fhcAlert.handleSystemError) @@ -601,6 +600,7 @@ export default{ .catch(this.$fhcAlert.handleSystemError); }, loadStatus(status_id){ + this.statusNew = false; return this.$fhcApi.post('api/frontend/v1/stv/status/loadStatus/', status_id) .then(result => { @@ -614,6 +614,7 @@ export default{ }, hideModal(modalRef){ this.$refs[modalRef].hide(); + this.statusNew = true; }, resetModal(){ this.statusData = {}; @@ -635,13 +636,13 @@ export default{ this.listStudiensemester = result; }) .catch(this.$fhcAlert.handleSystemError); - this.$fhcApi +/* this.$fhcApi .get('api/frontend/v1/stv/prestudent/getStudienplaene/' + this.modelValue.prestudent_id) .then(result => result.data) .then(result => { this.listStudienplaene = result; }) - .catch(this.$fhcAlert.handleSystemError); + .catch(this.$fhcAlert.handleSystemError);*/ this.$fhcApi .get('api/frontend/v1/stv/status/getStatusgruende/') .then(result => result.data) @@ -661,334 +662,158 @@ export default{ template: `
Details {{modelValue.nachname}} {{modelValue.vorname}}
- -{{$p.t('lehre', 'status_new')}}
+{{$p.t('lehre', 'status_edit')}}
- -Details {{modelValue.nachname}} {{modelValue.vorname}}
- -Details {{modelValue.nachname}} {{modelValue.vorname}}
++ {{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrund')}} +
++ {{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrundSemester')}} +
+ +