From 91713760ecbfb516633722dd772de2dcd89d62b4 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 9 Apr 2021 10:09:33 +0100
Subject: [PATCH 1/4] save

---
 .../approve-event-modal.page.html                   |  2 +-
 .../pages/agenda/view-event/view-event.page.html    | 13 +++++++++----
 .../approve-event-modal.page.html                   |  5 +++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html
index 12689f63c..37f1e01c5 100644
--- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html
@@ -39,7 +39,7 @@
   <div class="upper-content">
     <div class="content-location">
       <div class="location-detail">
-        <ion-label >{{loadedEvent.workflowInstanceDataFields.Location}}</ion-label>
+        <ion-label >11{{loadedEvent.workflowInstanceDataFields.Location}}</ion-label>
       </div>
       <div class="button-calendar-type">
         <ion-button  class="button-calendar-type" slot="end">{{loadedEvent.workflowInstanceDataFields.Agenda}}</ion-button>
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 8980a1bc8..61abd4fa6 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -31,8 +31,12 @@
             <ion-label class="title">{{loadedEvent.Subject}}</ion-label>
           </div>
           <div class="div-icon">
-            <ion-icon class="edit" (click)="editEvent()" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
-            <ion-icon class="delete" (click)="deleteEvent()" name="trash-sharp"></ion-icon> 
+            <button class="btn-no-color" (click)="editEvent()">
+              <ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
+            </button>
+            <button class="btn-no-color" (click)="deleteEvent()">
+              <ion-icon class="delete"  name="trash-sharp"></ion-icon>
+            </button> 
           </div>
         </div>
       </div>
@@ -75,9 +79,10 @@
         <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"
+            <ion-item class="ion-no-margin ion-no-padding"
+            *ngFor="let attach of loadedAttachments" 
             (click)="viewDocument(attach.SourceId)">
+            <ion-label>
               <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>
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
index 5bf3fe573..1c47242a0 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
@@ -60,10 +60,11 @@
       <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
     </ion-item>
     <h5>Detalhes</h5>
-    <ion-item class="ion-no-padding ion-no-margin">
-      <p>{{loadedEvent.workflowInstanceDataFields.Body}}</p>
+    <ion-item lines="none" class="ion-no-padding ion-no-margin">
+      <div [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></div>
     </ion-item>
   </div>
+  <div class="line"></div>
 
   <div *ngIf="loadedAttachments" class="bottom-content">
     <ion-list>

From 073d929a858160bf25f3c9f297417855626917e9 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 9 Apr 2021 10:17:09 +0100
Subject: [PATCH 2/4] save

---
 .../approve-event-modal.page.html                 | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
index 1c47242a0..6a0847123 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
@@ -1,7 +1,9 @@
 <ion-header class="ion-no-border">
   <div class="header-content  mx-20 d-flex justify-start">
     <div class="header-icon-left">
-      <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+      <button class="btn-no-color" (click)="close()">
+        <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+      </button>
     </div>
     <div class="header-title flex-md-grow-1">
       <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
@@ -55,10 +57,13 @@
     </div>
   </div>
   <div class="middle-content">
-    <h5>Intervenientes</h5>
-    <ion-item class="ion-no-padding ion-no-margin">
-      <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
-    </ion-item>
+    <div *ngIf="loadedEvent.workflowInstanceDataFields.Participants">
+      <h5>Intervenientes</h5>
+      <div *ngFor="let att of loadedEvent.workflowInstanceDataFields.ParticipantsList">
+        <ion-label>{{att.Name}}</ion-label>
+      </div>
+    </div>
+    
     <h5>Detalhes</h5>
     <ion-item lines="none" class="ion-no-padding ion-no-margin">
       <div [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></div>

From e8e091d4c81db32343cd9cc3541feb658a2ab729 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 9 Apr 2021 11:25:01 +0100
Subject: [PATCH 3/4] save

---
 .../approve-event-modal/approve-event-modal.page.html         | 2 +-
 .../pages/gabinete-digital/event-list/event-list.page.html    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
index 6a0847123..0dba97d15 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
@@ -50,7 +50,7 @@
     <div class="content-details">
       <ion-label>
         <p>{{customDate}}</p>
-        <p>das {{loadedEvent.workflowInstanceDataFields.StartDate}} às {{loadedEvent.workflowInstanceDataFields.EndDate}}</p>
+        <p>das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
         <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
         <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
       </ion-label>
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index d43507fdc..04ee37c33 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -1,7 +1,9 @@
 <ion-header class="ion-no-border">
   <div class="header-content">
     <div class="header-icon-left">
-      <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+      <button class="btn-no-color" (click)="close()">
+        <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+      </button>
     </div>
     <div class="header-title">
       <label>Eventos para Aprovação</label>

From 01626ad317825c516dc4ca5a7c261a593450da21 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 9 Apr 2021 11:34:07 +0100
Subject: [PATCH 4/4] save

---
 .../approve-event/approve-event.component.html      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.component.html
index 83a63b142..45f43ad3a 100644
--- a/src/app/shared/agenda/approve-event/approve-event.component.html
+++ b/src/app/shared/agenda/approve-event/approve-event.component.html
@@ -72,12 +72,15 @@
           <div *ngFor="let att of loadedEvent.workflowInstanceDataFields.ParticipantsList">
             <ion-label>{{att.Name}}</ion-label>
           </div>
+          <div class="line"></div>
+        </div>
+        <div *ngIf="loadedEvent.workflowInstanceDataFields.Body">
+          <h5>Detalhes</h5>
+          <ion-item lines="none" class="ion-no-margin ion-no-padding">
+              <p [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>
+          </ion-item>
+          <div class="line"></div>
         </div>
-        <div class="line"></div>
-        <h5>Detalhes</h5>
-        <ion-item class="ion-no-margin ion-no-padding">
-            <p [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>
-        </ion-item>
       </div>
 
       <div *ngIf="loadedAttachments" class="bottom-content">