Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/shared/agenda/new-event/new-event.page.html

@@ -186,11 +186,11 @@
             <mat-select placeholder="Selecione repetição*"
             [(ngModel)]="postEvent.EventRecurrence.Type"
             (ngModelChange)="onSelectedRecurringChanged($event)">
-              <mat-option
+              <!-- <mat-option
               *ngFor="let recurring of recurringTypes" value="{{recurring.Code}}"
               >
               {{recurring.Description}}
-              </mat-option>
+              </mat-option> -->
             </mat-select>
           </mat-form-field>
 
@@ -204,19 +204,6 @@
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
         <div (click)="openLastOccurrence()" class="ion-input-class flex-grow-1">
-          <!-- <ion-datetime
-            placeholder="Última ocorrência"
-            [(ngModel)]="postEvent.EventRecurrence.LastOccurrence"
-            displayFormat="DD MMM YYYY"
-            monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-            min="2021"
-            max="2045"
-          >
-          </ion-datetime> -->
-          <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
-
-         <!--  [formControl]="dateControlOccurrence" -->
-
           <mat-form-field class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="occurrrence"
               placeholder="Choose a date"

src/app/shared/chat/group-messages/group-messages.module.ts

@@ -10,15 +10,15 @@ import { GroupMessagesPage } from './group-messages.page';
 import { SharedModule } from 'src/app/shared/shared.module';
 
 import { ChatPopoverPageModule } from '../../popover/chat-popover/chat-popover.module';
+import { NewEventPageModule } from '../../agenda/new-event/new-event.module';
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-
     ChatPopoverPageModule,
-    GroupMessagesPageRoutingModule
+    GroupMessagesPageRoutingModule,
   ],
   exports: [GroupMessagesPage],
   declarations: [GroupMessagesPage]

src/app/shared/chat/group-messages/group-messages.page.html

@@ -62,7 +62,7 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <button class="btn-no-color" > <!-- (click)="openSendGroupMessageOptions()" -->
+      <button class="btn-no-color" (click)="openSendGroupMessageOptions()">
         <ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
       </button>
     </div>

src/app/shared/chat/group-messages/group-messages.page.ts

@@ -3,12 +3,13 @@ import { ActionSheetController, AnimationController, MenuController, ModalContro
 import { AlertService } from 'src/app/services/alert.service';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
-import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
 import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popover.page';
 import { ContactsPage } from '../new-group/contacts/contacts.page';
 import { NewGroupPage } from '../new-group/new-group.page';
 import { GroupContactsPage } from './group-contacts/group-contacts.page';
 import { Router } from '@angular/router'
+import { ChatOptionsPopoverPage } from '../../popover/chat-options-popover/chat-options-popover.page';
+import { ChatOptionsFeaturesPage } from 'src/app/modals/chat-options-features/chat-options-features.page';
 
 @Component({
   selector: 'app-group-messages',
@@ -34,6 +35,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewChecked {
   @Output() showEmptyContainer:EventEmitter<any> = new EventEmitter<any>();
   @Output() openGroupContacts:EventEmitter<any> = new EventEmitter<any>();
   @Output() openEditGroupPage:EventEmitter<any> = new EventEmitter<any>();
+  @Output() openNewEventPage:EventEmitter<any> = new EventEmitter<any>();
 
   @ViewChild('scrollMe') private myScrollContainer: ElementRef;
 
@@ -79,6 +81,14 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewChecked {
     this.openGroupContacts.emit(this.roomId);
   }
 
+  openBookMeetingComponent(){
+    let data = {
+      roomId: this.roomId,
+      members: this.members
+    }
+    this.openNewEventPage.emit(data);
+  }
+
   close(){
     this.modalController.dismiss();
   }
@@ -242,7 +252,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);
     }
@@ -280,6 +290,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewChecked {
       event: ev,
       componentProps: {
         room: this.room,
+        members: this.members,
       },
       translucent: true
     });
@@ -350,7 +361,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewChecked {
       return this.animationController.create()
         .addElement(baseEl)
         .easing('ease-out')
-        .duration(500)
+        .duration(5000)
         .addAnimation([backdropAnimation, wrapperAnimation]);
     }
 
@@ -361,13 +372,27 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewChecked {
     const modal = await this.modalController.create({
       enterAnimation,
       leaveAnimation,
-      component: ChatOptionsPopoverPage,
+      component: ChatOptionsFeaturesPage,
       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(){

src/app/shared/chat/messages/messages.page.html

@@ -50,7 +50,7 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <button class="btn-no-color" > <!-- (click)="openSendMessageOptions()" -->
+      <button class="btn-no-color" (click)="openSendMessageOptions()">
         <ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
       </button>
     </div>

src/app/shared/popover/chat-options-popover/chat-options-popover.module.ts

@@ -15,6 +15,7 @@ import { ChatOptionsPopoverPage } from './chat-options-popover.page';
     IonicModule,
     ChatOptionsPopoverPageRoutingModule
   ],
-  declarations: [ChatOptionsPopoverPage]
+  declarations: [ChatOptionsPopoverPage],
+  exports: [ChatOptionsPopoverPage]
 })
 export class ChatOptionsPopoverPageModule {}

src/app/shared/popover/chat-options-popover/chat-options-popover.page.html

@@ -10,6 +10,7 @@
     <button (click)="notImplemented()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
     <button (click)="getDoc()" class="btn-ok" shape="round" >Anexar Documento</button>
     <div class="solid"></div>
+    <button (click)="bookMeeting()" class="btn-ok" shape="round" >Marcar reunião</button>
     <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
   </div>
 

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){
+
+        }
+      });
+    }
+  }
+
 }

src/app/shared/popover/chat-popover/chat-popover.page.html

@@ -8,6 +8,7 @@
     <button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>
     <button (click)="openChangeGroupName()" class="btn-ok" shape="round" >Alterar nome do grupo</button>
     <div class="solid"></div>
+    <button (click)="bookMeeting()" class="btn-cancel" shape="round">Marcar Reunião</button>
     <button (click)="close()" full class="btn-cancel mobile-only" shape="round" >Cancelar</button>
     <button (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
   </div>

src/app/shared/popover/chat-popover/chat-popover.page.ts

@@ -86,4 +86,8 @@ export class ChatPopoverPage implements OnInit {
     this.modalController.dismiss('edit');
   }
 
+  bookMeeting(){
+
+  }
+
 }