diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 433053105..0cfae6c88 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -227,12 +227,11 @@
- Com conhecimento + Com conhecimento
- Adicionar intervenientes - {{participant.Name}} + {{participant.Name}}
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index c2359b6f1..bdff27d63 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -59,6 +59,7 @@ export class NewEventPage implements OnInit { documents:SearchDocument[] = []; loggeduser: User; + members:any; constructor( private modalController: ModalController, @@ -78,7 +79,9 @@ export class NewEventPage implements OnInit { this.selectedSegment = this.navParams.get('segment'); this.selectedDate = this.navParams.get('eventSelectedDate'); + this.taskParticipants = this.navParams.get('attendees'); + console.log(this.taskParticipants); this.postEvent.StartDate = new Date() this.postEvent.EndDate = (new Date(new Date().getTime() + 15 * 60000)) @@ -232,13 +235,15 @@ export class NewEventPage implements OnInit { this.postEvent.EventRecurrence.Type = this.selectedRecurringType; } + this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc); + let eventId: any; const loader = this.toastService.loading() try { - + if(this.loggeduser.Profile == 'MDGPR') { console.log(this.loggeduser.Profile); diff --git a/src/app/pages/chat/group-messages/group-messages.module.ts b/src/app/pages/chat/group-messages/group-messages.module.ts index 1dfcecefa..c0e419c06 100644 --- a/src/app/pages/chat/group-messages/group-messages.module.ts +++ b/src/app/pages/chat/group-messages/group-messages.module.ts @@ -12,11 +12,14 @@ import { GroupMessagesPage } from './group-messages.page'; import { ChatPopoverPageModule } from 'src/app/shared/popover/chat-popover/chat-popover.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; + @NgModule({ imports: [ CommonModule, BrowserModule, FormsModule, + FontAwesomeModule, IonicModule, GroupMessagesPageRoutingModule, diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index 6132a87a0..173101d6b 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -86,11 +86,11 @@
-
-
+
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 8affbd4de..3750818cd 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -242,7 +242,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewChecked { } openSendGroupMessageOptions(ev?: any){ - if(window.innerWidth <= 1024){ + if(window.innerWidth <= 701){ console.log('mobile'); this.openChatOptions(ev); } @@ -334,7 +334,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewChecked { */ async _openChatOptions() { - const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() .addElement(baseEl.querySelector('ion-backdrop')!) @@ -362,7 +361,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewChecked { enterAnimation, leaveAnimation, component: ChatOptionsPopoverPage, - cssClass: 'model profile-modal search-submodal', + cssClass: 'model', componentProps: { roomId: this.roomId, } 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 bb0fc5c83..a3adebd27 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 @@ -10,6 +10,7 @@
+
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts index 9f09bc0aa..f17fc4d15 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts @@ -1,8 +1,11 @@ import { Component, OnInit } from '@angular/core'; -import { ModalController, PopoverController } from '@ionic/angular'; +import { ModalController, NavParams, PopoverController } from '@ionic/angular'; +import { EventPerson } from 'src/app/models/eventperson.model'; import { SearchDocument } from 'src/app/models/search-document'; +import { NewEventPage } from 'src/app/pages/agenda/new-event/new-event.page'; import { SearchPage } from 'src/app/pages/search/search.page'; import { AlertService } from 'src/app/services/alert.service'; +import { environment } from 'src/environments/environment'; @Component({ selector: 'app-chat-options-popover', @@ -12,14 +15,30 @@ import { AlertService } from 'src/app/services/alert.service'; export class ChatOptionsPopoverPage implements OnInit { documents:SearchDocument[] = []; + members: any; + attendees: EventPerson[] = []; constructor( private popoverController: PopoverController, private modalController: ModalController, private alertService: AlertService, - ) { } + private navParams: NavParams, + ) { + + this.members = this.navParams.get('members'); + console.log(this.members); + this.attendees = this.navParams.get('members').map((val)=>{ + return { + Name: val.name, + EmailAddress: val.username+"@"+environment.domain, + IsRequired: "true", + } + }); + } ngOnInit() { + console.log(this.attendees); + } notImplemented(){ @@ -37,9 +56,29 @@ export class ChatOptionsPopoverPage implements OnInit { attachDocument(){ console.log('Anexar Documento'); - + } + /* getGroupContacts(room:any){ + this.showLoader = true; + //If group is private call getGroupMembers + if(this.room.t === 'p'){ + this.chatService.getGroupMembers(this.roomId).subscribe(res=>{ + console.log(res); + this.members = res['members']; + this.showLoader = false; + }); + } + //Otherwise call getChannelMembers for públic groups + else{ + this.chatService.getChannelMembers(this.roomId).subscribe(res=>{ + console.log(res); + this.members = res['members']; + this.showLoader = false; + }); + } + } */ + async getDoc(){ const modal = await this.modalController.create({ component: SearchPage, @@ -56,9 +95,30 @@ export class ChatOptionsPopoverPage implements OnInit { const data = res.data; this.documents.push(data.selected); console.log(res.data); - + } }); } + async bookMeeting() { + console.log(this.attendees); + this.popoverController.dismiss(); + if( window.innerWidth <= 1024){ + const modal = await this.modalController.create({ + component: NewEventPage, + componentProps:{ + attendees: this.attendees, + }, + cssClass: 'modal modal-desktop', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss().then((data) => { + if(data){ + + } + }); + } + } + } diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index c16ada8e6..806cedd83 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -8,6 +8,7 @@
+
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 1fdf3bbf6..58ead2ef5 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -86,4 +86,8 @@ export class ChatPopoverPage implements OnInit { this.modalController.dismiss('edit'); } + bookMeeting(){ + + } + }