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

remove promise bug

Browse Source
This commit is contained in:
Eudes Inácio
2022-12-20 17:06:19 +01:00
parent c8d62760ce
commit 111214d231
22 changed files with 128 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/chat.page.ts
+11 -1
View File
@@ -403,10 +403,14 @@ export class ChatPage implements OnInit {
//
//
}).catch((error) => {
console.error('storage getdirectmessagedb: ',error)
})
this.storageservice.get('chatusers').then((users) => {
this.dmUsers = users.filter(data => data.username != SessionStore.user.UserName);
}).catch((error) => {
console.error('storage getchatusers: ',error)
})
} else {
this.sqlservice.getAllChatRoom().then((rooms: any) => {
@@ -557,10 +561,14 @@ export class ChatPage implements OnInit {
//
}).catch((error) => {
console.error('storage getGrup Romm db: ',error)
})
this.storageservice.get('chatusers').then((users) => {
this.dmUsers = users.filter(data => data.username != SessionStore.user.UserName);
}).catch((error) => {
console.error('storage getgrupDb: ',error)
})
} else {
this.sqlservice.getAllChatRoom().then((rooms: any) => {
@@ -662,7 +670,9 @@ export class ChatPage implements OnInit {
else {
//Check if modal is opened
if (this.segment == "Grupos" && this.showGroupMessages != true) {
await new Promise(resolve => setTimeout(resolve, 1000));
await new Promise(resolve => setTimeout(resolve, 1000)).catch ((error) => {
console.error(error);
});
//await this.getGroups();
}
}
src/app/pages/chat/group-messages/group-messages.page.ts
+6 -2
View File
@@ -733,7 +733,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {
const encodedData = btoa(JSON.stringify(await this.getBase64(file)));
const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch ((error) => {
console.error(error);
})));
const blob = this.base64toBlob(encodedData, file.type)
const formData = new FormData();
@@ -977,7 +979,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
} else {
//Check if modal is opened
if (document.querySelector('.isGroupChatOpened')) {
await new Promise(resolve => setTimeout(resolve, 5000));
await new Promise(resolve => setTimeout(resolve, 5000)).catch ((error) => {
console.error(error);
});
await this.serverLongPull();
}
src/app/pages/chat/messages/messages.page.ts
+5 -1
View File
@@ -154,6 +154,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
// this.chatService.refreshtoken();
this.ChatSystemService.getUserOfRoom(this.roomId).then((value) => {
}).catch((error) => {
console.error(error)
})
this.getChatMembers();
@@ -747,7 +749,9 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {
const encodedData = btoa(JSON.stringify(await this.getBase64(file)));
const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch ((error) => {
console.error(error);
})));
const blob = this.base64toBlob(encodedData, file.type)