From d48a0b62fd68566d0412b5cf944c979bda553ebd Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 24 Apr 2025 12:59:47 +0200 Subject: [PATCH] Refactoring FhcApi_Factory --- public/js/api/factory/messages/messages.js | 2 - public/js/api/messages/person.js | 91 +++++++++---------- .../Messages/Details/NewMessage/Modal.js | 2 - .../Messages/Details/NewMessage/NewDiv.js | 13 +-- .../Messages/Details/TableMessages.js | 33 ++++--- 5 files changed, 64 insertions(+), 77 deletions(-) diff --git a/public/js/api/factory/messages/messages.js b/public/js/api/factory/messages/messages.js index 8424e14f2..cec34ad8b 100644 --- a/public/js/api/factory/messages/messages.js +++ b/public/js/api/factory/messages/messages.js @@ -16,9 +16,7 @@ */ export default { - //TODO(manu) check how to get params size and page getMessages(params) { - console.log('page ' + params.page + ' size ' + params.size); return { method: 'get', url: 'api/frontend/v1/messages/messages/getMessages/' diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js index f41050770..e2d2fd0c4 100644 --- a/public/js/api/messages/person.js +++ b/public/js/api/messages/person.js @@ -1,48 +1,47 @@ export default { - getMessages(url, config, params) { - console.log('page ' + params.page + ' size ' + params.size); - return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type + '/' + params.size + '/' + params.page); - }, -/* getVorlagen(){ - return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagen/'); - }, - getMsgVarsLoggedInUser(){ - return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsLoggedInUser/'); - }, - getMessageVarsPerson(params){ - return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessageVarsPerson/' + params.id + '/' + params.type_id); - }, - getMsgVarsPrestudent(params){ - return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + params.id + '/' + params.type_id); - }, - getPersonId(params){ - return this.$fhcApi.get('api/frontend/v1/messages/messages/getPersonId/'+ params.id + '/' + params.type_id); - }, - getUid(params){ - return this.$fhcApi.get('api/frontend/v1/messages/messages/getUid/'+ params.id + '/' + params.type_id); - }, - getVorlagentext(vorlage_kurzbz){ - return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz); - }, - getNameOfDefaultRecipient(params){ - return this.$fhcApi.get('api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id); - }, - getPreviewText(params, data){ - return this.$fhcApi.post('api/frontend/v1/messages/messages/getPreviewText/' + params.id + '/' + params.type_id, - data); - }, - getReplyData(messageId){ - return this.$fhcApi.get('api/frontend/v1/messages/messages/getReplyData/' + messageId); - }, - sendMessageFromModalContext(form, id, data) { - return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id, - data); - }, - sendMessage(id, data) { - return this.$fhcApi.post('api/frontend/v1/messages/messages/sendMessage/' + id, - data); - }, - deleteMessage(messageId){ - return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId); - }*/ + getMessages(url, config, params) { + return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type + '/' + params.size + '/' + params.page); + }, + getVorlagen(){ + return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagen/'); + }, + getMsgVarsLoggedInUser(){ + return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsLoggedInUser/'); + }, + getMessageVarsPerson(params){ + return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessageVarsPerson/' + params.id + '/' + params.type_id); + }, + getMsgVarsPrestudent(params){ + return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + params.id + '/' + params.type_id); + }, + getPersonId(params){ + return this.$fhcApi.get('api/frontend/v1/messages/messages/getPersonId/'+ params.id + '/' + params.type_id); + }, + getUid(params){ + return this.$fhcApi.get('api/frontend/v1/messages/messages/getUid/'+ params.id + '/' + params.type_id); + }, + getVorlagentext(vorlage_kurzbz){ + return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz); + }, + getNameOfDefaultRecipient(params){ + return this.$fhcApi.get('api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id); + }, + getPreviewText(params, data){ + return this.$fhcApi.post('api/frontend/v1/messages/messages/getPreviewText/' + params.id + '/' + params.type_id, + data); + }, + getReplyData(messageId){ + return this.$fhcApi.get('api/frontend/v1/messages/messages/getReplyData/' + messageId); + }, + sendMessageFromModalContext(form, id, data) { + return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id, + data); + }, + sendMessage(id, data) { + return this.$fhcApi.post('api/frontend/v1/messages/messages/sendMessage/' + id, + data); + }, + deleteMessage(messageId){ + return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId); + } } \ No newline at end of file diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js index 5bbf29f16..d44d0faeb 100644 --- a/public/js/components/Messages/Details/NewMessage/Modal.js +++ b/public/js/components/Messages/Details/NewMessage/Modal.js @@ -241,7 +241,6 @@ export default { if (!newMessageId) return; try { - //const result = await this.$fhcApi.factory.messages.person.getReplyData(newMessageId); const result = await this.$api.call(ApiMessages.getReplyData(newMessageId)); this.replyData = result.data; @@ -264,7 +263,6 @@ export default { id: this.id, type_id: this.typeId }; - //this.$fhcApi.factory.messages.person.getMessageVarsPerson(params) this.$api .call(ApiMessages.getMessageVarsPerson(params)) .then(result => { diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js index 11335ed2a..34401f6ea 100644 --- a/public/js/components/Messages/Details/NewMessage/NewDiv.js +++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js @@ -118,11 +118,6 @@ export default { ...params }; data.append('data', JSON.stringify(merged)); - - //this.uid is necessary for existing sendFunction -/* return this.$fhcApi.factory.messages.person.sendMessage( - this.uid, - data)*/ return this.$api .call(ApiMessages.sendMessage(this.uid, data)) .then(response => { @@ -143,7 +138,6 @@ export default { ); }, getVorlagentext(vorlage_kurzbz){ - // return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz) return this.$api .call(ApiMessages.getVorlagentext(vorlage_kurzbz)) .then(response => { @@ -157,9 +151,6 @@ export default { const data = new FormData(); data.append('data', JSON.stringify(this.formData.body)); -/* return this.$fhcApi.factory.messages.person.getPreviewText({ - id: id, - type_id: typeId}, data)*/ return this.$api .call(ApiMessages.getPreviewText({ id: this.id, @@ -174,7 +165,6 @@ export default { insertVariable(selectedItem){ if (this.editor) { this.editor.insertContent(selectedItem.value + " "); - // this.editor.insertContent(selectedItem.value + ". "); //TODO(Manu) check: Laden von Variblen geht nicht wenn kein Zeichen danach kommt // nicht mal mit Punkt adden gehts ohne eintrag nach vars //this.editor.focus(); @@ -272,7 +262,7 @@ export default { id: this.id, type_id: this.typeId }; - // this.$fhcApi.factory.messages.person.getMessageVarsPerson(params) + this.$api .call(ApiMessages.getMessageVarsPerson(params)) .then(result => { @@ -291,7 +281,6 @@ export default { id: this.id, type_id: this.typeId }; - //this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(params) this.$api .call(ApiMessages.getMsgVarsPrestudent(params)) .then(result => { diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js index 07fdd8f20..ac3d616ec 100644 --- a/public/js/components/Messages/Details/TableMessages.js +++ b/public/js/components/Messages/Details/TableMessages.js @@ -29,30 +29,17 @@ export default { }, data(){ return { -/* paginationSize: 15, - paginationInitialPage: 1,*/ + pageNo: 1, tabulatorOptions: { ajaxURL: 'dummy', - //TODO(Manu) how to handle size and page? -/* ajaxRequestFunc: () => this.$api.call( - ApiMessages.getMessages({ - id: this.id, - type: this.typeId, - size: this.paginationSize, - page: this.paginationInitialPage - }) - ),*/ - //OLD WORKING VERSION - ajaxRequestFunc: this.$fhcApi.factory.messages.person.getMessages, + ajaxRequestFunc: this.loadAjaxCall, ajaxParams: () => { return { id: this.id, type: this.typeId }; }, - ajaxResponse: (url, params, response) => this.buildTreemap(response), - //ajaxResponse: (url, params, response) => this.buildTreemap(response.data), columns: [ {title: "subject", field: "subject"}, {title: "body", field: "body", visible: false}, @@ -220,6 +207,12 @@ export default { this.previewBody = body; } }, + { + event: 'pageLoaded', + handler: (pageno) => { + this.pageNo = pageno+1; + } + } ], previewBody: "", open: false, @@ -296,6 +289,16 @@ export default { if (iteration > messages.length) break; } return {data: messageNested, last_page}; + }, + loadAjaxCall(params){ + return this.$api.call( + ApiMessages.getMessages({ + id: this.id, + type: this.typeId, + size: this.tabulatorOptions.paginationSize, + page: this.pageNo + }) + ); } }, computed: {