diff --git a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php index c9bc3ab3f..e9f3edcec 100644 --- a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php +++ b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php @@ -242,6 +242,10 @@ class Abschlusspruefung extends FHCAPI_Controller 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ']) ]); + $this->form_validation->set_rules('akadgrad_id', 'AkadGrad', 'required', [ + 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'AkadGrad']) + ]); + $this->form_validation->set_rules('datum', 'Datum', 'is_valid_date', [ 'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Datum']) ]); @@ -309,6 +313,10 @@ class Abschlusspruefung extends FHCAPI_Controller $this->form_validation->set_rules('pruefungstyp_kurzbz', 'Typ', 'required', [ 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ']) ]); + + $this->form_validation->set_rules('akadgrad_id', 'AkadGrad', 'required', [ + 'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'AkadGrad']) + ]); $this->form_validation->set_rules('datum', 'Datum', 'is_valid_date', [ 'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Datum']) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index 4e7189d1d..8167bd90f 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -1337,13 +1337,13 @@ class Status extends FHCAPI_Controller 'updatevon' => $authUID ]; foreach ([ - 'orgform_kurzbz', - 'anmerkung', - 'bewerbung_abgeschicktamum', - 'studienplan_id', - 'rt_stufe', - 'statusgrund_id' - ] as $key) + 'orgform_kurzbz', + 'anmerkung', + 'bewerbung_abgeschicktamum', + 'studienplan_id', + 'rt_stufe', + 'statusgrund_id' + ] as $key) if ($this->input->post($key)) $updateData[$key] = $this->input->post($key); diff --git a/public/js/api/stv/abschlusspruefung.js b/public/js/api/stv/abschlusspruefung.js index d51c760bc..dccc10085 100644 --- a/public/js/api/stv/abschlusspruefung.js +++ b/public/js/api/stv/abschlusspruefung.js @@ -3,15 +3,15 @@ export default { getAbschlusspruefung (url, config, params){ return this.$fhcApi.get('api/frontend/v1/stv/abschlusspruefung/getAbschlusspruefung/' + params.id); }, - addNewAbschlusspruefung(data) { - return this.$fhcApi.post('api/frontend/v1/stv/abschlusspruefung/insertAbschlusspruefung/', data + addNewAbschlusspruefung(form, data) { + return this.$fhcApi.post(form, 'api/frontend/v1/stv/abschlusspruefung/insertAbschlusspruefung/', data ); }, loadAbschlusspruefung(id){ return this.$fhcApi.post('api/frontend/v1/stv/abschlusspruefung/loadAbschlusspruefung/', {id}); }, - updateAbschlusspruefung(data) { - return this.$fhcApi.post('api/frontend/v1/stv/abschlusspruefung/updateAbschlusspruefung/', data + updateAbschlusspruefung(form, data) { + return this.$fhcApi.post(form, 'api/frontend/v1/stv/abschlusspruefung/updateAbschlusspruefung/', data ); }, deleteAbschlusspruefung(id){ diff --git a/public/js/api/stv/details.js b/public/js/api/stv/details.js index bdf26739b..a56de9494 100644 --- a/public/js/api/stv/details.js +++ b/public/js/api/stv/details.js @@ -2,8 +2,8 @@ export default { get(prestudent_id) { return this.$fhcApi.post('api/frontend/v1/stv/student/get/' + prestudent_id); }, - save(prestudent_id, data) { - return this.$fhcApi.post('api/frontend/v1/stv/student/save/' + prestudent_id, + save(form, prestudent_id, data) { + return this.$fhcApi.post(form, 'api/frontend/v1/stv/student/save/' + prestudent_id, data ); }, diff --git a/public/js/api/stv/exam.js b/public/js/api/stv/exam.js index a759f3ba7..2f9ed5ffc 100644 --- a/public/js/api/stv/exam.js +++ b/public/js/api/stv/exam.js @@ -9,11 +9,9 @@ export default { return this.$fhcApi.get('api/frontend/v1/stv/pruefung/getTypenPruefungen'); }, getAllLehreinheiten(data){ - console.log("all Lehreinheiten"); return this.$fhcApi.post('api/frontend/v1/stv/pruefung/getAllLehreinheiten/', data) }, getLvsByStudent(uid){ - console.log(uid); return this.$fhcApi.get('api/frontend/v1/stv/pruefung/getLvsByStudent/' + uid) }, getLvsandLesByStudent(uid){ diff --git a/public/js/api/stv/kontakt.js b/public/js/api/stv/kontakt.js index f76c9b5cb..c279e9d89 100644 --- a/public/js/api/stv/kontakt.js +++ b/public/js/api/stv/kontakt.js @@ -3,16 +3,16 @@ export default { getAdressen (url, config, params){ return this.$fhcApi.get('api/frontend/v1/stv/kontakt/getAdressen/' + params.id); }, - addNewAddress(id, data) { - return this.$fhcApi.post('api/frontend/v1/stv/kontakt/addNewAddress/' + id, + addNewAddress(form, id, data) { + return this.$fhcApi.post(form, 'api/frontend/v1/stv/kontakt/addNewAddress/' + id, data ); }, loadAddress(address_id){ return this.$fhcApi.post('api/frontend/v1/stv/kontakt/loadAddress/', {address_id}); }, - updateAddress(address_id, data) { - return this.$fhcApi.post('api/frontend/v1/stv/kontakt/updateAddress/' + address_id, + updateAddress(form, address_id, data) { + return this.$fhcApi.post(form, 'api/frontend/v1/stv/kontakt/updateAddress/' + address_id, data ); }, @@ -36,16 +36,16 @@ export default { getBankverbindung (url, config, params){ return this.$fhcApi.get('api/frontend/v1/stv/kontakt/getBankverbindung/' + params.id); }, - addNewBankverbindung(id, data) { - return this.$fhcApi.post('api/frontend/v1/stv/kontakt/addNewBankverbindung/' + id, + addNewBankverbindung(form, id, data) { + return this.$fhcApi.post(form, 'api/frontend/v1/stv/kontakt/addNewBankverbindung/' + id, data ); }, loadBankverbindung(bankverbindung_id){ return this.$fhcApi.post('api/frontend/v1/stv/kontakt/loadBankverbindung/', {bankverbindung_id}); }, - updateBankverbindung(bankverbindung_id, data) { - return this.$fhcApi.post('api/frontend/v1/stv/kontakt/updateBankverbindung/' + bankverbindung_id, + updateBankverbindung(form, bankverbindung_id, data) { + return this.$fhcApi.post(form, 'api/frontend/v1/stv/kontakt/updateBankverbindung/' + bankverbindung_id, data ); }, @@ -57,16 +57,16 @@ export default { getKontakte (url, config, params){ return this.$fhcApi.get('api/frontend/v1/stv/kontakt/getKontakte/' + params.id); }, - addNewContact(id, data) { - return this.$fhcApi.post('api/frontend/v1/stv/kontakt/addNewContact/' + id, + addNewContact(form, id, data) { + return this.$fhcApi.post(form, 'api/frontend/v1/stv/kontakt/addNewContact/' + id, data ); }, loadContact(kontakt_id){ return this.$fhcApi.post('api/frontend/v1/stv/kontakt/loadContact/', {kontakt_id}); }, - updateContact(kontakt_id, data) { - return this.$fhcApi.post('api/frontend/v1/stv/kontakt/updateContact/' + kontakt_id, + updateContact(form, kontakt_id, data) { + return this.$fhcApi.post(form, 'api/frontend/v1/stv/kontakt/updateContact/' + kontakt_id, data ); }, diff --git a/public/js/api/stv/prestudent.js b/public/js/api/stv/prestudent.js index b58f8eda1..25b4c85ad 100644 --- a/public/js/api/stv/prestudent.js +++ b/public/js/api/stv/prestudent.js @@ -5,8 +5,8 @@ export default { get(prestudent_id){ return this.$fhcApi.post('api/frontend/v1/stv/prestudent/get/' + prestudent_id); }, - updatePrestudent(prestudent_id, data){ - return this.$fhcApi.post('api/frontend/v1/stv/prestudent/updatePrestudent/' + prestudent_id, + updatePrestudent(form, prestudent_id, data){ + return this.$fhcApi.post(form, 'api/frontend/v1/stv/prestudent/updatePrestudent/' + prestudent_id, data ); }, diff --git a/public/js/api/stv/status.js b/public/js/api/stv/status.js index a2a143f65..07978ee2b 100644 --- a/public/js/api/stv/status.js +++ b/public/js/api/stv/status.js @@ -2,8 +2,8 @@ export default { //------------- Modal.js------------------------------------------------------ - insertStatus(id, data) { - return this.$fhcApi.post('api/frontend/v1/stv/status/insertStatus/' + id, + insertStatus(form, id, data) { + return this.$fhcApi.post(form, 'api/frontend/v1/stv/status/insertStatus/' + id, data ); }, @@ -16,8 +16,9 @@ export default { + ausbildungssemester ); }, - updateStatus({prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester}, data) { + updateStatus(form, {prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester}, data) { return this.$fhcApi.post( + form, 'api/frontend/v1/stv/status/updateStatus/' + prestudent_id + '/' + status_kurzbz + '/' diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js index af95b90f6..cf573deb0 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js @@ -258,7 +258,7 @@ export default { formData: this.formData }; - return this.$refs.formFinalExam.factory.stv.abschlusspruefung.addNewAbschlusspruefung(dataToSend) + return this.$fhcApi.factory.stv.abschlusspruefung.addNewAbschlusspruefung(this.$refs.formFinalExam, dataToSend) .then(response => { this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave')); this.resetForm(); @@ -286,7 +286,7 @@ export default { id: abschlusspruefung_id, formData: this.formData }; - return this.$refs.formFinalExam.factory.stv.abschlusspruefung.updateAbschlusspruefung(dataToSend) + return this.$fhcApi.factory.stv.abschlusspruefung.updateAbschlusspruefung(this.$refs.formFinalExam, dataToSend) .then(response => { this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave')); this.resetForm(); @@ -415,7 +415,7 @@ export default {