Merge branch 'developer' into feature/calendar

This commit is contained in:
Peter Maquiran
2021-04-13 15:44:21 +01:00
2 changed files with 41 additions and 28 deletions
@@ -9,7 +9,8 @@ import { ChatService } from 'src/app/services/chat.service';
styleUrls: ['./chat-popover.page.scss'],
})
export class ChatPopoverPage implements OnInit {
room:any;
roomId:string;
room: any;
constructor(
private popoverController: PopoverController,
@@ -17,11 +18,11 @@ export class ChatPopoverPage implements OnInit {
private navParams: NavParams,
private chatService: ChatService,
) {
this.room = this.navParams.get('room');
this.roomId = this.navParams.get('roomId');
}
ngOnInit() {
console.log(this.room);
console.log(this.roomId);
}
close(){
@@ -36,39 +37,50 @@ export class ChatPopoverPage implements OnInit {
//Top menu options
//Close
leaveGroup(){
let body = { "roomId":this.room._id, }
if(this.room.t === 'p'){
this.chatService.closeGroup(body).subscribe(res=>{
console.log(res);
});
}
else{
this.chatService.closeChannel(body).subscribe(res=>{
console.log(res);
});
}
let body = { "roomId":this.roomId, }
this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
this.room = room['room'];
if(this.room.t === 'p'){
this.chatService.closeGroup(body).subscribe(res=>{
console.log(res);
});
}
else{
this.chatService.closeChannel(body).subscribe(res=>{
console.log(res);
});
}
});
this.popoverController.dismiss(true);
}
//Delete
deleteGroup(){
let body = { "roomId":this.room._id, }
if(this.room.t === 'p'){
this.chatService.deleteGroup(body).subscribe(res=>{
console.log(res);
});
}
else{
this.chatService.deleteChannel(body).subscribe(res=>{
console.log(res);
});
}
let body = { "roomId":this.roomId, }
this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
this.room = room['room'];
if(this.room.t === 'p'){
this.chatService.deleteGroup(body).subscribe(res=>{
console.log(res);
});
}
else{
this.chatService.deleteChannel(body).subscribe(res=>{
console.log(res);
});
}
});
this.popoverController.dismiss(true);
}
async openChangeGroupName(){
const modal = await this.modalController.create({
component: EditGroupPage,
componentProps: {
room: this.room,
//room: this.room,
},
cssClass: 'contacts',
backdropDismiss: false