diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index 82d494a16..d5307f7c2 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -100,7 +100,8 @@ class Notiz extends FHC_Controller } } - //Überprüfung ob type übergeben wurde (entweder Funktions- oder Postparameter) + //Überprüfung ob type übergeben wurde (via Funktions- oder Postparameter) + $type = null; if ($paramTyp) $type = $paramTyp; if(isset($_POST['typeId'])) @@ -108,8 +109,10 @@ class Notiz extends FHC_Controller if(!$type) { - //Todo(manu) return error - var_dump("ERROR no type"); + $result = error('kein Type für ID vorhanden', EXIT_ERROR); + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + + return $this->outputJson(getError($result)); } //Form Validation @@ -126,7 +129,7 @@ class Notiz extends FHC_Controller $erledigt = $this->input->post('erledigt'); $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : $uid; $bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null; - //$type = $this->input->post('typeId'); + $type = $this->input->post('typeId'); $start = $this->input->post('von'); $ende = $this->input->post('bis'); diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php index aac679915..5684bf3ed 100644 --- a/application/models/person/Notiz_model.php +++ b/application/models/person/Notiz_model.php @@ -156,14 +156,21 @@ class Notiz_model extends DB_Model $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel'); //check if valid type - $isValidType = $this->NotizzuordnungModel->isValidType($type); + $result = $this->NotizzuordnungModel->isValidType($type); + if (isError($result)) + { + $this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR); + $result = error($result->retval, EXIT_ERROR); + return $result; + } +/* if(!$isValidType) { //Todo manu (correct return to controller) $msg = "datatype " . $type . " not implemented for notes"; return error($msg, EXIT_ERROR); - } + }*/ // Start DB transaction $this->db->trans_start(false); diff --git a/application/models/person/Notizzuordnung_model.php b/application/models/person/Notizzuordnung_model.php index 542c68e6f..8a6672424 100644 --- a/application/models/person/Notizzuordnung_model.php +++ b/application/models/person/Notizzuordnung_model.php @@ -14,7 +14,6 @@ class Notizzuordnung_model extends DB_Model public function isValidType($type) { - //var_dump($type); $validTypes = []; $qry = " @@ -22,24 +21,25 @@ class Notizzuordnung_model extends DB_Model FROM information_schema.columns WHERE table_schema = 'public' AND table_name = 'tbl_notizzuordnung' + AND column_name not in ('notizzuordnung_id', 'notiz_id') "; $type_arr = $this->execQuery($qry); $type_arr = $type_arr->retval; - foreach ($type_arr as $t) { + foreach ($type_arr as $t) + { $validTypes[] = $t->column_name; } if (in_array($type, $validTypes)) { - // var_dump($type . " is IN ARRAY"); - return true; + $result = success('Type of Id is valid'); } else { - //var_dump($type . " is NOT IN ARRAY"); - return false; + $result = error('Type of Id is not valid'); } + return $result; } } diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index 3c1bbab27..6850feff8 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -30,7 +30,6 @@ export default { multiupload: true, mitarbeiter: [], filteredMitarbeiter: [], -/* filteredFirmen: []*/ } }, computed: { @@ -50,14 +49,6 @@ export default { this.$emit('update:text', value); } }, -/* intLastChange: { - get() { - return this.lastChange; - }, - set(value) { - this.$emit('update:lastChange', value); - } - },*/ intVon: { get() { return this.von; @@ -128,7 +119,6 @@ export default { reset() { this.$refs.form.reset(); this.intAnhang = null; - //this.$emit('update:anhang', []); }, search(event) { @@ -143,7 +133,8 @@ export default { template: `