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

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>

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>

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>
@@ -48,22 +50,26 @@
     <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>
     </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 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>

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>

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">