diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index a816af46e..6cb9714ec 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -152,12 +152,13 @@ export default{ status_kurzbz: status, statusgrund_id: null, link: `changeStatusTo${status}`, - dropEntry: null, + // dropEntry: null, children: [] }; if (status === "Student") { defaultObject.link = 'changeInteressentToStudent'; + } result.push(defaultObject); if(this.sortedGruende[status]) { @@ -167,15 +168,25 @@ export default{ statusgrund_id: item.statusgrund_id, beschreibung: item.beschreibung, link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`, - dropEntry: `[${item.beschreibung}]` + //dropEntry: `[${item.beschreibung}]` }; if (item.status_kurzbz === "Student") { itemObject.link = `changeInteressentTo${item.status_kurzbz}(${item.statusgrund_id})`; } - defaultObject.children.push(itemObject); }); + //push one item object if student is in the array + const hasStudentChild = defaultObject.children.some(child => child.status_kurzbz === "Student"); + + if (hasStudentChild) { + defaultObject.children.push({ + status_kurzbz: 'Student', + statusgrund_id: null, + beschreibung: 'Student', + link: 'changeInteressentToStudent' + }); + } } }); return result; @@ -183,24 +194,37 @@ export default{ resultStudentArray() { const result = []; this.statiStudent.forEach(status => { - result.push({ + const defaultObject = { status_kurzbz: status, statusgrund_id: null, link: `changeStatusTo${status}`, - dropEntry: null - }); + dropEntry: null, + children: [] + }; + result.push(defaultObject); + if(this.sortedGruende[status]) { + this.sortedGruende[status].forEach(item => { + const itemObject = { + status_kurzbz: item.status_kurzbz, + statusgrund_id: item.statusgrund_id, + beschreibung: item.beschreibung, + link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`, + dropEntry: `[${item.beschreibung}]`, + }; + defaultObject.children.push(itemObject); + }); + } + //push one item object if student is in the array + const hasStudentChild = defaultObject.children.some(child => child.status_kurzbz === "Student"); - this.toolbarStudent.forEach(item => { - if (item.status_kurzbz === status) { - result.push({ - status_kurzbz: item.status_kurzbz, - statusgrund_id: item.statusgrund_id, - beschreibung: item.beschreibung, - link: `changeStatusTo${item.status_kurzbz}(${item.statusgrund_id})`, - dropEntry: `[${item.beschreibung}]`, - }); - } - }); + if (hasStudentChild) { + defaultObject.children.push({ + status_kurzbz: 'Student', + statusgrund_id: null, + beschreibung: 'Student', + link: 'changeStatusToStudent' + }); + } }); return result; } @@ -493,36 +517,26 @@ export default{ this.$refs.askForAusbildungssemester.show(); } }, - changeStatusToAbbrecherStgl(prestudentIds){ + changeStatusToAbbrecher(statusgrund_id){ this.hideModal('confirmStatusAction'); + this.hideModal('askForAusbildungssemester'); + console.log("in function changeStatusToAbbrecher: ", statusgrund_id); let def_date = this.getDefaultDate(); let abbruchData = { status_kurzbz: 'Abbrecher', datum: def_date, bestaetigtam: def_date, - statusgrund_id: 17 + statusgrund_id: statusgrund_id }; - console.log(this.updateData); this.newArray = this.updateData.map(objekt => ({ ...objekt, ...abbruchData })); - this.changeStatus(prestudentIds); - }, - changeStatusToAbbrecherStud(prestudentIds){ - this.hideModal('confirmStatusAction'); - let def_date = this.getDefaultDate(); - let deltaData = - { - status_kurzbz: 'Abbrecher', - datum: def_date, - bestaetigtam: def_date, - statusgrund_id: 18 - }; - this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData })); - this.changeStatus(prestudentIds); + this.actionConfirmDialogue(this.updateData, 'studenten','Abbrecher'); + //this.changeStatus(prestudentIds); }, - changeStatusToUnterbrecher(prestudentIds){ + changeStatusToUnterbrecher(){ this.hideModal('confirmStatusAction'); + this.hideModal('askForAusbildungssemester'); let def_date = this.getDefaultDate(); let deltaData = { @@ -532,14 +546,32 @@ export default{ }; this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData })); - this.changeStatus(prestudentIds); + this.actionConfirmDialogue(this.updateData, 'studenten','Unterbrecher'); }, changeStatusToStudent(statusgrund_id){ + this.hideModal('confirmStatusAction'); + this.hideModal('askForAusbildungssemester'); console.log("in function changeStatusToStudent: ", statusgrund_id); let def_date = this.getDefaultDate(); //TODO Manu validation if Bewerber already before asking for ausbildungssemester //this.checkIfBewerber(); - this.hideModal('askForAusbildungssemester'); + + this.actionButton = 'student'; + + if(statusgrund_id == 19){ + this.actionStatusText = 'Pre-Abbrecher'; + } + if(statusgrund_id == 11){ + this.actionStatusText = 'Pre-Wiederholer'; + } + if(statusgrund_id == 16){ + this.actionStatusText = 'Wiederholer'; + } + if(!statusgrund_id){ + this.actionStatusText = 'Student'; + } + + let deltaData = { status_kurzbz: 'Student', @@ -548,24 +580,12 @@ export default{ statusgrund_id: statusgrund_id }; - this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem})); + // this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem})); - //TODO(Manu) get bezeichnung von statusgrund_kurzbz - this.actionConfirmDialogue(this.updateData, 'student','Studenten'); - }, - changeStatusToWiederholer(prestudentIds){ - this.hideModal('askForAusbildungssemester'); - let def_date = this.getDefaultDate(); - let deltaData = - { - status_kurzbz: 'Student', - datum: def_date, - bestaetigtam: def_date, - statusgrund_id: 16 - }; + //now actionSem is asked later + this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData})); - this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData, ausbildungssemester: this.actionSem})); - this.changeStatus(prestudentIds); + this.actionConfirmDialogue(this.updateData, this.actionButton, this.actionStatusText); }, changeStatusToDiplomand(prestudentIds){ let def_date = this.getDefaultDate(); @@ -592,6 +612,8 @@ export default{ this.changeStatus(prestudentIds); }, changeStatusToBewerber(){ + this.hideModal('confirmStatusAction'); + this.hideModal('askForAusbildungssemester'); let def_date = this.getDefaultDate(); let deltaData = { @@ -607,6 +629,8 @@ export default{ this.changeStatus(this.prestudentIds); }, changeStatusToAufgenommener(){ + this.hideModal('confirmStatusAction'); + this.hideModal('askForAusbildungssemester'); let def_date = this.getDefaultDate(); let deltaData = { @@ -624,6 +648,8 @@ export default{ }, changeInteressentToStudent(statusgrund_id){ + this.hideModal('confirmStatusAction'); + this.hideModal('askForAusbildungssemester'); //TODO(Manu) test statusgrund_id console.log("in function changeInteressentToStudent mit statusgrund_id", statusgrund_id); let def_date = this.getDefaultDate(); @@ -644,6 +670,8 @@ export default{ }, changeStatusToAbgewiesener(statusgrund_id){ + this.hideModal('confirmStatusAction'); + this.hideModal('askForAusbildungssemester'); let def_date = this.getDefaultDate(); let deltaData = { @@ -661,6 +689,8 @@ export default{ this.actionConfirmDialogue(this.updateData, 'abgewiesener','Abgewiesenen'); }, changeStatusToWartender(){ + this.hideModal('confirmStatusAction'); + this.hideModal('askForAusbildungssemester'); let def_date = this.getDefaultDate(); let deltaData = { @@ -745,6 +775,7 @@ export default{ }, changeStatus(prestudentIds){ this.hideModal('confirmStatusAction'); + this.hideModal('askForAusbildungssemester'); //Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds]; let changeData = {}; @@ -755,6 +786,18 @@ export default{ if(!prestudentIds) prestudentIds = [this.modelValue.prestudent_id]; + // Check if ausbildungssemester is already in this.newArray + const existingEntry = this.newArray.find( + (entry) => entry.ausbildungssemester === this.actionSem + ); + + // If the entry doesn't exist, add a new object with ausbildungssemester + if (!existingEntry) { + this.newArray.push({ ausbildungssemester: this.actionSem }); + } + + console.log(this.actionSem + ' ' + this.newArray['ausbildungssemester']); + const promises = prestudentIds.map(prestudentId => { //TODO(manu) besserer check changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId); @@ -776,16 +819,16 @@ export default{ Promise .allSettled(promises) .then(values => { - if (this.abbruchData.length < 1) { +/* if (this.abbruchData.length < 1) { } - else{ - if(this.newArray.length > 0) { - this.newStatus = this.newArray[0].status_kurzbz; - } - else { - this.newStatus = this.statusData.status_kurzbz; - } + else{*/ + if(this.newArray.length > 0) { + this.newStatus = this.newArray[0].status_kurzbz; } + else { + this.newStatus = this.statusData.status_kurzbz; + } + // } //Feedback Success als infoalert if (countSuccess > 0) { @@ -1025,6 +1068,70 @@ export default{
+ + + + + + + + + + + + + + + + + + + + + + +
Status KurzbezBezeichnungStatus Grund IDLinkLink statusgrund_id
{{item.status_kurzbz}} +
+ {{child.beschreibung}} +
+ 		{{ item.beschreibung }}{{ item.children[0] }}{{ item.link }} +
+ {{child.link}} +
+
+ + + @@ -1242,11 +1355,15 @@ export default{ @@ -1306,25 +1423,31 @@ export default{
@@ -1343,7 +1466,6 @@ export default{ - @@ -1426,7 +1548,6 @@ export default{ - - ` - + + ` }; \ No newline at end of file