mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
Merge branch 'bugfix/open-chat-on-create-event' into develop_bitOut
This commit is contained in:
@@ -229,6 +229,9 @@ export class ChatPage implements OnInit {
|
||||
}
|
||||
}
|
||||
openMessagesPage(rid) {
|
||||
|
||||
this.roomId = rid;
|
||||
|
||||
if (window.innerWidth < 701) {
|
||||
this.openMessagesModal(rid);
|
||||
}
|
||||
@@ -236,7 +239,6 @@ export class ChatPage implements OnInit {
|
||||
this.idSelected = rid;
|
||||
this.closeAllDesktopComponents();
|
||||
this.showEmptyComponent = false;
|
||||
this.roomId = rid;
|
||||
this.showMessages = true;
|
||||
}
|
||||
}
|
||||
@@ -275,6 +277,8 @@ export class ChatPage implements OnInit {
|
||||
}
|
||||
|
||||
openGroupMessagesPage(rid) {
|
||||
|
||||
this.roomId = rid;
|
||||
if (window.innerWidth < 701) {
|
||||
this.openGroupMessagesModal(rid);
|
||||
}
|
||||
@@ -282,7 +286,7 @@ export class ChatPage implements OnInit {
|
||||
this.idSelected = rid;
|
||||
this.closeAllDesktopComponents();
|
||||
this.showEmptyComponent = false;
|
||||
this.roomId = rid;
|
||||
|
||||
|
||||
this.showGroupMessages = true;
|
||||
}
|
||||
@@ -339,6 +343,27 @@ export class ChatPage implements OnInit {
|
||||
this.idSelected = "";
|
||||
}
|
||||
|
||||
async closeNewEventComponentAndOpenChat({roomId}) {
|
||||
this.closeAllDesktopComponents();
|
||||
|
||||
console.log(roomId)
|
||||
|
||||
this.wsChatMethodsService._group.forEach((room)=>{
|
||||
if(room.id == roomId) {
|
||||
|
||||
|
||||
this.openGroupMessagesPage(roomId)
|
||||
}
|
||||
})
|
||||
|
||||
this.wsChatMethodsService._dm.forEach((room)=>{
|
||||
if(room.id == roomId) {
|
||||
this.openMessagesPage(roomId)
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
onSegmentChange() {
|
||||
this.wsChatMethodsService.getAllRooms();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user