diff --git a/application/controllers/components/stv/Notiz.php b/application/controllers/components/stv/Notiz.php index 89466f97c..eb0711f9a 100644 --- a/application/controllers/components/stv/Notiz.php +++ b/application/controllers/components/stv/Notiz.php @@ -64,24 +64,33 @@ class Notiz extends FHC_Controller { /* var_dump($this->input->post('titel')); var_dump($this->input->post('anhang'));*/ + var_dump($_FILES); + var_dump($_FILES["anhang"]["name"]); $this->load->library('form_validation'); $this->load->library('DmsLib'); + $dms_id = null; - $name = $this->input->post('anhang')['name']; + $uid = getAuthUID(); + $dms = array( + 'kategorie_kurzbz' => 'notiz', + 'version' => 0, + 'name' => $_FILES["anhang"]["name"], + 'mimetype' => $_FILES["anhang"]["type"], + 'insertamum' => date('c'), + 'insertvon' => $uid + ); + var_dump($dms); + $result = $this->dmslib->upload($dms, 'anhang', array('pdf')); - //$this->DmsLib->add($name, $mimetype, $fileHandle); - - -/* $this->form_validation->set_rules('titel', 'titel', 'required'); - $this->form_validation->set_rules('text', 'Text', 'required'); - - if ($this->form_validation->run() == false) + if (isSuccess($result)) { - return $this->outputJsonError($this->form_validation->error_array()); - }*/ + $dms_id = $result->retval['dms_id']; + //var_dump($dms_id); + } + $this->load->model('person/Notiz_model', 'NotizModel'); @@ -89,11 +98,45 @@ class Notiz extends FHC_Controller $titel = isset($_POST['titel']) ? $_POST['titel'] : null; $text = isset($_POST['text']) ? $_POST['text'] : null; $verfasser_uid = $uid; - $start = isset($_POST['von']) ? $_POST['von'] : null; - $ende = isset($_POST['bis']) ? $_POST['bis'] : null; + + /* $start = isset($_POST['bis']) ? ($_POST['bis'] : null; + $ende = isset($_POST['bis']) ? $_POST['bis'] : null;*/ + + + if(isset($_POST['von'])) + { +/* $date = $_POST['von']; + $date = DateTime::createFromFormat('F-d-Y h:i A',$date); + var_dump($date); + $timestamp = strtotime($_POST['von']); + $start = date('Y-m-d', $timestamp);*/ + +/* $dateString = $_POST['von']; + $myDateTime = DateTime::createFromFormat('Y-m-d', $dateString); + $start= $myDateTime->format('Y-m-d');*/ + + //Todo(manu) check input format datepicker.. auch ohne null!!! + $start = '2023-01-01'; + } + else + $start = null; + + + if(isset($_POST['bis'])) + { + //Todo(manu) check input format datepicker + $ende = strtotime($_POST['bis']); + $ende = new DateTime($ende); + $ende = $ende->format('Y-m-d'); + } + else + $ende = null; + + + $erledigt = $_POST['erledigt']; - $result = $this->NotizModel->addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $start, $ende); + $result = $this->NotizModel->addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $start, $ende, $dms_id); // var_dump($result); @@ -146,8 +189,8 @@ class Notiz extends FHC_Controller $text = isset($_POST['text']) ? $_POST['text'] : null; $verfasser_uid = isset($_POST['verfasser_uid']) ? $_POST['verfasser_uid'] : null; $bearbeiter_uid = $uid; - $start = isset($_POST['von']) ? $_POST['von'] : null; - $ende = isset($_POST['bis']) ? $_POST['bis'] : null; + $start = isset($_POST['von']) ? new DateTime($_POST['von']) : null; + $ende = isset($_POST['bis']) ? new DateTime($_POST['bis']) : null; $erledigt = $_POST['erledigt']; $result = $this->NotizModel->update( @@ -177,6 +220,7 @@ class Notiz extends FHC_Controller public function deleteNotiz ($notiz_id) { + //Todo(manu) Notizzuordnung und NotizDokument ebenfalls berücksichtigen $this->load->model('person/Notiz_model', 'NotizModel'); $result = $this->NotizModel->delete( diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php index 372fb8485..e343efa60 100644 --- a/application/models/person/Notiz_model.php +++ b/application/models/person/Notiz_model.php @@ -137,7 +137,7 @@ class Notiz_model extends DB_Model * Add a Notiz for a given person */ //TODO(manu) add type for Notizzuordnung - public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis) + public function addNotizForPersonWithDoc($person_id, $titel, $text, $erledigt, $verfasser_uid, $von, $bis, $dms_id=null) { // Loads model Notizzuordnung_model $this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel'); @@ -152,6 +152,13 @@ class Notiz_model extends DB_Model { $notiz_id = $result->retval; $result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, 'person_id' => $person_id)); + + if($dms_id) + { + // Loads model Notizdokument_model + $this->load->model('person/Notizdokument_model', 'NotizdokumentModel'); + $result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id)); + } } // Transaction complete! diff --git a/application/models/person/Notizdokument_model.php b/application/models/person/Notizdokument_model.php new file mode 100644 index 000000000..6b141307f --- /dev/null +++ b/application/models/person/Notizdokument_model.php @@ -0,0 +1,14 @@ +dbTable = 'public.tbl_notiz_dokument'; + $this->pk= array('notiz_id' , 'dms_id'); + } +} \ No newline at end of file diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index 88bffa711..43dd32003 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -98,7 +98,11 @@ export default { }, methods: { handleFileChange(event) { + //single this.intAnhang = event.target.files[0]; + + //multiple + //this.intAnhang = event.target.files; }, }, template: ` @@ -134,23 +138,26 @@ component: {{intTitel}} {{intVon}} || {{intAnhang.name}} {{intAnhang}}
- - - -
-

Selected File: {{ intAnhang.name }}

- -
- - - - + + + +
+

Selected File: {{ intAnhang.name }}

+ +
+ + + + + +
+ @@ -174,12 +181,12 @@ component: {{intTitel}} {{intVon}} || {{intAnhang.name}} {{intAnhang}}
- +
- +
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js index 7e28e6985..a0b0dd444 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js @@ -103,7 +103,7 @@ export default { }, actionNewNotiz(){ this.formData.titel = ''; - this.formData.action = 'Neue Notiz'; + this.formData.action = 'Neue Notiz2'; this.formData.text = null; this.formData.von = null; this.formData.bis = null; @@ -114,10 +114,10 @@ export default { this.formData.anhang = []; }, addNewNotiz(notizData) { - console.log(this.formData); + //console.log(this.formData); const formData = new FormData(); Object.entries(this.formData).forEach(([k, v]) => formData.append(k, v)); - console.log(formData); + //console.log(formData); CoreRESTClient.post('components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id, formData, { Headers: { "Content-Type": "multipart/form-data" } } @@ -204,6 +204,7 @@ export default { this.formData.verfasser = null; this.formData.bearbeiter = null; this.formData.anhang = []; + //this.formData.anhang = {}; }, updateNotiz(notiz_id){ CoreRESTClient.post('components/stv/Notiz/updateNotiz/' + notiz_id, @@ -231,7 +232,6 @@ export default { }, template: `
- {{modelValue}} @@ -281,7 +281,7 @@ export default {
- parent: {{anhang}} | {{formData.anhang.name}} + parent: {{formData.anhang}} | {{formData.anhang.name}}
`