From 5a8a7d76c4c99ddb9344f73140c66fbffdfc74d9 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 5 Jan 2021 13:58:15 +0100
Subject: [PATCH] some corrections

---
 src/app/pages/events/events.page.html         | 15 ++++---
 src/app/pages/events/events.page.scss         |  5 +++
 src/app/pages/events/events.page.ts           |  5 +++
 src/assets/images/icons-correspondencias.svg  | 40 +++++++++++++++++++
 ...da-active.svg => icons-default-agenda.svg} |  0
 5 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 src/assets/images/icons-correspondencias.svg
 rename src/assets/images/{icons-nav-agenda-active.svg => icons-default-agenda.svg} (100%)

diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 242ff2532..9de3185fa 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -9,19 +9,19 @@
     <p class="time ion-text-center">{{customDate}}</p>
   </ion-label>
   <ion-label>
-    <p class="event-number p-small ion-text-center"> <bold>{{totalEvent}}</bold> eventos agendados para hoje</p>
+    <p class="event-number p-small ion-text-center"> <strong>{{totalEvent}}</strong> eventos agendados para hoje</p>
   </ion-label>
 
   <div class="next-meeting">
     <div class="meeting-time">{{hoursMinutes}}</div>
-    <div class="meeting-description">Reunião de Conselho de Ministros no Palácio Presidencial</div>
+    <div class="meeting-description"> "{{currentEvent}}"</div>
   </div>
 
   <div class="conteiner-box">
     <div class="schedule">
       <div class="schedule-header">
         <div class="title">
-          <ion-icon class="icon" slot="end" src="assets/images/icons-nav-agenda-active.svg" ></ion-icon>
+          <ion-icon class="icon" slot="end" src="assets/images/icons-default-agenda.svg" ></ion-icon>
           <div class="text">A sua Agenda</div>
         </div>
         <ion-icon class="icon-next" slot="end" src="assets/images/icons-arrow-circle-arrow-right.svg" ></ion-icon>
@@ -59,7 +59,7 @@
     <div class="schedule">
       <div class="schedule-header">
         <div class="title">
-          <ion-icon class="icon" slot="end" src="assets/images/icons-nav-agenda-bag.svg"></ion-icon>
+          <ion-icon class="icon" slot="end" src="assets/images/icons-correspondencias.svg"></ion-icon>
           <div class="text">Correspondência por ler</div>
         </div>
         <ion-icon class="icon-next" slot="end" src="assets/images/icons-arrow-circle-arrow-right.svg" ></ion-icon>
@@ -69,11 +69,16 @@
         <ul>
           <li *ngFor = "let task of taskslist"
           [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]">
-  
+          <div class="d-flex">
+            <div class="schedule-date">
+              <div class="time-end">{{task.CreateDate | date: 'd/M/yy'}}</div>
+              <div class="time-start">{{task.CreateDate | date: 'hh:mm'}}</div>
+            </div>
             <div class="schedule-details pointer">
               <div class="description">{{ task.Remetente }}</div>
               <div class="location">{{ task.Folio }}</div>
             </div>
+          </div>
           </li>
 
         </ul>
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss
index 07df9f739..5df488337 100644
--- a/src/app/pages/events/events.page.scss
+++ b/src/app/pages/events/events.page.scss
@@ -393,6 +393,11 @@ ion-toolbar{
             font-size: 13px;
           }
         }
+        .schedule-date{
+          width: 22%;
+          color: #797979 !important;
+          font-size: 13px;
+        }
         .schedule-details{
           display: flex;
           flex-wrap: wrap;
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index c143f1a2a..002c690a9 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -37,6 +37,7 @@ export class EventsPage implements OnInit {
   /* Set segment variable */
   segment:string;
   public profile:string;
+  currentEvent: any;
 
   eventsList: Event[];  
   officialeventsList: Event[];
@@ -130,12 +131,16 @@ export class EventsPage implements OnInit {
         if(this.profile == "mdgpr"){
           this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt') /* + ' 00:00:00' */, formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
             this.eventsList = res;
+            this.currentEvent = res[0].Subject;
+            this.totalEvent = this.eventsList.length;
             this.showLoader = false;
            });
         }else{
           this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
               this.eventsList = res;
               console.log(this.eventsList);
+              this.currentEvent = res[0].Subject;
+              this.totalEvent = this.eventsList.length;
               this.showLoader = false;
           });
         }
