From 92d438b506e5c3540579274a8af17915fa5bf690 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 29 Jul 2021 10:56:00 +0100
Subject: [PATCH 1/5] save

---
 .../edit-profile/edit-profile.page.html       |  42 +++++--
 .../edit-profile/edit-profile.page.scss       | 110 +++++++++++-------
 src/app/modals/profile/profile.page.scss      |   2 -
 .../events/edit-event/edit-event.page.html    |  12 +-
 src/app/pages/events/events.module.ts         |   1 -
 src/global.scss                               |   5 +-
 6 files changed, 105 insertions(+), 67 deletions(-)

diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html
index a80695759..33014055b 100644
--- a/src/app/modals/profile/edit-profile/edit-profile.page.html
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.html
@@ -1,13 +1,12 @@
 <ion-content class=" bg-blue">
-  <div class="btn-close d-flex" (click)="close()">
+  <div class="profile-content width-100 height-100">
+    <div class="btn-close d-flex" (click)="close()">
       <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
-  </div>
+    </div>
 
-  <div class="profile-content width-100">
-
-    <div class="d-flex justify-space-between align-center">
-      <div class="go-back d-flex align-center"  (click)="close()">
-        <ion-icon class="icon" src="assets/images/icons-calendar-arrow-left.svg"></ion-icon> <div>Perfil</div>
+    <div class="profile-title d-flex justify-space-between align-center width-100">
+      <div class="d-flex align-center">
+        <div>Dados do perfil</div>
       </div>
 
       <!-- <div class="d-flex " (click)="close()">
@@ -22,12 +21,32 @@
     </div>
 
     <div class="profile-info">
-      <div class="label-text">Dados Perfil</div>
       <div class="user-role">{{loggeduser.RoleDescription}}</div>
-      <div class="email">{{loggeduser.Email}}</div>
+
+      <div class="container-div width-100">
+        <div class="ion-item-class-2">
+          <div class="ion-icon-class">
+            <ion-icon slot="start" name="person"></ion-icon>
+          </div>
+          <div class="ion-input-class">
+            <ion-input placeholder="Nome" [(ngModel)]="loggeduser.FullName"></ion-input>
+          </div>
+        </div>
+      </div>
+
+      <div class="container-div width-100">
+        <div class="ion-item-class-2">
+          <div class="ion-icon-class">
+            <ion-icon slot="start" name="mail"></ion-icon>
+          </div>
+          <div class="ion-input-class">
+            <ion-input placeholder="Email" [(ngModel)]="loggeduser.Email"></ion-input>
+          </div>
+        </div>
+      </div>
     </div>
 
-    <div class="login-preference" (mouseover)="checkState()" (click)="checkState()">
+    <div class="login-preference width-100" (mouseover)="checkState()" (click)="checkState()">
       <div class="preference">Preferência Login</div>
 
       <ion-row>
@@ -44,11 +63,10 @@
             Impressão Digital
           </div>
         </ion-col>
-
       </ion-row>
     </div>
 
-    <div class="d-flex justify-center mt-10">
+    <div class="d-flex width-100 justify-center mt-10">
       <button (click)="addPin()" class="btn-ok  buttonSize" fill="clear" color="#fff" >
         <ion-label>Alterar PIN</ion-label>
       </button>
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.scss b/src/app/modals/profile/edit-profile/edit-profile.page.scss
index fd1c49f37..5e3715343 100644
--- a/src/app/modals/profile/edit-profile/edit-profile.page.scss
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.scss
@@ -1,5 +1,5 @@
 .btn-close{
-    padding: 20px 20px;
+    //padding: 20px 20px;
     justify-content: center;
     align-items: center;
     float: right;
@@ -7,61 +7,82 @@
 
 .profile-content{
   width: 100% !important;
-  padding: 0px 20px;
+  padding: 20px 20px;
   float: left;
+
+  .profile-title{
+    font-size: 25px;
+    font-weight: 300;
+    margin-bottom: 20px;
+  }
+  .profile-info{
+    margin-top: 20px;
+    color: #fff;
+    font-family: Roboto;
+    font-size: 13px;
+
+    .user-role{
+        background-color: white;
+        border-radius: 5px;
+        padding: 12px;
+        color: black;
+        text-align: center;
+        margin-bottom: 5px;
+    }
+
+    .container-div{
+      margin-bottom: 5px;
+      float: left;
+      overflow: hidden;
+
+      .ion-item-class-2{
+        margin: 0px auto;
+      }
+      .ion-icon-class{
+        color: #ebebeb;
+        width: 40px;
+        height: 40px;
+        float: left;
+        padding: 5px;
+        font-size: 25px;
+      }
+      .ion-input-class{
+        width: calc(100% - 40px);
+        height: 40px;
+        border: 1px solid #ebebeb;
+        border-radius: 5px;
+        padding-left: 5px;
+        padding-right: 10px;
+        float: left;
+        background-color: transparent;
+      }
+    }
+  }
 }
 
 .icon{
-  font-size: 35px;
-}
-
-.go-back{
-  font-family: Roboto;
-  font-size: 25px;
-  .icon{
-      margin-right: 7px;
-  }
+  font-size: 40px;
 }
 
 .profile-pic{
-  width: 200px;
-  height: 200px;
-  border-radius: 20px;
-  margin: 0px auto;
-}
-
-.profile-info{
-  .label-text{
-      font-size: 15px;
-      font-weight: bold;
-      color: white;
-      margin-bottom: 10px;
-  }
-
-  .user-role{
-      background-color: white;
-      border-radius: 5px;
-      padding: 12px;
-      font-family: Roboto;
-      font-size: 13px;
-      color: black;
-      text-align: center;
-  }
-
-  .email {
-      margin-top: 15px;
-  }
-
+  width: 150px;
+  height: 150px;
+  border-radius: 50%;
+  margin: 0 auto;
+  border-color: transparent !important;
 }
 
 .login-preference{
-  margin-top: 44px;
+  margin-top: 15px;
+  float: left;
+  font-family: Roboto;
+  font-size: 13px;
+  font-weight: 300;
+
 
   .preference{
-      font-family: Roboto;
-      font-size: 15px;
-      margin-bottom: 20px;
-      font-weight: bold;
+      font-size: 20px;
+      margin-bottom: 0 !important;
   }
   .checkBox{
       margin-right: 10px;
@@ -70,4 +91,5 @@
 
 .buttonSize {
   width: 100% !important;
+  margin: 15px 0 15px 0 !important;
 }
diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss
index 081d3b5ff..8a26b47c2 100644
--- a/src/app/modals/profile/profile.page.scss
+++ b/src/app/modals/profile/profile.page.scss
@@ -77,8 +77,6 @@ ion-list{
     color: #000;
     overflow: hidden;
 
-    border: 1px solid blue;
-
     .notification-item{
       width: fit-content;
       float: left;
diff --git a/src/app/pages/events/edit-event/edit-event.page.html b/src/app/pages/events/edit-event/edit-event.page.html
index f789aaf58..1887e0428 100644
--- a/src/app/pages/events/edit-event/edit-event.page.html
+++ b/src/app/pages/events/edit-event/edit-event.page.html
@@ -3,7 +3,7 @@
     <ion-buttons slot="start">
       <ion-back-button defaultHref="{{ backURL }}"></ion-back-button>
     </ion-buttons>
-    <ion-title class="header-title">21Visualizar Evento</ion-title>
+    <ion-title class="header-title">Visualizar Evento</ion-title>
     <ion-buttons slot="end">
       <button (click)="deleteConfirm()" class="ion-icon-delete">
         <ion-icon name="trash"></ion-icon>
@@ -23,7 +23,7 @@
           <!-- Error messages -->
           <span class="error ion-padding" *ngIf="errorControl.subject.errors?.required">
             Campo obrigatório
-          </span>          
+          </span>
         <ion-item>
           <ion-label position="stacked">Descrição</ion-label>
           <ion-input class="capitalizeText" [(ngModel)]='loadedEvent.Body.Text'></ion-input>
@@ -60,7 +60,7 @@
               displayFormat="D MMM YYYY HH:mm" minuteValues="0,15,30,45"
               monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"></ion-datetime>
         </ion-item>
- 
+
           <div class="div-attach" >
             <ion-item>
               <ion-buttons slot="end" (click)="openAttendees()">
@@ -74,11 +74,11 @@
                 <ion-list >
                   <ion-item class="attendees" lines="none" >
                       <ion-icon class="attendees-icon" name="person" slot="start"></ion-icon>
-                      <ion-label class="capitalizeText" class="attendees-list">{{attendee.Name}}</ion-label> 
+                      <ion-label class="capitalizeText" class="attendees-list">{{attendee.Name}}</ion-label>
                   </ion-item>
                 </ion-list>
               </div>
-              
+
             </div>
             <div *ngIf="loadedEvent.Attendees.length > 1">
               <ion-button class="see-more-button" fill="none" shape="round" (click)="openAttendees()">
@@ -104,7 +104,7 @@
                   <ion-label>
                       <p>{{ att.Description }}</p>
                       <p>{{ att.CreateDate }}</p>
-                  </ion-label> 
+                  </ion-label>
                 </ion-item>
               </ion-list>
             </div>
diff --git a/src/app/pages/events/events.module.ts b/src/app/pages/events/events.module.ts
index 3f6e79aaf..1d2f27189 100644
--- a/src/app/pages/events/events.module.ts
+++ b/src/app/pages/events/events.module.ts
@@ -16,7 +16,6 @@ import { HeaderNoSearchPageModule } from 'src/app/shared/headers/header-no-searc
     CommonModule,
     FormsModule,
     IonicModule,
-
     EventsPageRoutingModule,
     HeaderNoSearchPageModule,
   ],
diff --git a/src/global.scss b/src/global.scss
index d3f1e1b5e..fa2738217 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -365,8 +365,9 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
         position: absolute;
         top: -40px;
         right: 0px;
-        height: 100%;
+        height: 90%;
         max-width: 400px;
+        border-radius: 0 0 25px 25px;
     }
 }
 
@@ -1082,4 +1083,4 @@ ngx-mat-datetime-content{
             border-left: 3px solid transparent !important;
         }
     }
-}
\ No newline at end of file
+}

