From 737c9937c9f32820fb1f9668f539d21221f6a5da Mon Sep 17 00:00:00 2001 From: ma0048 Date: Thu, 27 Feb 2025 09:07:23 +0100 Subject: [PATCH] - namen bei tags - phrasen hinzugefuegt --- application/core/Tag_Controller.php | 39 +++++++++++--- public/js/components/Tag/Tag.js | 41 ++++++++++----- system/phrasesupdate.php | 80 +++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 19 deletions(-) diff --git a/application/core/Tag_Controller.php b/application/core/Tag_Controller.php index 6f6cef31b..10e54780e 100644 --- a/application/core/Tag_Controller.php +++ b/application/core/Tag_Controller.php @@ -33,22 +33,30 @@ class Tag_Controller extends FHCAPI_Controller public function getTag() { + $language = $this->_getLanguageIndex(); $id = $this->input->get('id'); $this->NotizModel->addSelect( - 'tbl_notiz.titel, + "tbl_notiz.titel, tbl_notiz.text, - array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung, + array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $language. " as bezeichnung, tbl_notiz.notiz_id, tbl_notiz_typ.style, tbl_notiz.erledigt as done, tbl_notiz.insertamum, tbl_notiz.updateamum, - tbl_notiz.insertvon, - tbl_notiz.updatevon - ' + (verfasserperson.vorname || ' ' || verfasserperson.nachname || ' ' || '(' || verfasserbenutzer.uid || ')') as verfasser, + (bearbeiterperson.vorname || ' ' || bearbeiterperson.nachname || ' ' || '(' || bearbeiterbenutzer.uid || ')') as bearbeiter + " ); $this->NotizModel->addJoin('public.tbl_notiz_typ', 'public.tbl_notiz.typ = public.tbl_notiz_typ.typ_kurzbz'); + + $this->NotizModel->addJoin('public.tbl_benutzer verfasserbenutzer', 'tbl_notiz.verfasser_uid = verfasserbenutzer.uid', 'LEFT'); + $this->NotizModel->addJoin('public.tbl_person verfasserperson', 'verfasserbenutzer.person_id = verfasserperson.person_id', 'LEFT'); + + $this->NotizModel->addJoin('public.tbl_benutzer bearbeiterbenutzer', 'tbl_notiz.verfasser_uid = bearbeiterbenutzer.uid', 'LEFT'); + $this->NotizModel->addJoin('public.tbl_person bearbeiterperson', 'bearbeiterbenutzer.person_id = bearbeiterperson.person_id', 'LEFT'); + $notiz = $this->NotizModel->loadWhere(array('notiz_id' => $id)); $this->terminateWithSuccess(hasData($notiz) ? getData($notiz)[0] : array()); @@ -134,7 +142,11 @@ class Tag_Controller extends FHCAPI_Controller { $postData = $this->getPostJson(); $updateData = $this->NotizModel->update(array('notiz_id' => $postData->id), - array('text' => $postData->notiz) + array('text' => $postData->notiz, + 'updateamum' => date('Y-m-d H:i:s'), + 'updatevon' => $this->_uid, + 'bearbeiter_uid' => $this->_uid, + ) ); $this->terminateWithSuccess($updateData); } @@ -142,7 +154,11 @@ class Tag_Controller extends FHCAPI_Controller { $postData = $this->getPostJson(); $updateData = $this->NotizModel->update(array('notiz_id' => $postData->id), - array('erledigt' => !$postData->done) + array('erledigt' => !$postData->done, + 'updateamum' => date('Y-m-d H:i:s'), + 'updatevon' => $this->_uid, + 'bearbeiter_uid' => $this->_uid, + ) ); $this->terminateWithSuccess($updateData); @@ -183,5 +199,14 @@ class Tag_Controller extends FHCAPI_Controller show_error('User authentification failed'); } + private function _getLanguageIndex() + { + $this->load->model('system/Sprache_model', 'SpracheModel'); + $this->SpracheModel->addSelect('index'); + $result = $this->SpracheModel->loadWhere(array('sprache' => getUserLanguage())); + + return hasData($result) ? getData($result)[0]->index : 1; + } + } \ No newline at end of file diff --git a/public/js/components/Tag/Tag.js b/public/js/components/Tag/Tag.js index ca3d28fdd..c7552a5a9 100644 --- a/public/js/components/Tag/Tag.js +++ b/public/js/components/Tag/Tag.js @@ -82,10 +82,10 @@ export default { this.tagData.style = item.style; this.tagData.zuordnung_typ = this.zuordnung_typ; this.tagData.done = item.done; - this.tagData.insertamum = item.insertamum; - this.tagData.updateamum = item.updateamum; - this.tagData.updatevon = item.updatevon; - this.tagData.insertvon = item.insertvon; + this.tagData.insertamum = this.formatDateTime(item.insertamum) + this.tagData.updateamum = this.formatDateTime(item.updateamum) + this.tagData.bearbeiter = item.bearbeiter; + this.tagData.verfasser = item.verfasser; if (item && item.notiz_id) { @@ -146,8 +146,6 @@ export default { this.$refs.tagModal.hide(); }); } - - }, async doneTag() { @@ -181,18 +179,29 @@ export default { id: "", done: false, insertamum: "", - insertvon: "", + verfasser: "", updateamum: "", - updatevon: "", + bearbeiter: "", response: "" }; this.selectedTagId = null; this.mode = "create"; + }, + formatDateTime: (dateString) => { + if (!dateString) return null; + return new Date(dateString).toLocaleString('de-AT', { + year: "numeric", + month: "2-digit", + day: "2-digit", + hour: "2-digit", + minute: "2-digit", + second: "2-digit" + }); } }, template: `
- +