Merge branch 'feature/calendar' into developer

src/app/shared/agenda/edit-event/edit-event.component.html

@@ -172,13 +172,15 @@
       </div>
     </div>
     
-    <div class="container-div d-flex">
-      <div class="ion-item-class-2 width-100 d-flex">
+    <div class="container-div">
+      <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
         </div>
-        <div class="ion-input-class flex-grow-1">
-          <ion-input placeholder="Detalhes" [(ngModel)]="postEvent.Body.Text"></ion-input>
+        <div class="ion-input-class-no-height flex-grow-1">
+          
+          <ion-textarea  [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" ></ion-textarea>
+          
         </div>
       </div>
     </div>

src/app/shared/agenda/edit-event/edit-event.component.scss

@@ -165,4 +165,11 @@ ion-content{
         color:red;
       }
 
-  }
+  }
+
+
+.container-div{
+  ion-textarea{
+    height: 81px;
+  }
+}

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

@@ -129,16 +129,18 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
         </div>
-        <div (click)="openAttendees()" class="ion-input-class-no-height flex-grow-1">
+        <div  class="ion-input-class-no-height flex-grow-1">
+          
           <div class="list-people">
             <ion-item lines="none">
               <ion-list>
-                <ion-label class="list-people-title">Adicionar participantes</ion-label>
-                <ion-label hidden >Text</ion-label>
+                <ion-label *ngIf="eventAttendees.length ==0" class="list-people-title">Adicionar intervenientes</ion-label>
+                <ion-label *ngFor="let participant of eventAttendees">{{participant.Name}}</ion-label>
               </ion-list>
             </ion-item>
           </div>
-          <div class="add-people">
+
+          <div class="add-people" (click)="openAttendees()">
             <ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
           </div>
         </div>

src/app/shared/agenda/new-event/new-event.component.scss

@@ -171,3 +171,9 @@ ion-content{
 
 }
 
+
+.container-div{
+  ion-textarea{
+    height: 81px;
+  }
+}

src/app/shared/agenda/new-event/new-event.component.ts

@@ -3,7 +3,6 @@ import { EventBody } from 'src/app/models/eventbody.model';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { EventsService } from 'src/app/services/events.service';
 import { Event } from 'src/app/models/event.model';
-import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page';
 import { ModalController } from '@ionic/angular';
 
 @Component({
@@ -34,12 +33,7 @@ export class NewEventPage implements OnInit {
   constructor(
     private modalController: ModalController,
     private eventService: EventsService, 
-  ) {
-
-
-
-
-  }
+  ) {}
 
   ngOnInit() {
 
@@ -49,7 +43,7 @@ export class NewEventPage implements OnInit {
       this.eventBody = { BodyType : "1", Text : ""};
       this.postEvent.Body = this.eventBody;  
 
-      console.log(this.profile);
+     /*  console.log(this.profile); */
   
       let selectedStartdDate = this.selectedDate;
       let selectedEndDate = new Date(this.selectedDate);
@@ -114,7 +108,9 @@ export class NewEventPage implements OnInit {
   }
 
   save(){
-        
+    
+    this.postEvent.Attendees = this.eventAttendees;
+    
     if(this.profile=='mdgpr'){
       this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe();
     }
@@ -128,8 +124,7 @@ export class NewEventPage implements OnInit {
     this.GoBackEditOrAdd.emit();
   }
 
-  async openAttendees(data: any)
-  {
+  async openAttendees(){
 
     this.saveTemporaryData();
     this.openAttendeesComponent.emit();

src/app/shared/event/attendee-modal/attendee-modal.page.ts

@@ -10,6 +10,7 @@ import { EventPerson } from 'src/app/models/eventperson.model';
 })
 export class AttendeeModalPage implements OnInit {
 
+  // Defined by the API
   contacts: EventPerson[];
   showLoader: boolean = false;
   selectedContact: EventPerson[] =[];
@@ -28,6 +29,10 @@ export class AttendeeModalPage implements OnInit {
     this.fetchContacts("");
     this.selectedContact = this.eventAttendees;
   }
+  
+  ngOnChanges(){
+    console.log('change !!!')
+  }
 
   save(){
     // set data to agenda component

src/app/shared/header/header.page.html

@@ -11,7 +11,6 @@
     <div class="div-profile"  (click)="openProfile()">
       <ion-icon class="font-45" *ngIf="profile == 'mdgpr' " src='assets/images/icons-profile.svg'></ion-icon>
       <ion-icon class="font-45" *ngIf="profile == 'pr' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
-
     </div>
   </div>
 
@@ -40,7 +39,7 @@
 
         <div class="tab mr-20  d-flex align-center" (click)="changeRoute('/home/publications')"  [class.active]="locationPathname() == '/home/publications'">
           <ion-icon class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
-          <span>Ações</span>
+          <span>Acções</span>
         </div>