From 690ef55a792ff8a6d8867fcee1610356a63d7e78 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 11 Jun 2021 13:54:18 +0100
Subject: [PATCH] save

---
 src/app/pages/agenda/agenda.page.scss         |  7 ++-
 .../approve-event/approve-event.page.html     |  7 +--
 .../approve-event/approve-event.page.scss     |  2 +-
 .../agenda/view-event/view-event.page.html    | 36 +--------------
 .../agenda/view-event/view-event.page.scss    | 44 +++++++++++++------
 5 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 332dd05fc..5e10882bd 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -504,14 +504,17 @@ td.monthview-primary-with-event {
     flex-wrap: wrap;
     align-items: center;
     width: 100%;
+    overflow: auto;
+
     .location{
+      width: 100%;
       font-family: Roboto;
       font-size: 13px;
       color: black;
-      width: 100%;
     
     }
     .description{
+      width: 100%;
       font-family: Roboto;
       font-size: 15px;
       font-weight: bold;
@@ -612,7 +615,7 @@ td.monthview-primary-with-event {
 }
 
 .event-details{
-  width: 100%;
+  width: 40%;
   background: white;
   border-top-right-radius: 25px;
 }
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index fa7cad6fd..a65827e6e 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -23,7 +23,9 @@
           <label>{{loadedEvent.workflowInstanceDataFields.Subject}} 11 </label>
         </div>
         <div  (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">
-          <ion-icon src="assets/images/icons-edit.svg"></ion-icon>
+          <button class="btn-no-color">
+            <ion-icon src="assets/images/icons-edit.svg"></ion-icon>
+          </button>
         </div>
       </div>
       <div class="upper-content d-flex flex-column">
@@ -95,7 +97,7 @@
   </div>
 </ion-content>
 
-<ion-footer class="display-none-{{showAside}}">
+<ion-footer class="display-none-{{showAside}} ion-no-border">
     <div class="buttons">
       <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
       <ion-menu-button  (click)="openMenu()" autoHide="false">
@@ -103,6 +105,5 @@
       </ion-menu-button>
       <button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
       <button hidden class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</button>
-
     </div>
 </ion-footer>
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.scss b/src/app/shared/agenda/approve-event/approve-event.page.scss
index 699b4287a..6bbc3b95c 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.scss
+++ b/src/app/shared/agenda/approve-event/approve-event.page.scss
@@ -161,7 +161,7 @@ ion-menu{
     display: flex;
     justify-content: space-between;
     overflow: auto;
-  
+    padding: 5px;
   
   .button-options {
       height: 44px;
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index a71b50b6d..6f93a5214 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -1,34 +1,3 @@
-<!-- <ion-menu autoHide="false" side="end" content-id="main-content" >
-  <ion-header>
-    <ion-toolbar translucent>
-      <ion-title>Menu</ion-title>
-    </ion-toolbar>
-  </ion-header>
-  <ion-content>
-    <ion-list>
-      <ion-item  (click)="openExpedientActionsModal('0',fulltask)">
-        <ion-icon name="documents" slot="start"></ion-icon>
-        <ion-label>Efectuar Despacho</ion-label>
-      </ion-item>
-      <ion-item  (click)="openExpedientActionsModal('1',fulltask)">
-        <ion-icon name="arrow-undo" slot="start"></ion-icon>
-        <ion-label>Pedido de Parecer</ion-label>
-      </ion-item>
-      <ion-item  (click)="openExpedientActionsModal('2',fulltask)">
-        <ion-icon name="arrow-redo" slot="start"></ion-icon>
-        <ion-label>Pedido de Deferimento</ion-label>
-      </ion-item>
-      <ion-item  (click)="openBookMeetingModal(task)">
-        <ion-icon name="calendar" slot="start"></ion-icon>
-        <ion-label>Marcar reunião</ion-label>
-      </ion-item>
-    </ion-list>
-  </ion-content>
-</ion-menu>
-<div class="ion-page d-none" id="main-content">
-  <ion-menu-button></ion-menu-button>
-</div> -->
-
 <ion-header  class="ion-no-border">
   <ion-toolbar class="header-toolbar">
     <div class="main-header px-20" style="overflow: unset !important;">
@@ -38,8 +7,8 @@
             <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
           </button>
         </div>
-        <div class="middle flex-grow-1" (click)="openOptions()">
-          <ion-label class="title">{{loadedEvent.Subject}}</ion-label>
+        <div class="middle" (click)="openOptions()">
+          <p class="title">{{loadedEvent.Subject}}</p>
         </div>
 
         <div class="div-icon d-flex align-base">
@@ -49,7 +18,6 @@
           <button class="btn-no-color" (click)="deleteEvent()">
             <ion-icon class="delete" name="trash-sharp"></ion-icon> 
           </button>
-          
         </div>
 
       </div>
diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss
index 5202cb708..4de679580 100644
--- a/src/app/shared/agenda/view-event/view-event.page.scss
+++ b/src/app/shared/agenda/view-event/view-event.page.scss
@@ -4,10 +4,9 @@ ion-content{
     --padding-start: 20px;
     --padding-end: 20px;
     font-size: 18px;
+    overflow: auto;
 }
-ion-menu{
- 
-  }
+
 .header-toolbar{
    --background:transparent;
    --opacity: 1;
@@ -22,11 +21,14 @@ ion-menu{
     padding: 30px 0px 0px 0px;
     color:#000;
     transform: translate3d(0, 1px, 0);
+    overflow: auto;
     
     .title-content{
+      width: 100% !important;
       margin: 0px auto;
       padding: 0 !important;
       background: #fff;
+      overflow: auto;
 
       .left{
         width: 37px;
@@ -35,10 +37,17 @@ ion-menu{
 
       }
       .middle{
-          padding: 0 0 0 10px !important;
-          float: left;
-          margin: 2.5px 0 0 0;
+        width: calc(100% - 138.5px) !important;
+        padding: 0 !important;
+        float: left;
+        margin: 0 !important;
+        overflow: auto;
+
+        p{
+          margin: 0 !important;
         }
+      }
+
       .header-icon-right{
         width: 45px;
         font-size: 45px;
@@ -46,14 +55,15 @@ ion-menu{
 
       }
       .div-icon{
-        width: 136px;
+        width: fit-content;
+        height: fit-content;
         display: flex;
         align-items: flex-start;
-        justify-content: start;
+        justify-content:flex-start;
         float: right;
         padding: 1px !important;
         top: 0 !important;
-        margin: 0 !important;
+        margin: 0 0 0 15px !important;
 
       }
       .div-icon .edit{
@@ -81,10 +91,13 @@ ion-menu{
     margin: 0 auto;
     background-color: #fff;
     padding: 15px 0px 0 0px;
+    overflow: auto !important;
 
     .upper-content{
-        margin-left: 50px;
-        font-size: 18px;
+      width: calc(100%-50px);
+      margin-left: 50px;
+      font-size: 18px;
+      overflow: auto;
       
         .content-location{
           width: 100%;
@@ -92,12 +105,13 @@ ion-menu{
           padding: 0 !important;
           overflow: auto;
 
-
           .date{
+            width: calc(100% - 105px);
             float: left;
           }
           
           .label{
+            width: fit-content;
             border-radius: 20px;
             background: #ffb703;
             float: right !important;
@@ -128,10 +142,14 @@ ion-menu{
         }
       }
       .line{
+        width: 100% !important;
         margin-top: 15px;
         border-top: 1px solid #d8d8d8;
       }
-      .middle-conten{
+      .middle-content{
+        width: 100% !important;
+        overflow: auto;
+
         .middle-content h3, .middle-content p{
           font-size: 16px;
         }