diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss
index dfaf654ff..657d5510a 100644
--- a/src/app/shared/chat/messages/messages.page.scss
+++ b/src/app/shared/chat/messages/messages.page.scss
@@ -165,9 +165,9 @@
.chat-icon-options{
display:block !important;
- font-size: 25px;
+ font-size: 35px;
float: right !important;
- margin-top: 10px;
+ margin-top: 5px;
}
.chat-icon-send{
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index d9b161f7e..2d5347fb3 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -1,4 +1,4 @@
-import { AfterViewChecked, Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
+import { AfterViewChecked, Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
import { AnimationController, ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { AuthService } from 'src/app/services/auth.service';
@@ -29,10 +29,13 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
userPresence='';
dmUsers:any;
checktimeOut: boolean;
+ members:any;
@Input() roomId:string;
@Input() showMessages:string;
+ @Output() openNewEventPage:EventEmitter
= new EventEmitter();
+
connection = connection
@@ -67,15 +70,11 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
console.log(this.roomId);
console.log("Chat route", this.route.url)
-
-
}
ngOnDestroy(){
this.checktimeOut = false;
console.log('On Destroy')
-
-
}
notImplemented(){
@@ -106,6 +105,14 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
}
}
+ openBookMeetingComponent(){
+ let data = {
+ roomId: this.roomId,
+ members: this.members
+ }
+ this.openNewEventPage.emit(data);
+ }
+
sendMessage() {
this.connection.$send({})
@@ -141,6 +148,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
//this.showLoader = true;
this.chatService.getMembers(this.roomId).subscribe(res=> {
+ this.members = res['members'];
this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username)
console.log(res);
console.log(this.dmUsers);
@@ -280,9 +288,22 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
cssClass: 'model profile-modal search-submodal',
componentProps: {
roomId: this.roomId,
+ members: this.members,
}
});
- return await modal.present();
+ await modal.present();
+ modal.onDidDismiss().then((res)=>{
+ console.log(res['data']);
+ if(res['data'] == 'meeting'){
+ //this.closeAllDesktopComponents.emit();
+ let data = {
+ roomId: this.roomId,
+ members: this.members
+ }
+ this.openNewEventPage.emit(data);
+ }
+
+ });
}
async serverLongPull(){
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
index a3adebd27..0525e41fe 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
@@ -5,34 +5,13 @@