From 038ccbe633c6ff7e7cf4cc5bb741a5d2a9bb1925 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 29 Jul 2021 11:40:25 +0100
Subject: [PATCH 2/5] save

---
 .../edit-profile/edit-profile.page.html       | 132 ++++++++++--------
 .../edit-profile/edit-profile.page.scss       |  35 ++++-
 src/app/modals/profile/profile.page.html      |   2 +-
 src/app/modals/profile/profile.page.scss      |   4 +-
 src/global.scss                               |   8 +-
 5 files changed, 109 insertions(+), 72 deletions(-)

diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html
index 33014055b..a485b69c5 100644
--- a/src/app/modals/profile/edit-profile/edit-profile.page.html
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.html
@@ -1,81 +1,91 @@
 <ion-content class=" bg-blue">
-  <div class="profile-content width-100 height-100">
-    <div class="btn-close d-flex" (click)="close()">
-      <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
-    </div>
-
-    <div class="profile-title d-flex justify-space-between align-center width-100">
-      <div class="d-flex align-center">
-        <div>Dados do perfil</div>
+  <div class="main-content width-100 overflow-y-auto height-100">
+    <div class="profile-header width-100">
+      <div class="div-logo d-md-none">
+        <div class="logo height-fit-content">
+          <img class="img" src='assets/images/logo-no-bg.png' alt='logo'>
+        </div>
       </div>
-
-      <!-- <div class="d-flex " (click)="close()">
+      <div class="btn-close d-flex" (click)="close()">
         <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
-      </div> -->
-    </div>
-
-    <div >
-      <div class="d-flex align-center">
-        <ion-icon  class="profile-pic"  src="assets/images/icons-default-profile.svg"></ion-icon>
       </div>
     </div>
+    <div class="profile-content overflow-y-auto width-100 height-100">
+      <div class="profile-title d-flex justify-space-between align-center width-100">
+        <div class="d-flex align-center">
+          <div>Dados do perfil</div>
+        </div>
 
-    <div class="profile-info">
-      <div class="user-role">{{loggeduser.RoleDescription}}</div>
+        <!-- <div class="d-flex " (click)="close()">
+          <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+        </div> -->
+      </div>
 
-      <div class="container-div width-100">
-        <div class="ion-item-class-2">
-          <div class="ion-icon-class">
-            <ion-icon slot="start" name="person"></ion-icon>
+      <div >
+        <div class="d-flex align-center">
+          <ion-icon  class="profile-pic"  src="assets/images/icons-default-profile.svg"></ion-icon>
+        </div>
+      </div>
+
+      <div class="profile-info">
+        <div class="user-role">{{loggeduser.RoleDescription}}</div>
+
+        <div class="container-div width-100">
+          <div class="ion-item-class-2">
+            <div class="ion-icon-class">
+              <ion-icon slot="start" name="person"></ion-icon>
+            </div>
+            <div class="ion-input-class">
+              <ion-input placeholder="Nome" [(ngModel)]="loggeduser.FullName"></ion-input>
+            </div>
           </div>
-          <div class="ion-input-class">
-            <ion-input placeholder="Nome" [(ngModel)]="loggeduser.FullName"></ion-input>
+        </div>
+
+        <div class="container-div width-100">
+          <div class="ion-item-class-2">
+            <div class="ion-icon-class">
+              <ion-icon slot="start" name="mail"></ion-icon>
+            </div>
+            <div class="ion-input-class">
+              <ion-input placeholder="Email" [(ngModel)]="loggeduser.Email"></ion-input>
+            </div>
           </div>
         </div>
       </div>
 
