peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

upload file on chat its done

Browse Source
This commit is contained in:
Eudes Inácio
2023-08-31 13:07:52 +01:00
parent 081fe8692c
commit 36bd1fb6a1
6 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/group-messages/group-messages.page.ts
+3 -6
View File
@@ -821,9 +821,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
})));
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
src/app/pages/chat/messages/messages.page.ts
+17 -9
View File
@@ -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,
}
src/app/shared/chat/group-messages/group-messages.page.html
+2 -2
View File
@@ -272,9 +272,9 @@
<!-- <ion-fab-button *ngIf="p.userPermission([p.permissionList.Agenda.access])" title="Nova Reunião" (click)="bookMeeting()" color="light">
<ion-icon name="calendar"></ion-icon>
</ion-fab-button> -->
<!-- <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
<ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
<ion-icon name="document"></ion-icon>
</ion-fab-button> -->
</ion-fab-button>
<ion-fab-button title="Anexar Fotografia" (click)="addImage()" color="light">
<ion-icon name="image"></ion-icon>
</ion-fab-button>
src/app/shared/chat/messages/messages.page.html
+2 -2
View File
@@ -252,9 +252,9 @@
<!-- <ion-fab-button *ngIf="p.userPermission([p.permissionList.Agenda.access])" title="Nova Reunião" (click)="bookMeeting()" color="light">
<ion-icon name="calendar"></ion-icon>
</ion-fab-button> -->
<!-- <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
<ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
<ion-icon name="document"></ion-icon>
</ion-fab-button> -->
</ion-fab-button>
<ion-fab-button title="Anexar Fotografia" (click)="addImage()" color="light">
<ion-icon name="image"></ion-icon>
</ion-fab-button>
src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+1 -1
View File
@@ -7,7 +7,7 @@
</div>
<div class="buttons">
<button (click)="takePicture()" full class="btn-ok" shape="round" >Tirar Fotografia</button>
<!-- <button (click)="addFile()" class="btn-ok" shape="round" >Anexar Documento</button> -->
<button (click)="addFile()" class="btn-ok" shape="round" >Anexar Documento</button>
<button (click)="anexarFoto()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
<button (click)="addDocGestaoDocumental()" class="btn-ok" shape="round" >Gestão Documental</button>
<div class="solid"></div>
version/git-version.ts
+6 -6
View File
@@ -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 <file>...\" 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"
}