From c980dee96b9fc1a4aa93629808ffb408dd891627 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 19 Dec 2024 15:25:21 +0100 Subject: [PATCH] edit select --- .../api/frontend/v1/stv/Mobility.php | 10 ++--- .../Studentenverwaltung/Details/Mobility.js | 2 +- .../Details/Mobility/Mobility.js | 38 ++++--------------- 3 files changed, 13 insertions(+), 37 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Mobility.php b/application/controllers/api/frontend/v1/stv/Mobility.php index 49a0ec165..db2ee1486 100644 --- a/application/controllers/api/frontend/v1/stv/Mobility.php +++ b/application/controllers/api/frontend/v1/stv/Mobility.php @@ -27,15 +27,15 @@ class Mobility extends FHCAPI_Controller ]); // Load models - $this->load->model('codex/Mobilitaet_model', 'MobilitaetModel'); + $this->load->model('codex/Bisio_model', 'BisioModel'); } - public function getMobilitaeten($prestudent_id) + public function getMobilitaeten($student_uid) { - $this->MobilitaetModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_mobilitaet.mobilitaetsprogramm_code)', 'LEFT'); + // $this->BisioModel->addJoin('bis.tbl_Bisiosprogramm mp', 'ON (mp.Bisiosprogramm_code = bis.tbl_Bisio.Bisiosprogramm_code)', 'LEFT'); - $result = $this->MobilitaetModel->loadWhere( - array('prestudent_id' => $prestudent_id) + $result = $this->BisioModel->loadWhere( + array('student_uid' => $student_uid) ); $data = $this->getDataOrTerminateWithError($result); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility.js index 16c229235..df6a5612f 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility.js @@ -20,6 +20,6 @@ export default {

TEST Mob

- + ` }; \ No newline at end of file diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js index 3f13b372c..26a41ec3e 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js @@ -17,7 +17,7 @@ export default { } }, props: { - prestudent: Object + student: Object }, data() { return { @@ -26,25 +26,16 @@ export default { ajaxRequestFunc: this.$fhcApi.factory.stv.mobility.getMobilitaeten, ajaxParams: () => { return { - id: this.prestudent.prestudent_id + id: this.student.student_uid }; }, ajaxResponse: (url, params, response) => response.data, columns: [ {title: "Kurzbz", field: "kurzbz"}, - {title: "Nation", field: "beurteilung_bezeichnung"}, - {title: "firma_id", field: "firma_id", visible: false}, - // {title: "prueferIn2", field: "p2_nachname", visible: false}, - // {title: "prueferIn3", field: "p3_nachname", visible: false}, - // {title: "datum", field: "format_datum"}, - // {title: "uhrzeit", field: "uhrzeit"}, - // {title: "freigabe", field: "format_freigabedatum"}, - // {title: "pruefungsantritt", field: "antritt_bezeichnung"}, - // {title: "sponsion", field: "format_sponsion"}, - // {title: "anmerkung", field: "anmerkung"}, - // {title: "mobility_id", field: "mobility_id", visible: false}, - // {title: "typ", field: "pruefungstyp_kurzbz", visible: false}, - + {title: "Nation", field: "nation_code"}, + {title: "Von", field: "von"}, + {title: "Bis", field: "bis"}, + {title: "bisio_id", field: "bisio_id"}, { title: 'Aktionen', field: 'actions', minWidth: 150, // Ensures Action-buttons will be always fully displayed @@ -139,24 +130,9 @@ export default { } } ], - tabulatorData: [], - lastSelected: null, formData: { }, statusNew: true, - arrTypen: [], - arrAntritte: [], - arrBeurteilungen: [], - arrAkadGrad: [], - arrNoten: [], - filteredMitarbeiter: [], - filteredPruefer: [], - abortController: { - mitarbeiter: null, - pruefer: null - }, - stgTyp: null, - stgKz: null, } }, watch: { @@ -304,7 +280,7 @@ export default { > - +