diff --git a/src/assets/images/icons-correspondencias.svg b/src/assets/images/icons-correspondencias.svg
new file mode 100644
index 000000000..306a41a35
--- /dev/null
+++ b/src/assets/images/icons-correspondencias.svg
@@ -0,0 +1,40 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="35" height="35" viewBox="0 0 35 35">
+    <defs>
+        <filter id="fapb0fzm7a" width="116%" height="123.6%" x="-8%" y="-5.9%" filterUnits="objectBoundingBox">
+            <feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/>
+            <feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation=".5"/>
+            <feComposite in="shadowBlurOuter1" in2="SourceAlpha" operator="out" result="shadowBlurOuter1"/>
+            <feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.187390734 0"/>
+        </filter>
+        <filter id="pi5d2sdvoc" width="116%" height="123.6%" x="-8%" y="-5.9%" filterUnits="objectBoundingBox">
+            <feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/>
+            <feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation=".5"/>
+            <feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.187390734 0"/>
+        </filter>
+        <path id="6jl3ycknhb" d="M24 19.355H1c-.552 0-1-.448-1-1V3.419c0-.552.448-1 1-1h23c.552 0 1 .448 1 1v14.936c0 .552-.448 1-1 1z"/>
+        <path id="ip12esh68d" d="M2.42 19.355L25 4.032V3.42c0-.552-.448-1-1-1h-1.42L0 17.742v.613c0 .552.448 1 1 1h1.42z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd">
+        <g>
+            <g>
+                <g>
+                    <g>
+                        <path stroke="#591E00" d="M15.935.5l.5 2.226H9.371V1l6.564-.5z" transform="translate(-40 -461) translate(20 441) translate(20 20) translate(5 7)"/>
+                        <g transform="translate(-40 -461) translate(20 441) translate(20 20) translate(5 7)">
+                            <use fill="#000" filter="url(#fapb0fzm7a)" xlink:href="#6jl3ycknhb"/>
+                            <path fill="#CE571A" stroke="#EBEBEB" stroke-linejoin="square" stroke-opacity=".194" d="M24 2.92l.5 15.435-23.5.5L.5 3.419l23.5-.5z"/>
+                        </g>
+                        <g transform="translate(-40 -461) translate(20 441) translate(20 20) translate(5 7)">
+                            <use fill="#000" filter="url(#pi5d2sdvoc)" xlink:href="#ip12esh68d"/>
+                            <use fill="#8B3002" xlink:href="#ip12esh68d"/>
+                        </g>
+                        <path fill="#797979" d="M2.92 1.613h1.419c.276 0 .5.224.5.5v.306h-2.42v-.306c0-.276.224-.5.5-.5z" transform="translate(-40 -461) translate(20 441) translate(20 20) translate(5 7)"/>
+                        <path fill="#591E00" d="M3.629 19.355c.223 0 .403.18.403.403v.403h-.806v-.403c0-.223.18-.403.403-.403z" transform="translate(-40 -461) translate(20 441) translate(20 20) translate(5 7) matrix(1 0 0 -1 0 39.516)"/>
+                        <path fill="#797979" d="M20.661 1.613h1.42c.276 0 .5.224.5.5v.306h-2.42v-.306c0-.276.224-.5.5-.5z" transform="translate(-40 -461) translate(20 441) translate(20 20) translate(5 7)"/>
+                        <path fill="#591E00" d="M21.371 19.355c.223 0 .403.18.403.403v.403h-.806v-.403c0-.223.18-.403.403-.403z" transform="translate(-40 -461) translate(20 441) translate(20 20) translate(5 7) matrix(1 0 0 -1 0 39.516)"/>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/assets/images/icons-nav-agenda-active.svg b/src/assets/images/icons-default-agenda.svg
similarity index 100%
rename from src/assets/images/icons-nav-agenda-active.svg
rename to src/assets/images/icons-default-agenda.svg