From 79b0c76cfda2ff8acb74704aac5f0b3bfb133d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Wed, 30 Aug 2023 18:41:13 +0100 Subject: [PATCH] try to solved add file --- src/app/pages/chat/messages/messages.page.ts | 8 +++++++- version/git-version.ts | 12 ++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index f7782a9c4..982face49 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -824,17 +824,23 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { const roomId = this.roomId const file: any = await this.fileService.getFileFromDevice(types); + console.log(file) if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") { + console.log(file.type) const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch ((error) => { console.error(error); }))); + console.log(encodedData) const blob = this.fileService.base64toBlob(encodedData, file.type) - + console.log(blob + ) const fileBase64 = await this._getBase64(file) + console.log(fileBase64) + const formData = new FormData(); formData.append('blobFile', blob); diff --git a/version/git-version.ts b/version/git-version.ts index 5fb986f33..e0154fe9f 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "377ba3fda", - "SHA": "377ba3fda33950713e38165f5cbfddccc7658ac5", + "shortSHA": "71ab74974", + "SHA": "71ab74974dba34ac084234c233e2a2be76d51241", "branch": "developer-prod", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Wed Aug 30 14:02:14 2023 +0100'", - "lastCommitMessage": "update profile picture after close modal", - "lastCommitNumber": "5237", + "lastCommitTime": "'Wed Aug 30 17:07:08 2023 +0100'", + "lastCommitMessage": "add picture from gallery on chat grup solved", + "lastCommitNumber": "5238", "change": "", - "changeStatus": "On branch developer-prod\nYour branch is ahead of 'origin/developer-prod' by 1 commit.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/delegar/delegar.page.html\n\tmodified: src/app/modals/document-detail/document-detail.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/forward/forward.page.html\n\tmodified: src/app/modals/view-event/view-event.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/events/edit-event/edit-event.page.html\n\tmodified: src/app/pages/events/event-detail-modal/event-detail-modal.page.html\n\tmodified: src/app/pages/events/event-detail/event-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/services/events/edit-event/edit-event.page.html\n\tmodified: src/app/services/events/event-detail-modal/event-detail-modal.page.html\n\tmodified: src/app/services/events/event-detail/event-detail.page.html\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.html\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.html", + "changeStatus": "On branch developer-prod\nYour branch is behind 'origin/developer-prod' by 7 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/messages/messages.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file