diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 465028aa5..d1d774d88 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -820,9 +820,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { console.error(error); }))); const blob = this.fileService.base64toBlob(encodedData, file.type) - - - const fileBase64 = await this._getBase64(file) const formData = new FormData(); formData.append('blobFile', blob); @@ -841,7 +838,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { }], temporaryData: formData, attachmentsModelData: { - fileBase64: fileBase64 + fileBase64: encodedData } }); @@ -1084,7 +1081,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { } async openFile(pdfString, filename, type) { - const blob = this.b64toBlob(pdfString, 'application/pdf') + const blob = this.b64toBlob(pdfString, type) let pathFile = '' const fileName = filename const contentFile = blob @@ -1097,7 +1094,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { await Filesystem.writeFile({ path: fileName, data: pdfString, - directory: Directory.Documents, + directory: Directory.Data, }).then((dir) => { console.log('DIR ', dir) this.fileOpener diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 468d9d7ff..bed821ac1 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -829,24 +829,32 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { console.log(file) + /* const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch ((error) => { + console.error(error); + }))); + const blob = this.fileService.base64toBlob(encodedData, file.type) + + const fileBase64 = await this._getBase64(file) + + const formData = new FormData(); + formData.append('blobFile', blob); + console.log('add file', fileBase64) */ + + if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") { console.log('TYPE',file.type) - const encodedData = 'data:application/pdf;base64,'+btoa(JSON.stringify(await this.getBase64(file).catch ((error) => { + 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 BLOB',blob) - /* const fileBase64 = await this._getBase64(file) - console.log('BASE&$',fileBase64) */ - - /* const formData = new FormData(); - console.log('add file', formData) - formData.append('blobFile', blob); */ - let ob = {'blobFile': blob} + const formData = new FormData(); + formData.append('blobFile', blob); + /* console.log('add file', fileBase64) */ this.ChatSystemService.getDmRoom(roomId).send({ file: { @@ -859,7 +867,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { // "text": "description", "title_link_download": false, }], - temporaryData: ob, + temporaryData: formData, attachmentsModelData: { fileBase64: encodedData, } diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index cf9595b2e..0d4b5eb4b 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -272,9 +272,9 @@ - + diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 08529f5b5..165bd22d4 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -252,9 +252,9 @@ - + diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html index 53374f8c3..1d4959f4c 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html @@ -7,7 +7,7 @@
- +
diff --git a/version/git-version.ts b/version/git-version.ts index 591901147..773947f30 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "4eff2575b", - "SHA": "4eff2575b69312a72f16c8e30e03bd6a797bb762", + "shortSHA": "081fe8692", + "SHA": "081fe8692c8575cc102a91c6357d193d52cb9c0f", "branch": "developer-prod", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Wed Aug 30 20:54:47 2023 +0100'", - "lastCommitMessage": "add file on chat its hide", - "lastCommitNumber": "5250", + "lastCommitTime": "'Wed Aug 30 20:56:46 2023 +0100'", + "lastCommitMessage": "pull made", + "lastCommitNumber": "5252", "change": "", - "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 3 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/models/folder.model.ts\n\tmodified: src/assets/images/theme/gov/icons-delete.svg", + "changeStatus": "On branch developer-prod\nYour branch is up to date with 'origin/developer-prod'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.html\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.html", "changeAuthor": "eudes.inacio" } \ No newline at end of file