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

Merge branch 'developer-prod' of bitbucket.org:equilibriumito/gabinete-digital-fo into chat/labels3

Browse Source
This commit is contained in:
Peter Maquiran
2023-09-12 21:16:42 +01:00
parent 81e711e28c 474e791c71
commit 86915ee911
43 changed files with 1383 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/edit-group/edit-group.page.ts
+1 -2
View File
@@ -157,9 +157,8 @@ export class EditGroupPage implements OnInit {
{
name: 'minutes',
prefix: 'Minutos',
selectedIndex: 3,
selectedIndex: 0,
options: [
{ text: '0', value: 0 },
{ text: '5', value: 5 },
{ text: '10', value: 10 },
{ text: '15', value: 15 },
src/app/pages/chat/group-messages/group-messages.page.ts
+3 -6
View File
@@ -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
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/pages/chat/new-group/new-group.page.ts
+1 -2
View File
@@ -287,9 +287,8 @@ export class NewGroupPage implements OnInit {
{
name: 'minutes',
prefix: 'Minutos',
selectedIndex: 3,
selectedIndex: 0,
options: [
{ text: '0', value: 0 },
{ text: '5', value: 5 },
{ text: '10', value: 10 },
{ text: '15', value: 15 },