-      <div class="container-div width-100">
-        <div class="ion-item-class-2">
-          <div class="ion-icon-class">
-            <ion-icon slot="start" name="mail"></ion-icon>
-          </div>
-          <div class="ion-input-class">
-            <ion-input placeholder="Email" [(ngModel)]="loggeduser.Email"></ion-input>
-          </div>
-        </div>
+      <div class="login-preference width-100" (mouseover)="checkState()" (click)="checkState()">
+        <div class="preference">Preferência Login</div>
+
+        <ion-row>
+          <ion-col class="align-center d-flex">
+            <div class="d-flex align-center"  (click)="LoginPreferenceMethod('pin')">
+              <ion-checkbox [checked]="userLoginPreference=='pin' " class="checkBox" ></ion-checkbox>
+              PIN
+            </div>
+
+          </ion-col>
+          <ion-col class="align-center d-flex">
+            <div (click)="addFingerprint()" class="d-flex align-center">
+              <ion-checkbox class="checkBox" [checked]="false"></ion-checkbox>
+              Impressão Digital
+            </div>
+          </ion-col>
+        </ion-row>
       </div>
-    </div>
 
-    <div class="login-preference width-100" (mouseover)="checkState()" (click)="checkState()">
-      <div class="preference">Preferência Login</div>
-
-      <ion-row>
-        <ion-col class="align-center d-flex">
-          <div class="d-flex align-center"  (click)="LoginPreferenceMethod('pin')">
-            <ion-checkbox [checked]="userLoginPreference=='pin' " class="checkBox" ></ion-checkbox>
-            PIN
-          </div>
-
-        </ion-col>
-        <ion-col class="align-center d-flex">
-          <div (click)="addFingerprint()" class="d-flex align-center">
-            <ion-checkbox class="checkBox" [checked]="false"></ion-checkbox>
-            Impressão Digital
-          </div>
-        </ion-col>
-      </ion-row>
-    </div>
-
-    <div class="d-flex width-100 justify-center mt-10">
-      <button (click)="addPin()" class="btn-ok  buttonSize" fill="clear" color="#fff" >
-        <ion-label>Alterar PIN</ion-label>
-      </button>
+      <div class="d-flex width-100 justify-center mt-10">
+        <button (click)="addPin()" class="btn-ok  buttonSize" fill="clear" color="#fff" >
+          <ion-label>Alterar PIN</ion-label>
+        </button>
+      </div>
     </div>
   </div>
-
 </ion-content>
-
-<ion-footer class=" footer-container ion-no-border bg-blue">
+<!--
+  Para adicionar a funcionalidade assim que o método
+  para alterar o nome e email estiver pronto
+-->
+<ion-footer hidden class=" footer-container ion-no-border bg-blue">
 
   <div class="d-flex justify-space-between">
 
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.scss b/src/app/modals/profile/edit-profile/edit-profile.page.scss
index 5e3715343..dca68c803 100644
--- a/src/app/modals/profile/edit-profile/edit-profile.page.scss
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.scss
@@ -1,17 +1,40 @@
-.btn-close{
-    //padding: 20px 20px;
+.main-content{
+  overflow: hidden !important;
+}
+.profile-header{
+  margin: 0 em(20px);
+  // background-color: #0782c9;
+  padding: 20px 20px;
+  border: 0!important;
+  overflow: auto;
+
+  .div-logo{
+    background: transparent;
+    width: calc(100% - 40px) !important;
     justify-content: center;
-    align-items: center;
-    float: right;
+    display: flex;
+    float: left;
+
+    .logo{
+      width: 140px;
+      .img{
+        width: 100%;
+        margin: 0px auto;
+      }
+    }
+  }
+}
+.btn-close{
+  float: right !important;
 }
 
 .profile-content{
   width: 100% !important;
-  padding: 20px 20px;
+  padding: 0 20px 50px 20px;
   float: left;
 
   .profile-title{
-    font-size: 25px;
+    font-size: 20px;
     font-weight: 300;
     margin-bottom: 20px;
   }
diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html
index fbb6f01b3..627eec29b 100644
--- a/src/app/modals/profile/profile.page.html
+++ b/src/app/modals/profile/profile.page.html
@@ -1,7 +1,7 @@
 <ion-content class=" bg-blue">
 
   <div class="profile-header width-100">
-    <div class="div-logo">
+    <div class="div-logo d-md-none">
       <div class="logo height-fit-content">
         <img class="img" src='assets/images/logo-no-bg.png' alt='logo'>
       </div>
diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss
index 8a26b47c2..92d57ced5 100644
--- a/src/app/modals/profile/profile.page.scss
+++ b/src/app/modals/profile/profile.page.scss
@@ -22,9 +22,7 @@
   }
 }
 .btn-close{
-  justify-content: center;
-  align-items: center;
-  float: left;
+  float: right !important;
 }
 .profile-content{
     padding: 20px 20px;
diff --git a/src/global.scss b/src/global.scss
index fa2738217..5469ff27b 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -366,9 +366,15 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
         top: -40px;
         right: 0px;
         height: 90%;
-        max-width: 400px;
+        max-width: 100%;
         border-radius: 0 0 25px 25px;
     }
+
+    @media only screen and (min-width: 1140px) {
+      .modal-wrapper{
+        max-width: 400px;
+      }
+    }
 }
 
 

From 81c7075ac7dd1a121a855c777baedc6b194fcbb1 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 29 Jul 2021 14:22:10 +0100
Subject: [PATCH 3/5] save

---
 .../header-no-search.page.html                |  6 +-
 .../header-no-search.page.scss                | 20 +++++-
 src/assets/images/icons-default-profile.svg   | 63 +++++++++----------
 3 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.html b/src/app/shared/headers/header-no-search/header-no-search.page.html
index 95a960395..123b7daf0 100644
--- a/src/app/shared/headers/header-no-search/header-no-search.page.html
+++ b/src/app/shared/headers/header-no-search/header-no-search.page.html
@@ -56,9 +56,9 @@
           <ion-icon src='assets/images/icons-search.svg'></ion-icon>
         </div> -->
 
-        <div class="div-profile cursor-pointer" (click)="openProfile()">
-          <ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
-          <ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
+        <div class="div-profile d-flex cursor-pointer" (click)="openProfile()">
+          <ion-icon class="icon" src='assets/images/icons-default-profile.svg'></ion-icon>
+          <ion-label class="profile-text">{{loggeduser.Profile}}</ion-label>
         </div>
       </div>
     </div>
diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.scss b/src/app/shared/headers/header-no-search/header-no-search.page.scss
index 4ee6ed1cd..054b768c5 100644
--- a/src/app/shared/headers/header-no-search/header-no-search.page.scss
+++ b/src/app/shared/headers/header-no-search/header-no-search.page.scss
@@ -18,9 +18,27 @@
   margin: 0px auto;
 }
 .div-profile{
+  width: 45px;
+  height: 45px;
   font-size: 45px;
   justify-content: flex-end;
   display: flex;
+  background-color: transparent;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+
+  .icon{
+    position: relative;
+    border: none !important;
+  }
+
+  .profile-text{
+    font-size: 20px;
+    font-weight: 300;
+    width: fit-content;
+    position: absolute;
+  }
 }
 
 .desktop{
@@ -44,4 +62,4 @@
 
 .active{
   border-top: 7px solid white;
-}
\ No newline at end of file
+}
diff --git a/src/assets/images/icons-default-profile.svg b/src/assets/images/icons-default-profile.svg
index dd82c44a7..5bd3afe05 100644
--- a/src/assets/images/icons-default-profile.svg
+++ b/src/assets/images/icons-default-profile.svg
@@ -1,34 +1,31 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="120" height="120" viewBox="0 0 120 120">
-    <defs>
-        <filter id="b8vhf9zcla" width="111.2%" height="106.5%" x="-5.6%" y="-3.3%" filterUnits="objectBoundingBox">
-            <feOffset in="SourceAlpha" result="shadowOffsetOuter1"/>
-            <feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="7.5"/>
-            <feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.490302666 0"/>
-        </filter>
-        <circle id="u6jbltuc9c" cx="60" cy="60" r="60"/>
-        <path id="ggtp3ri2hb" d="M25 0h350c13.807 0 25 11.193 25 25v664H0V25C0 11.193 11.193 0 25 0z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <g>
-            <path fill="#0782C9" d="M0 75H1024V708H0z" transform="translate(-764 -120)"/>
-            <g fill="#0782C9">
-                <path d="M0 0H1024V150H0z" transform="translate(-764 -120)"/>
-            </g>
-            <g>
-                <g transform="translate(-764 -120) translate(624) matrix(1 0 0 -1 0 689)">
-                    <use fill="#000" filter="url(#b8vhf9zcla)" xlink:href="#ggtp3ri2hb"/>
-                    <use fill="#0782C9" xlink:href="#ggtp3ri2hb"/>
-                </g>
-                <g transform="translate(-764 -120) translate(624) translate(140 120)">
-                    <rect width="120" height="120" fill="#FFF" fill-opacity=".6" rx="60"/>
-                    <g>
-                        <mask id="e5tuzk8b4d" fill="#fff">
-                            <use xlink:href="#u6jbltuc9c"/>
-                        </mask>
-                        <path fill="#42B9FE" fill-opacity=".7" d="M60 28c15.464 0 28 13.431 28 30 0 10.406-4.945 19.574-12.454 24.955C92.175 89.521 104 106.317 104 126c0 25.405-19.7 46-44 46s-44-20.595-44-46c0-19.683 11.825-36.48 28.454-43.046C36.944 77.574 32 68.406 32 58c0-16.569 12.536-30 28-30z" mask="url(#e5tuzk8b4d)"/>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
+<svg width="120" height="120" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M-764 -45H260V588H-764V-45Z" fill="#0782C9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M-764 -120H260V30H-764V-120Z" fill="#0782C9"/>
+<g filter="url(#filter0_d)">
+<path d="M-115 569H235C248.807 569 260 557.807 260 544V-120H-140V544C-140 557.807 -128.807 569 -115 569Z" fill="black"/>
+</g>
+<path d="M-115 569H235C248.807 569 260 557.807 260 544V-120H-140V544C-140 557.807 -128.807 569 -115 569Z" fill="#0782C9"/>
+<path d="M120 60C120 26.8629 93.1371 0 60 0C26.8629 0 0 26.8629 0 60C0 93.1371 26.8629 120 60 120C93.1371 120 120 93.1371 120 60Z" fill="white" fill-opacity="0.6"/>
+<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="120" height="120">
+<path d="M60 120C93.1371 120 120 93.1371 120 60C120 26.8629 93.1371 0 60 0C26.8629 0 0 26.8629 0 60C0 93.1371 26.8629 120 60 120Z" fill="white"/>
+</mask>
+<g mask="url(#mask0)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60 28C75.464 28 88 41.431 88 58C88 68.406 83.055 77.574 75.546 82.955C92.175 89.521 104 106.317 104 126C104 151.405 84.3 172 60 172C35.7 172 16 151.405 16 126C16 106.317 27.825 89.52 44.454 82.954C36.944 77.574 32 68.406 32 58C32 41.431 44.536 28 60 28Z" fill="#42B9FE" fill-opacity="0.7"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_d" x="-155" y="-135" width="430" height="719" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="7.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.490303 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+<clipPath id="clip0">
+<rect width="120" height="120" rx="60" fill="white"/>
+</clipPath>
+</defs>
 </svg>

From 58a823ac465bac7d602b5f37baf9e16790120dd6 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 29 Jul 2021 14:37:09 +0100
Subject: [PATCH 4/5] change to API v5

