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

src/app/pages/agenda/edit-event/edit-event.page.html

@@ -1,7 +1,7 @@
 <ion-content>
   <div class="main-content height-100">
 
-    <div class="content d-flex flex-column width-100 height-100">
+    <div class="content d-flex flex-column width-md-100 height-100">
       
       <div class="main-header pt-30 px-20 background-white pb-15">
         <ion-header>
@@ -14,7 +14,7 @@
       </div>
       <ion-item-sliding class="overflow-y-auto">
       
-        <div>
+  
           <div class="px-20">
             <div class="ion-item-container width-100">
               <ion-input  placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
@@ -201,7 +201,7 @@
             </div>
             
           </div>
-        </div>
+        
 
 
         <div hidden>

src/app/pages/agenda/edit-event/edit-event.page.ts

@@ -89,12 +89,9 @@ export class EditEventPage implements OnInit {
     this.modalController.dismiss(this.isEventEdited);
   }
 
-  async openAttendees()
-  {
+  async openAttendees(){
 
-    this.adding = 'intervenient';
-
-    if(window.innerWidth == 1024) {
+    if(window.innerWidth <= 1024) {
       const modal = await this.modalController.create({
         component: AttendeesPage,
          componentProps: {
@@ -115,7 +112,6 @@ export class EditEventPage implements OnInit {
       });
     }
 
-
   }
 
   async dynamicSetIntervenient(data){
@@ -134,11 +130,13 @@ export class EditEventPage implements OnInit {
   }
 
   async addParticipants(){
-    this.adding = 'intervenient'
+    this.adding = 'intervenient';
+    this.openAttendees();
   }
 
   async addParticipantsCC(){
-    this.adding = 'CC'
+    this.adding = 'CC';
+    this.openAttendees();
   }
 
   async closeComponent(){}

src/app/pages/events/attendees/attendees.page.html

@@ -39,15 +39,14 @@
 
 
 <ion-footer class="ion-no-border">
-  <ion-toolbar class="btn-div">
-    <ion-buttons slot="start">
+  <ion-toolbar class="d-flex">
+    <ion-buttons class="flex-grow-1" slot="start">
       <ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
         <ion-label>Cancelar</ion-label>
         <ion-icon name="close" slot="start"></ion-icon>
       </ion-button>
     </ion-buttons>
-    <ion-title></ion-title>
-    <ion-buttons slot="end">
+    <ion-buttons class="flex-grow-1" slot="end">
       <ion-button class="btn-ok" fill="clear" color="#fff" (click)="save()">
         <ion-label>OK</ion-label>
         <ion-icon name="checkmark" slot="start"></ion-icon>

src/app/pages/events/attendees/attendees.page.ts

@@ -1,8 +1,8 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { EventsService } from 'src/app/services/events.service';
 import { ModalController, NavController } from '@ionic/angular';
-import { AttendeeModalPage } from '../attendee-modal/attendee-modal.page';
+// import { AttendeeModalPage } from '../attendee-modal/attendee-modal.page';
 
 @Component({
   selector: 'app-attendees',
@@ -11,12 +11,18 @@ import { AttendeeModalPage } from '../attendee-modal/attendee-modal.page';
 })
 export class AttendeesPage implements OnInit {
 
-  eventAttendees: EventPerson[];
+  
   segment:string = "true";
   shouldShowCancel:boolean = true;
 
   searchCountryString = ''; // initialize your searchCountryString string empty
 
+  @Output() openAttendeeModal = new EventEmitter<any>();
+  @Output() openAddEvent  = new EventEmitter<any>();
+  @Input() eventAttendees: EventPerson[];
+  @Output() GoBackEditOrAdd = new EventEmitter<any>();
+
+  
   constructor(private eventService: EventsService, private modalCtrl: ModalController, 
     private navCtrl: NavController) { 
   }
@@ -26,11 +32,15 @@ export class AttendeesPage implements OnInit {
   }
 
   save(){
+    this.GoBackEditOrAdd.emit();
+    //this.openAddEvent.emit();
     this.modalCtrl.dismiss(this.eventAttendees);
   }
 
   close(){
+    this.GoBackEditOrAdd.emit();
     this.modalCtrl.dismiss(null);
+    //this.openAddEvent.emit();
   }
 
   removeAttendee(attendee: EventPerson)
@@ -42,9 +52,12 @@ export class AttendeesPage implements OnInit {
     this.eventAttendees.splice(index, 1);
   }
   
-  async addAttendees()
-  {
-    const modal = await this.modalCtrl.create({
+  async addAttendees() {
+  
+    console.log('Event Intervenient');
+    this.openAttendeeModal.emit();
+
+  /*     const modal = await this.modalCtrl.create({
       component: AttendeeModalPage,
       componentProps: {
         eventPersons: this.eventAttendees
@@ -73,7 +86,8 @@ export class AttendeesPage implements OnInit {
           this.eventAttendees.push(att);
         });
       }
-    });
+    }); */
+    
   }
 
 }

src/app/pages/events/events.page.ts

@@ -107,6 +107,7 @@ export class EventsPage implements OnInit {
   doRefresh(event) {
     this.RefreshEvents();
     event.target.complete();
+    this.LoadList();
   }
 
   onSegmentChange(){

src/global.scss

@@ -437,7 +437,7 @@ border-top: 1px solid #d8d8d8;
     }
 }
 
-@media only screen and (min-width: 1024px) {
+@media only screen and (min-width: 1365px) {
   .gabinete-digital-mobile-modal-to-Desktop{
     //top: 75px;
     left: 40%;