From f01c7f118494b2169b24daa5945ffa24e662d569 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 6 Apr 2021 13:55:17 +0100
Subject: [PATCH 1/3] Improve Edit event for home page

---
 src/app/pages/agenda/edit-event/edit-event.page.html     | 5 +++--
 src/app/pages/agenda/edit-event/edit-event.page.ts       | 5 +++++
 .../shared/event/attendee-modal/attendee-modal.page.ts   | 9 +++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index d088bb30b..7e3974aae 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -179,8 +179,8 @@
             </div>
           </div>
           
-          <div class="container-div width-100">
-            <div class="ion-item-class-2">
+          <div class="container-div width-100 pb-20">
+            <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>
@@ -225,6 +225,7 @@
       [taskParticipants]="taskParticipants"
       [taskParticipantsCc]="taskParticipantsCc"
       [adding]="adding"
+      (dynamicSetIntervenient)="dynamicSetIntervenient($event)"
     ></app-attendee-modal>
 
   </div>    
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index 5d0dbe1ca..5d5245903 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -118,6 +118,11 @@ export class EditEventPage implements OnInit {
 
   }
 
+  async dynamicSetIntervenient(data){
+    this.taskParticipants = data['taskParticipants'];
+    this.taskParticipantsCc = data['taskParticipantsCc'];
+  }
+
   async setIntervenient(data){
     this.taskParticipants = data;
 
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts
index 36a6c6c13..1521f0e26 100644
--- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts
+++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts
@@ -2,7 +2,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { ModalController } from '@ionic/angular';
 import { ContactsService } from 'src/app/services/contacts.service';
 import { EventPerson } from 'src/app/models/eventperson.model';
-import { el } from 'date-fns/locale';
 
 @Component({
   selector: 'app-attendee-modal',
@@ -26,6 +25,7 @@ export class AttendeeModalPage implements OnInit {
 
   @Output() setIntervenient = new EventEmitter<any>();
   @Output() setIntervenientCC = new EventEmitter<any>();
+  @Output() dynamicSetIntervenient = new EventEmitter<any>();
   
   currentPath = window.location.pathname;
   @Input() adding: "intervenient" | "CC";
@@ -39,7 +39,6 @@ export class AttendeeModalPage implements OnInit {
 
     if(this.taskParticipantsCc == null || this.taskParticipantsCc == undefined){
       this.taskParticipantsCc = [];
-      
     }
     
   }
@@ -126,6 +125,12 @@ export class AttendeeModalPage implements OnInit {
 
     }
 
+
+    this.dynamicSetIntervenient.emit({
+      taskParticipants: this.taskParticipants,
+      taskParticipantsCc: this.taskParticipantsCc
+    })
+
     this.setContactWithClose();
   
   }

From baf0204f6052a9ae05aa3d8f594798b05eb8982c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 6 Apr 2021 14:14:26 +0100
Subject: [PATCH 2/3] Improve modal to view event

---
 .../agenda/view-event/view-event.page.html    | 88 ++++++++++---------
 .../attendee-modal/attendee-modal.page.ts     |  1 -
 2 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index f42f80adc..25a81b2f3 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -34,51 +34,55 @@
           </div>
         </div>
       </div>
-      <div class="upper-content">
-        <div class="content-location">
-          <p><span class="date">{{loadedEvent.Location}}</span><span class="label">{{loadedEvent.CalendarName}}</span></p>
+
+      <div class="overflow-y-auto">
+        <div class="upper-content">
+          <div class="content-location">
+            <p><span class="date">{{loadedEvent.Location}}</span><span class="label">{{loadedEvent.CalendarName}}</span></p>
+          </div>
+          <div class="content-details">
+            <ion-label>
+              <p>{{customDate}}</p>
+              <p>das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
+              <p *ngIf="!loadedEvent.IsRecurring">(Não se repete)</p>
+              <p *ngIf="loadedEvent.IsRecurring">Repete</p>
+            </ion-label>
+          </div>
         </div>
-        <div class="content-details">
-          <ion-label>
-            <p>{{customDate}}</p>
-            <p>das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
-            <p *ngIf="!loadedEvent.IsRecurring">(Não se repete)</p>
-            <p *ngIf="loadedEvent.IsRecurring">Repete</p>
-          </ion-label>
-        </div>
-      </div>
-      <div class="line"></div>
-      <div class="middle-content">
-        <div *ngIf="loadedEvent.Attendees">
-        <h5>Intervenientes</h5>
-        <ion-item class="ion-no-margin ion-no-padding">
-          <ion-label>
-            <div *ngFor="let attendee of loadedEvent.Attendees">
-              <p>{{attendee.Name}}</p>
-            </div>
-          </ion-label>
-        </ion-item>
-      </div>
-      <div *ngIf="loadedEvent.Body.Text">
-        <h5>Detalhes</h5>
-        <ion-item class="ion-no-margin ion-no-padding">
-          <textarea disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></textarea>
-        </ion-item>
-      </div>
-      </div>
-    
-      <div *ngIf="loadedAttachments" class="bottom-content width-100">
-        <ion-list>
-          <h5>Documentos Anexados</h5>
+        <div class="line"></div>
+        <div class="middle-content">
+          <div *ngIf="loadedEvent.Attendees">
+          <h5>Intervenientes</h5>
           <ion-item class="ion-no-margin ion-no-padding">
-          <ion-label *ngFor="let attach of loadedAttachments"
-          (click)="viewDocument(attach.SourceId)">
-            <p class="attach-title-item">{{attach.SourceName}}</p>
-            <p><span class="span-left">{{attach.Stakeholders}}</span><span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span></p>
-          </ion-label>
-        </ion-item>
-        </ion-list>
+            <ion-label>
+              <div *ngFor="let attendee of loadedEvent.Attendees">
+                <p>{{attendee.Name}}</p>
+              </div>
+            </ion-label>
+          </ion-item>
+        </div>
+        <div *ngIf="loadedEvent.Body.Text">
+          <h5>Detalhes</h5>
+          <ion-item class="ion-no-margin ion-no-padding">
+            <textarea disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></textarea>
+          </ion-item>
+        </div>
+        </div>
+      
+        <div *ngIf="loadedAttachments" class="bottom-content width-100">
+          <ion-list>
+            <h5>Documentos Anexados</h5>
+            <ion-item class="ion-no-margin ion-no-padding">
+            <ion-label *ngFor="let attach of loadedAttachments"
+            (click)="viewDocument(attach.SourceId)">
+              <p class="attach-title-item">{{attach.SourceName}}</p>
+              <p><span class="span-left">{{attach.Stakeholders}}</span><span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span></p>
+            </ion-label>
+          </ion-item>
+          </ion-list>
+        </div>
       </div>
+
     </div>
     <div class="aside-right flex-column height-100">
       <div class="buttons">
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts
index 1521f0e26..9a2bb9208 100644
--- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts
+++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts
@@ -125,7 +125,6 @@ export class AttendeeModalPage implements OnInit {
 
     }
 
-
     this.dynamicSetIntervenient.emit({
       taskParticipants: this.taskParticipants,
       taskParticipantsCc: this.taskParticipantsCc

From e286951dc8d51f72dc2bf7e7d24069596fbc59cd Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 6 Apr 2021 14:22:34 +0100
Subject: [PATCH 3/3] Remove duplicate controller for event modal in hame page

---
 src/app/pages/agenda/view-event/view-event.page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index 25a81b2f3..e5c8ab51b 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -84,7 +84,7 @@
       </div>
 
     </div>
-    <div class="aside-right flex-column height-100">
+    <div class="aside-right flex-column height-100 d-none d-md-flex">
       <div class="buttons">
         <button (click)="editEvent()" full class="btn-ok" shape="round" >Editar</button>
         <div class="solid"></div>