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 406c41827..c927ed141 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -333,12 +333,14 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
cssClass: 'chat-popover',
componentProps: {
roomId: this.roomId,
+ members: this.members,
},
});
await modal.present();
modal.onDidDismiss().then(res=>{
if(res.data == 'leave'){
console.log('saiu do grupo');
+ //this.wsChatMethodsService.subscribeToRoomUpdate(this.roomId, this.room);
}
else if(res.data == 'cancel'){
console.log('cancel');
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 7b1ee94b9..3ed43e24f 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -92,55 +92,64 @@
-
-
-
-
-
-
-
-
-
- {{msg.u.name}}
- {{showDateDuration(msg._updatedAt)}}
-
-
-
{{msg.msg}}
-
-
-
-

-
-
+
+
+
+ AQUI
+
+
+
+
+
+
+
+ {{msg.u.name}}
+ {{showDateDuration(msg._updatedAt)}}
+
+
+
+
+
+

+
-
-
-
-
-
-
-
-
-
-
{{file.title}}
+
+
+
+
+
+
+
+
+
+
+ {{file.title}}
+
+
+
+
+ {{file.description}}
+ •
+ {{msg.file.type.replace('application/','').toUpperCase()}}
+
-
-
-
- {{file.description}}
- •
- {{msg.file.type.replace('application/','').toUpperCase()}}
-
+ {{last ? scrollToBottom() : ''}}
- {{last ? scrollToBottom() : ''}}
+
+ {{msg.u.name}} criou esta reunião
+
+ De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}
+ {{msg.file.venue}}
+
+
-
+
@@ -167,7 +175,7 @@
-
+ -->
@@ -198,7 +206,7 @@
{{last ? scrollToBottom() : ''}}
-
+
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 37f8abdb4..df6e4fc46 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -112,7 +112,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
//this.scrollToBottom();
this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory();
this.wsChatMethodsService.getGroupRoom(this.roomId).getMsgFromDB();
- console.log('MESSAGES'+this.wsChatMethodsService.getGroupRoom(this.roomId).massages);
+ console.log('MESSAGES'+ this.wsChatMethodsService.getGroupRoom(this.roomId).massages);
this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked
setTimeout(()=>{
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 5ceb5633e..bae7b0af1 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -56,63 +56,73 @@
{{last ? scrollToBottom() : ''}}
-
-
-
-
-
-
-
-
-
- {{msg.u.name}}
- {{showDateDuration(msg._updatedAt)}}
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-
-
-
-
-
-
- {{file.title}}
-
+
+
+
+
+
+
+
+
+
+
+ {{msg.u.name}}
+ {{showDateDuration(msg._updatedAt)}}
+
+
+
+
+
+
-
-
- {{file.description}}
- •
- {{msg.file.type.replace('application/','').toUpperCase()}}
-
+
+
+
+
+
+
+
+
+
+
+ {{file.title}}
+
+
+
+
+ {{file.description}}
+ •
+ {{msg.file.type.replace('application/','').toUpperCase()}}
+
+
+ {{last ? scrollToBottom() : ''}}
- {{last ? scrollToBottom() : ''}}
-
+
+ {{msg.u.name}} criou esta reunião
+
+
+ De {{showDateDuration(msg.file.start_date)}} a
+ {{showDateDuration(msg.file.end_date)}}
+
+
+
+ {{msg.file.venue}}
+
+
-
+
File
@@ -141,10 +150,10 @@
-
+
-->
-
+
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts
index 89fb4a101..d15e5abdb 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.ts
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts
@@ -96,6 +96,7 @@ export class ChatPopoverPage implements OnInit {
}
this.close('leave');
+ //this.wsChatMethodsService.subscribeToRoomUpdate(this.roomId, res.result);
/* this.chatService.getRoomInfo(this.roomId).subscribe(room=>{