---
 src/app/pages/events/events.page.ts | 52 +++++++++++++++--------------
 src/environments/environment.ts     |  2 +-
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 62697bb0d..b6465ec06 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -28,7 +28,7 @@ import { ExpedienteStorage } from 'src/app/store/expediente-storage-service.serv
 export class EventsPage implements OnInit {
   /* Get current system date */
   today = new Date();
-  
+
   months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
   days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
 
@@ -59,7 +59,7 @@ export class EventsPage implements OnInit {
   currentHoursMinutes: Date;
 
   showLoader: boolean;
-  
+
   taskslist:DailyWorkTask[] = [];
   expedientList:any;
 
@@ -72,8 +72,8 @@ export class EventsPage implements OnInit {
   loggeduser: User;
 
   constructor(
-    private eventService: EventsService, 
-    private router: Router, 
+    private eventService: EventsService,
+    private router: Router,
     private storageService:StorageService,
     public activatedRoute: ActivatedRoute,
     private alertController: AlertService,
@@ -89,7 +89,7 @@ export class EventsPage implements OnInit {
 
       // list
       this.LoadList();
-      
+
     }
 
   ngOnInit() {
@@ -102,7 +102,7 @@ export class EventsPage implements OnInit {
     this.showGreeting();
 
     const pathname = window.location.pathname
-    
+
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == pathname) {
         this.RefreshEvents();
@@ -130,30 +130,30 @@ export class EventsPage implements OnInit {
     let start = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
     let end = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" 23:59:59";
 
-    
+
     if(this.loggeduser.Profile == 'MDGPR') {
 
       let mdOficialEvents = await this.eventService.getAllMdOficialEvents(start, end).toPromise();
       let mdPessoalEvents = await this.eventService.getAllMdPessoalEvents(start, end).toPromise();
-        
+
       const list = mdOficialEvents.concat(mdPessoalEvents);
 
       this.toDayEventStorage.reset(list)
-      
+
       if(this.toDayEventStorage.eventsList.length > 0){
         this.currentEvent = this.toDayEventStorage.eventsList[0].Subject;
         this.currentHoursMinutes = this.toDayEventStorage.eventsList[0].StartDate;
       }
-      
+
       this.totalEvent = this.toDayEventStorage.eventsList.length;
       this.showLoader = false;
-      
+
     }
     else if (this.loggeduser.Profile == 'PR') {
 
       let prOficialEvents=  await this.eventService.getAllPrOficialEvents(start, end).toPromise();
       let prPessoalEvents=  await this.eventService.getAllPrPessoalEvents(start, end).toPromise();
-      
+
       const list = prOficialEvents.concat(prPessoalEvents);
 
       this.toDayEventStorage.reset(list)
@@ -165,7 +165,7 @@ export class EventsPage implements OnInit {
 
       this.totalEvent = this.toDayEventStorage.eventsList.length;
       this.showLoader = false;
-  
+
     }
 
 
@@ -176,17 +176,17 @@ export class EventsPage implements OnInit {
 
           let mdOficialEvents = await this.eventService.getAllMdOficialEvents(start, end).toPromise();
           let mdPessoalEvents = await this.eventService.getAllMdPessoalEvents(start, end).toPromise();
-          
+
             this.eventsList = mdOficialEvents.concat(mdPessoalEvents);
-            
+
             if(this.eventsList.length > 0){
               this.currentEvent = this.eventsList[0].Subject;
               this.currentHoursMinutes = this.eventsList[0].StartDate;
             }
-            
+
             this.totalEvent = this.eventsList.length;
             this.showLoader = false;
-           
+
         }
         else{
 
@@ -203,9 +203,9 @@ export class EventsPage implements OnInit {
 
             this.totalEvent = this.eventsList.length;
             this.showLoader = false;
-        
+
         }
-        
+
         break;
       case "Pessoal":
         if(this.loggeduser.Profile == 'MDGPR'){
@@ -220,7 +220,7 @@ export class EventsPage implements OnInit {
             this.showLoader = false;
            });
         }
-        
+
         break;
       case "Oficial":
         if(this.loggeduser.Profile == 'MDGPR'){
@@ -234,7 +234,7 @@ export class EventsPage implements OnInit {
             this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");;
             this.showLoader = false;
            });
-        } 
+        }
         break;
     } */
   }
@@ -276,7 +276,7 @@ export class EventsPage implements OnInit {
 
   async openEventDetail1(id:any){
     console.log(id);
-    
+
     const modal = await this.modalController.create({
       component: EventDetailPage,
        componentProps: {
@@ -294,6 +294,8 @@ export class EventsPage implements OnInit {
     switch (this.loggeduser.Profile) {
       case 'MDGPR':
         this.processes.GetTasksList("Expediente", false).subscribe(result => {
+          console.log(result);
+
           this.expedienteStorage.reset(result)
         });
         break;
@@ -301,7 +303,7 @@ export class EventsPage implements OnInit {
         this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
           this.expedienteStorage.reset(result)
         });
-        break;    
+        break;
       default:
         break;
     }
@@ -346,7 +348,7 @@ export class EventsPage implements OnInit {
       }
     }
   }
-    
-  
+
+
 }
 
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 57e33eb88..57c4335c5 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
+  apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V5/api/',
   // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/',
   apiChatUrl: 'https://www.tabularium.pt/api/v1/',
   /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */

From ae2319bbf3caed2ea71559c2cfbd34f2812fca88 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 29 Jul 2021 15:27:12 +0100
Subject: [PATCH 5/5] save

---
 src/app/pages/agenda/agenda.page.ts           | 212 +++++++++---------
 src/app/pages/events/events.page.ts           |   1 -
 .../event-list/event-list.page.html           | 131 ++++++-----
 .../event-list/event-list.page.scss           |  12 +-
 .../event-list/event-list.page.ts             |  11 +-
 5 files changed, 193 insertions(+), 174 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index c7b7f7af9..6eb67fbae 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -41,7 +41,7 @@ import { CalendarService } from 'src/app/store/calendar.service';
   ],
 })
 export class AgendaPage implements OnInit {
-  
+
   view: CalendarView = CalendarView.Day;
 
   viewDate: Date = new Date();
@@ -73,16 +73,16 @@ export class AgendaPage implements OnInit {
 
   showTimelinePR = false;
   showTimelineMD = false;
-  
+
   // timeline filter
   timelineFilterState: string = 'Todos';
   showTimelineFilterState: boolean;
   showTimeline=true;
-  
+
   /* List of events of our calendar */
   eventSource : eventSource[]  = []
 
-  
+
 
   /* The title of the calendar */
   viewTitle: string;
@@ -108,12 +108,12 @@ export class AgendaPage implements OnInit {
   taskParticipants: any = [];
   taskParticipantsCc: any = [];
   adding: "intervenient" | "CC" = "intervenient";
-  
+
   @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
   segment:  "Combinado" |  "Pessoal" | "Oficial" = "Combinado";
   timelineSedment : "Combinado" |  "Pessoal" | "Oficial";
-  
+
   profile:'mdgpr' | 'pr';
 
   // this will make  toggle add event and.
@@ -153,7 +153,7 @@ export class AgendaPage implements OnInit {
   IsEvent: "edit" | "add" | "view";
   viewingEventObject:  CalendarEvent ;
   loggeduser: User;
-  
+
   constructor(
     private alertCtrl: AlertController,
     @Inject(LOCALE_ID) private locale: string,
@@ -194,7 +194,7 @@ export class AgendaPage implements OnInit {
       this.updateEventListBox()
 
     }, 1000)
- 
+
   }
 
   ngOnInit() {
@@ -215,7 +215,7 @@ export class AgendaPage implements OnInit {
         if ( realoadCounter != 0) {
 
           this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
-          
+
         }
         realoadCounter++;
       }
@@ -258,7 +258,7 @@ export class AgendaPage implements OnInit {
     this.clearPostEvent();
 
     this.IsEvent= "view";
-    
+
     this.viewingEventObject = event;
 
     this.eventSelectedDate =  event.start;
@@ -266,7 +266,7 @@ export class AgendaPage implements OnInit {
 
     this.cloneAllmobileComponent();
 
-    
+
     this.showEventEditOrOpen = 'edit';
 
     if( window.innerWidth <= 1024) {
@@ -289,7 +289,7 @@ export class AgendaPage implements OnInit {
 
   onCurrentChanged = (ev: Date) => {
     // timeline change date
-    this.timelineDate = momentG(new Date(ev),'dd MMMM yyyy'); 
+    this.timelineDate = momentG(new Date(ev),'dd MMMM yyyy');
     this.viewDate = new Date(ev);
     // calendar change date
     this.eventSelectedDate = new Date(ev);
@@ -313,7 +313,7 @@ export class AgendaPage implements OnInit {
     this.rangeEndDate = ev.endTime;
 
     this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
-    
+
 
     try {
       this.myCal.update();
@@ -326,19 +326,19 @@ export class AgendaPage implements OnInit {
 
   // for calendar
   currentDayEventDisplayBorder(day: any, id: any) {
-    
+
     const events = day[id].events;
 
     if (events.length == 0) {
-      
+
       return "";
 
     } else if (events.length >= 1) {
-    
+
       let classs = [];
 
       events.forEach(element => {
-        
+
         const profile_ = element.profile == 'md'? 'mdgpr': 'pr';
         const eventtype = element.event.CalendarName;
 
@@ -347,11 +347,11 @@ export class AgendaPage implements OnInit {
         //   // console.log(id, (endMinutes + endHours))
         //   classs.push(`calendar-event-border`);
         // }
-        
+
         classs.push(`calendar-event-border calendar-${profile_}-event-type-${eventtype}`);
 
       });
-      
+
       return classs.join(' ');
     }
 
@@ -389,7 +389,7 @@ export class AgendaPage implements OnInit {
     this.showTimelineFilterState = false;
 
     eventsList.forEach((element, eventIndex) => {
-      
+
       // timeline start
       const startHours =  new Date(element.StartDate).getHours().toLocaleString();
       const EndHours = new Date(element.EndDate).getHours().toLocaleString();
@@ -413,7 +413,7 @@ export class AgendaPage implements OnInit {
 
     return events;
   }
-  
+
   eventFilter() {}
 
   TimelineDayEvent(day): string {
@@ -421,7 +421,7 @@ export class AgendaPage implements OnInit {
   }
 
   get calendarDay(): string {
-  
+
     return ((new Date(this.timelineDate)).getDate()).toString().padStart(2,'0')
   }
 
@@ -431,7 +431,7 @@ export class AgendaPage implements OnInit {
     const endTimeSamp = new Date(endTime).toLocaleDateString()
 
     const endMinutes = new Date(endTime).getMinutes()
-    const endHours = new Date(endTime).getHours() 
+    const endHours = new Date(endTime).getHours()
 
 
     if (startTimeSamp < endTimeSamp  && (endMinutes + endHours) == 0) {
@@ -449,7 +449,7 @@ export class AgendaPage implements OnInit {
     this.showLoader = true;
 
     if(window.innerWidth < 800){
-      
+
       // this.showTimeline = false;
 
       switch (this.segment) {
@@ -458,27 +458,29 @@ export class AgendaPage implements OnInit {
 
           if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR' ) {
             this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).then(
-              
+
               (response:any) => {
+                console.log(response);
+
 
                 // calendar
                 this.calendarService.removeRange(startTime, endTime, 'md')
 
                 // loop
                 this.calendarService.pushEvent(response, 'md');
-                
+
                 this.TimelineMDList = this.eventListBoxComponent.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, 'date')
-                
+
                 this.myCal.update();
                 this.myCal.loadEvents();
-  
+
                 this.showLoader = false;
                 this.showTimeline = true;
-                
+
             }).finally(()=>{
               this.showLoader = false;
             })
-      
+
           }
           else if(this.profile == "pr" && this.loggeduser.Profile == 'MDGPR') {
 
@@ -487,7 +489,7 @@ export class AgendaPage implements OnInit {
               this.calendarService.removeRange(startTime, endTime, 'pr')
               // calendar
               this.calendarService.pushEvent(response, 'pr');
-                              
+
               this.TimelineMDList = this.eventListBoxComponent.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, 'date')
 
               this.myCal.update();
@@ -495,31 +497,31 @@ export class AgendaPage implements OnInit {
 
               this.showLoader = false;
               this.showTimeline = true;
-  
+
               }).finally(()=>{
                 this.showLoader = false;
-              })          
+              })
 
           }
           else if(this.loggeduser.Profile == 'PR') {
             this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then(
               (response:any) => {
-                
+
                 // calendar
                 // this.eventSource=[];
 
                 // clear the current month only
                 this.calendarService.removeRange(startTime, endTime, 'pr')
-  
+
                 this.calendarService.pushEvent(response, 'pr');
-                
-               
+
+
                 this.TimelineMDList = this.eventListBoxComponent.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, 'date')
-                
+
 
                 this.myCal.update();
                 this.myCal.loadEvents();
-  
+
                 this.showLoader = false;
                 this.showTimeline = true;
 
@@ -529,21 +531,21 @@ export class AgendaPage implements OnInit {
               })
           }
         break;
-  
+
         case "Pessoal":
           //Inicializa o array eventSource
           if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
             this.eventService.getAllMdPessoalEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((response:any) => {
-                
+
               this.calendarService.removeRange(startTime, endTime, 'md')
 
               const eventsList = response.filter(data => data.CalendarName == "Pessoal");
               // loop
               this.calendarService.pushEvent(eventsList, 'md');
-              
-             
+
+
               this.TimelineMDList = this.eventListBoxComponent.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, 'date')
-              
+
               this.myCal.update();
               this.myCal.loadEvents();
 
@@ -552,22 +554,22 @@ export class AgendaPage implements OnInit {
             }).finally(()=>{
               this.showLoader = false;
             })
-  
+
           }
           else{
             this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((response:any) => {
               //this.eventSource=[];
-              
+
               // clear the current month only
               this.calendarService.removeRange(startTime, endTime, 'pr')
 
               const eventsList = response.filter(data => data.CalendarName == "Pessoal");
               this.calendarService.pushEvent(eventsList, 'pr');
 
-              
+
               this.TimelineMDList = this.eventListBoxComponent.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, 'date')
-              
-              
+
+
               this.myCal.update();
               this.myCal.loadEvents();
 
@@ -579,7 +581,7 @@ export class AgendaPage implements OnInit {
             })
           }
           break;
-  
+
         case "Oficial":
 
           //Inicializa o array eventSource
@@ -587,37 +589,37 @@ export class AgendaPage implements OnInit {
 
           if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
             this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((res:any) => {
-              
+
 
               this.calendarService.removeRange(startTime, endTime, 'md')
 
               const eventsList = res.filter(data => data.CalendarName == "Oficial");
-              
+
               this.calendarService.pushEvent(eventsList, 'md');
 
-               
+
                 this.TimelineMDList = this.eventListBoxComponent.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, 'date')
 
                 this.myCal.update();
                 this.myCal.loadEvents();
-  
+
                 this.showLoader = false;
                 this.showTimeline = true;
-  
+
               }).finally(()=>{
                 this.showLoader = false;
               })
           } else {
             this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((res:any) => {
-              
-              // this.eventSource=[];  
+
+              // this.eventSource=[];
 
               this.calendarService.removeRange(startTime, endTime, 'pr')
 
               const  eventsList = res.filter(data => data.CalendarName == "Oficial");
               this.calendarService.pushEvent(eventsList, 'pr');
 
-             
+
               this.TimelineMDList = this.eventListBoxComponent.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, 'date')
 
               this.myCal.update();
@@ -631,24 +633,24 @@ export class AgendaPage implements OnInit {
             })
           }
           break;
-  
-      } 
+
+      }
     } else {
       // calendar
 
       let counter = 0;
-      
+
       if(this.loggeduser.Profile == 'MDGPR') {
-        
+
         this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).then( (response:any) => {
-            
+
           let eventsList  = response;
 
           this.calendarService.removeRange(startTime, endTime, 'md')
 
           // loop
           this.calendarService.pushEvent(eventsList, 'md');
-          
+
           this.TimelineMDList = this.eventListBoxComponent.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, 'date')
 
           this.myCal.update();
@@ -660,7 +662,7 @@ export class AgendaPage implements OnInit {
           if(counter==2) {
             this.showLoader = false;
           }
-           
+
 
         }).finally(()=> {
           counter++;
@@ -670,21 +672,21 @@ export class AgendaPage implements OnInit {
         })
 
         this.eventService.getAllSharedEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((response:any) => {
-    
+
           let eventsList = response;
-            
+
           // clear the current month only
           this.calendarService.removeRange(startTime, endTime, 'pr')
 
           this.calendarService.pushEvent(eventsList, 'pr');
 
           this.TimelinePRList = this.eventListBoxComponent.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, 'date')
-          
+
           this.myCal.update();
           this.myCal.loadEvents();
 
           this.showTimelinePR = true;
-          
+
           counter++;
 
           if(counter==2 || this.loggeduser.Profile == 'PR') {
@@ -701,7 +703,7 @@ export class AgendaPage implements OnInit {
       } else {
 
       this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((response:any) => {
-    
+
         let eventsList;
         if(this.segment == 'Oficial') {
           eventsList = response.filter(data => data.CalendarName == "Oficial");
@@ -710,20 +712,20 @@ export class AgendaPage implements OnInit {
         } else {
           eventsList = response;
         }
-        
+
         // clear the current month only
         this.calendarService.removeRange(startTime, endTime, 'pr')
 
         this.calendarService.pushEvent(eventsList, 'pr');
 
         this.TimelinePRList = this.eventListBoxComponent.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, 'date')
-        
+
 
         this.myCal.update();
         this.myCal.loadEvents();
 
         this.showTimelinePR = true;
-        
+
         counter++;
 
         if(counter==1 || this.loggeduser.Profile == 'PR') {
@@ -737,7 +739,7 @@ export class AgendaPage implements OnInit {
       })
 
     }
-     
+
     }
   }
 
@@ -756,34 +758,34 @@ export class AgendaPage implements OnInit {
       var startDate: any = new Date(event.start);
 
       var endDate: any = this.EventTretment({
-        startTime: startDate, 
+        startTime: startDate,
         endTime: event.end
       })
-      
+
       const day = (((new Date (event.start)).getDate())).toString().padStart(2,'0')
-      
+
       event.manyDays = false
 
 
       event.todayOnly = new Date(event.start).toLocaleDateString() == new Date(event.end).toLocaleDateString()
 
-     
+
 
       if(!days.hasOwnProperty(day)) {
         days[day] = []
       }
 
       if (new Date(startDate).toLocaleDateString() != new Date(endDate).toLocaleDateString()) {
-        
+
         // difference
         const diffTime = Math.abs(endDate - startDate);
-        const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24)); 
+        const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
 
         if (diffDays <= 150 && !event.event.IsAllDayEvent  ) {
 
 
           if (diffDays >= 1) {
-            
+
             const StartEvent =  Object.assign({}, {
               title: event.title,
               start: event.start,
@@ -805,28 +807,28 @@ export class AgendaPage implements OnInit {
               endMany: false,
               middle: false
             })
-            
+
             days[day].push(StartEvent)
-            
+
             let i = 1;
-            
-            while (startDate.getFullYear() !=  endDate.getFullYear() || 
+
+            while (startDate.getFullYear() !=  endDate.getFullYear() ||
               startDate.getMonth() != endDate.getMonth() ||
               startDate.getDate() != endDate.getDate()) {
 
               const newDate = startDate.setDate(startDate.getDate()+ i)
 
               let otherDays =   (((new Date (newDate)).getDate())).toString().padStart(2,'0')
-                
+
               event.other = true
-              
+
               event.start = newDate
               if(!days.hasOwnProperty(otherDays)) {
 
                 days[otherDays] = []
               }
-              
-              if (!(startDate.getFullYear() !=  endDate.getFullYear() || 
+
+              if (!(startDate.getFullYear() !=  endDate.getFullYear() ||
               startDate.getMonth() != endDate.getMonth() ||
               startDate.getDate() != endDate.getDate())) {
                 // last push
@@ -881,7 +883,7 @@ export class AgendaPage implements OnInit {
                 })
                 days[otherDays].push(EndEvent)
               }
-              
+
             }
 
           } else {
@@ -893,7 +895,7 @@ export class AgendaPage implements OnInit {
 
         }
 
-      } 
+      }
 
       days[day].push(event)
 
@@ -908,7 +910,7 @@ export class AgendaPage implements OnInit {
         }
       })
     }, 10)
-    
+
     return days
   }
 
@@ -955,7 +957,7 @@ export class AgendaPage implements OnInit {
   }
 
   async openAddEvent() {
-    
+
     await this.cloneAllmobileComponent();
 
     this.showEventEditOrOpen = 'add';
@@ -975,7 +977,7 @@ export class AgendaPage implements OnInit {
       await modal.present();
       modal.onDidDismiss().then((data) => {
         if(data){
-          
+
         }
         this.openAddEventDismiss(data['data'])
       });
@@ -1015,7 +1017,7 @@ export class AgendaPage implements OnInit {
 
     this.router.navigate(['/home/agenda', eventId, 'agenda']);
     /* console.log(this.profile);
-    
+
     const modal = await this.modalCtrl.create({
       component: ViewEventPage,
       componentProps:{
@@ -1035,11 +1037,11 @@ export class AgendaPage implements OnInit {
 
   // open component
   async viewEventDetailDismiss(data) {
-    
+
     await this.cloneAllmobileComponent()
 
     if (data.type == 'edit') {
-      
+
       this.selectedEvent = data.event;
       this.postEvent = data.event;
 
@@ -1079,7 +1081,7 @@ export class AgendaPage implements OnInit {
   approveEventDismiss({saveData, serialNumber, action}) {
 
     window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {}
-    
+
     if(action == 'Aprovar') {
       this.eventToaprove = {
         back: true,
@@ -1111,7 +1113,7 @@ export class AgendaPage implements OnInit {
     }
 
   }
-    
+
   closeEventToApproveGoBack() {
     if( window.innerWidth <= 801){
       this.router.navigate(['/home/agenda/event-list']);
@@ -1154,7 +1156,7 @@ export class AgendaPage implements OnInit {
   async openAttendeesComponent(data) {
 
     this.adding = data.type
-    
+
     this.cloneAllmobileComponent();
     this.mobileComponent.showAttendees = true;
   }
@@ -1174,7 +1176,7 @@ export class AgendaPage implements OnInit {
 
 
   async GoBackEditOrAdd() {
-    
+
     if(this.showEventEditOrOpen == "edit") {
       this.cloneAllmobileComponent();
 
@@ -1210,7 +1212,7 @@ export class AgendaPage implements OnInit {
     this.taskParticipants = removeDuplicate(data)
 
   }
-  
+
   async setIntervenientCC(data) {
     this.taskParticipantsCc = removeDuplicate(data)
   }
@@ -1255,11 +1257,11 @@ export class AgendaPage implements OnInit {
         }
       })
     }, 100)
-    
+
   }
 
   async showEventBox(event) {
-    
+
     if ( event.event.CalendarName == this.segment || this.segment == 'Combinado') {
       return true
     }
@@ -1279,4 +1281,4 @@ export class AgendaPage implements OnInit {
     return reuslt.length != 0
   }
 
-}
\ No newline at end of file
+}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index b6465ec06..072a06dbd 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -295,7 +295,6 @@ export class EventsPage implements OnInit {
       case 'MDGPR':
         this.processes.GetTasksList("Expediente", false).subscribe(result => {
           console.log(result);
-
           this.expedienteStorage.reset(result)
         });
         break;
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 50c8b55be..ade35c9ba 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,77 +1,84 @@
 <ion-header class="ion-no-border">
   <app-header></app-header>
 </ion-header>
+
+<ion-header class="ion-no-border header-2">
+  <div class="header-content">
+    <div class="header-icon-left">
+      <button class="btn-no-color cursor-pointer" (click)="goBack()">
+        <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+      </button>
+    </div>
+    <div class="header-title">
+      <label>Eventos para Aprovação</label>
+    </div>
+  <ion-toolbar>
+    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
+      <ion-segment-button value="MDGPR">
+        Meu calendário
+      </ion-segment-button>
+      <ion-segment-button value="PR">
+        Presidente da República
+      </ion-segment-button>
+    </ion-segment>
+  </ion-toolbar>
+
+</div>
+</ion-header>
+
 <ion-content>
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
-    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
      <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <div class="main-content d-flex height-100" [ngSwitch]="segment">
-    <div class="content d-flex flex-column">
-      <div class="header-content">
-        <div class="header-icon-left">
-          <button class="btn-no-color cursor-pointer" (click)="goBack()">
-            <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
-          </button>
-        </div>
-        <div class="header-title">
-          <label>Eventos para Aprovação</label>
-        </div>
-      <ion-toolbar>
-        <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
-          <ion-segment-button value="MDGPR">
-            Meu calendário
-          </ion-segment-button>
-          <ion-segment-button value="PR">
-            Presidente da República
-          </ion-segment-button>
-        </ion-segment>
-      </ion-toolbar>
-      <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
-    </div>
+  <div class="main-content d-flex height-100" >
 
-    <ion-list *ngSwitchCase="'MDGPR'">
-      <div *ngIf="eventaprovacaostore.listmd" class="overflow-y-auto height-100">
+    <div class="content d-flex flex-column">
+    <div [ngSwitch]="segment">
+      <ion-list *ngSwitchCase="'MDGPR'">
+        <div *ngIf="eventaprovacaostore.listmd" class="overflow-y-auto height-100">
+            <ion-item-sliding>
+              <ion-item class="Rectangle cursor-pointer" lines="none"
+                *ngFor="let event of eventaprovacaostore.listmd" (click)="goToEventToApproveDetail(event.serialNumber)">
+
+                <div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
+                  <div class="approve-event-time">
+                    <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
+                    <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
+                  </div>
+                  <div class="approve-event-detail">
+                    <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
+                    <p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
+                    <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
+                  </div>
+                </div>
+              </ion-item>
+            </ion-item-sliding>
+        </div>
+      </ion-list>
+
+      <ion-list *ngSwitchCase="'PR'">
+        <div *ngIf="eventaprovacaostore.listpr" class="overflow-y-auto height-100">
           <ion-item-sliding>
             <ion-item class="Rectangle cursor-pointer" lines="none"
-              *ngFor="let event of eventaprovacaostore.listmd" (click)="goToEventToApproveDetail(event.serialNumber)">
-
-              <div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
-                <div class="approve-event-time">
-                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
-                  <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
+                *ngFor="let event of eventaprovacaostore.listpr" (click)="goToEventToApproveDetail(event.serialNumber)">
+                <div class="content-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
+                  <div class="approve-event-time">
+                    <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
+                    <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
+                  </div>
+                  <div class="approve-event-detail">
+                    <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
+                    <p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
+                    <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
+                  </div>
                 </div>
-                <div class="approve-event-detail">
-                  <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
-                  <p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
-                  <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
-                </div>
-              </div>
-            </ion-item>
+              </ion-item>
           </ion-item-sliding>
-      </div>
-    </ion-list>
-    <ion-list *ngSwitchCase="'PR'">
-      <div *ngIf="eventaprovacaostore.listpr" class="overflow-y-auto height-100">
-        <ion-item-sliding>
-          <ion-item class="Rectangle cursor-pointer" lines="none"
-              *ngFor="let event of eventaprovacaostore.listpr" (click)="goToEventToApproveDetail(event.serialNumber)">
-              <div class="content-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
-                <div class="approve-event-time">
-                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
-                  <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
-                </div>
-                <div class="approve-event-detail">
-                  <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
-                  <p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
-                  <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
-                </div>
-              </div>
-            </ion-item>
-        </ion-item-sliding>
-      </div>
-    </ion-list>
+        </div>
+      </ion-list>
+    </div>
   </div>
   </div>
 </ion-content>
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.scss b/src/app/pages/gabinete-digital/event-list/event-list.page.scss
index 4cf050d1f..00df541f2 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.scss
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.scss
@@ -1,11 +1,17 @@
 @import '~src/function.scss';
+.header-2 {
+  border-top-right-radius: 24px;
+  border-top-left-radius: 24px;
+}
+.header-2{
+  padding: 30px 20px 0 20px !important;
+  background-color: white;
+}
 .main-content{
   background-color: #fff !important;
-  border-top-left-radius: 25px;
-  border-top-right-radius: 25px;
 }
 .content{
-  padding: 30px 20px 0 20px !important;
+  padding: 0px 20px 0 20px !important;
   /* margin: 0 auto; */
   float: left;
   overflow: auto;
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index def667ae3..6fa4760af 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -45,7 +45,7 @@ export class EventListPage implements OnInit {
     this.router.events.forEach((event) => {
       if (event instanceof NavigationStart && event.url.startsWith(pathname)) {
         if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
-          this.doRefresh()
+          this.refreshing()
         } else {
           this.LoadToApproveEvents()
         }
@@ -76,12 +76,16 @@ export class EventListPage implements OnInit {
       let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
       this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
       this.eventaprovacaostore.resetmd(this.eventsMDGPRList);
+      console.log(this.eventsMDGPRList);
+
     }
     else if(this.segment == 'PR'){
       let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
       let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
       this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
       this.eventaprovacaostore.resetpr(this.eventsPRList);
+      console.log(this.eventsMDGPRList);
+
     }
     this.showLoader = false;
     this.skeletonLoader = false
@@ -124,10 +128,11 @@ export class EventListPage implements OnInit {
     }, 1000);
   }
 
-  doRefresh() {
-    
+  doRefresh(event) {
+
     setTimeout(() => {
       this.LoadToApproveEvents();
+      event.target.complete();
     }, 1000);
   }