From a32cda96d0f1c3d06fada39fb1748925a64d1342 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Wed, 22 Nov 2023 15:58:18 +0100 Subject: [PATCH] tidy up, z-Index for Modal --- .../controllers/components/stv/Student.php | 116 ------------------ public/js/apps/Studentenverwaltung.js | 6 +- 2 files changed, 5 insertions(+), 117 deletions(-) diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php index c59092c7f..80b0a6a5a 100644 --- a/application/controllers/components/stv/Student.php +++ b/application/controllers/components/stv/Student.php @@ -308,120 +308,4 @@ class Student extends FHC_Controller } return true; } - - public function getAdressen($person_id) - { - $this->load->model('person/Adresse_model', 'AdresseModel'); - $this->load->model('person/Adressentyp_model', 'AdressentypModel'); - $this->load->model('ressource/firma_model', 'FirmaModel'); - - $this->AdresseModel->addSelect('*'); - $this->AdressentypModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)'); - $this->FirmaModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT'); - - $result = $this->AdresseModel->loadWhere( - array('person_id' => $person_id) - ); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson(getError($result)); - } else { - $this->outputJson(getData($result) ?: []); - } - } - - public function addNewAddress($person_id) - { - $_POST = json_decode(utf8_encode($this->input->raw_input_stream), true); - - //var_dump($_POST); - //echo ($_POST['ort']); - $this->load->model('person/Adresse_model', 'AdresseModel'); - // Load Libraries - $this->load->library('AuthLib'); - $this->load->library('VariableLib', ['uid' => getAuthUID()]); - - $result = $this->AdresseModel->insert( - [ - 'person_id' => $person_id, - 'strasse' => $_POST['strasse'], - 'insertvon' => 'FHC4', - 'insertamum' => date('c'), - 'plz' => $_POST['plz'], - 'ort' => $_POST['ort'], - 'gemeinde' => $_POST['gemeinde'], - 'nation' => $_POST['nation'], - 'heimatadresse' => $_POST['heimatadresse'], - 'zustelladresse' => $_POST['zustelladresse'], - 'co_name' => $_POST['co_name'], - 'typ' => $_POST['typ'] - ] - ); - - if (isError($result)) - { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - return $this->outputJson($result); - } - return $this->outputJsonSuccess(true); - } - - public function getAdressentypen() - { - $this->load->model('person/Adressentyp_model', 'AdressentypModel'); - - $result = $this->AdressentypModel->load(); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson(getError($result)); - } else { - $this->outputJson(getData($result) ?: []); - } - } - - public function getGmeinden($plz) - { - //TODO(manu) finish - $result = ""; - return $result; - } - - public function getKontakte($person_id) - { - $this->load->model('person/Kontakt_model', 'KontaktModel'); - $this->load->model('organisation/standort_model', 'StandortModel'); - $this->load->model('ressource/firma_model', 'FirmaModel'); - - $this->KontaktModel->addSelect('*'); - $this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT'); - $this->StandortModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT'); - - $result = $this->KontaktModel->loadWhere( - array('person_id' => $person_id) - ); - - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson(getError($result)); - } else { - $this->outputJson(getData($result) ?: []); - } - } - - public function getBankverbindung($person_id) - { - $this->load->model('person/Bankverbindung_model', 'BankverbindungModel'); - - $this->BankverbindungModel->addSelect('*'); - - $result = $this->BankverbindungModel->loadWhere( - array('person_id' => $person_id) - ); - if (isError($result)) { - $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); - $this->outputJson(getError($result)); - } else { - $this->outputJson(getData($result) ?: []); - } - } } diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js index e6a93c5c5..dc26047ac 100644 --- a/public/js/apps/Studentenverwaltung.js +++ b/public/js/apps/Studentenverwaltung.js @@ -40,7 +40,11 @@ const app = Vue.createApp(); app .use(router) - .use(PvConfig) + .use(PvConfig, { + zIndex: { + overlay: 1100 + } + }) .use(FhcAlert) .mount('#main');