From 53e3908fffca57dc033a535b42ee57fbfe270449 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 7 Apr 2021 09:32:17 +0100
Subject: [PATCH] save

---
 src/app/pages/events/events.page.ts           |  3 +-
 .../discart-expedient-modal.page.html         |  2 +-
 .../book-meeting-modal.page.html              | 10 +++---
 src/app/pages/search/search.page.html         |  6 ++--
 src/app/pages/search/search.page.ts           | 31 ++++++++++++++++++-
 .../approve-event.component.html              | 14 ++++-----
 6 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 8359be511..3f3d5c133 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -95,6 +95,7 @@ export class EventsPage implements OnInit {
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
         this.RefreshEvents();
+        this.LoadList();
       }
     });
     /* this.storageService.get(AuthConnstants.PROFILE).then(res=>{
@@ -106,8 +107,8 @@ export class EventsPage implements OnInit {
 
   doRefresh(event) {
     this.RefreshEvents();
-    event.target.complete();
     this.LoadList();
+    event.target.complete();
   }
 
   onSegmentChange(){
diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
index 0ca41e81b..05fe484c6 100644
--- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
+++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
@@ -1,7 +1,7 @@
 <ion-header class="ion-no-border">
   <div class="header-content">
     <div class="header-title">
-      <label>Deseja eliminar este espediente?</label>
+      <label>Deseja eliminar este expediente?</label>
     </div>
     <div class="header-icon-left">
       <ion-icon (click)="close()" name="close-outline"></ion-icon>
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
index bd36576bc..a37497c9f 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
@@ -6,8 +6,8 @@
   </div>
 </ion-header> -->
 
-<ion-content class="height-100">
-  <div class="main-content d-flex height-100">
+<ion-content>
+  <div class="main-content d-flex">
     <div class="content d-flex flex-column width-100">
       <div class="header-content">
         <div class="header-title">
@@ -150,12 +150,12 @@
     </div>
 
     <div class="container-div">
-      <div class="ion-item-class-2">
+      <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
         </div>
-        <div class="ion-input-class">
-          <ion-input [(ngModel)]="postData.Body.Text" placeholder="Detalhes"></ion-input>
+        <div class="ion-input-class-no-height width-100">
+          <ion-textarea [(ngModel)]="postData.Body.Text" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
         </div>
       </div>
     </div>
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
index 2955e13d4..ad083af1b 100644
--- a/src/app/pages/search/search.page.html
+++ b/src/app/pages/search/search.page.html
@@ -105,7 +105,7 @@
   
           <!-- most searched word-->
           <div class="most-searched-words d-md-flex flex-md-column">
-            <p class="title ion-text-center">Assunto mais pesquisado</p>
+            <p class="title ion-text-center">Assuntos mais recebidos</p>
             <div class="most-searched-word-container height-100 overflow-y-auto">
             </div>
           </div>
@@ -121,8 +121,8 @@
                   <div class="d-flex sort-by ion-justify-content-center">
                     <p>
                       <span class="order">Order por:</span>
-                      <span *ngIf="ordinance == 'recent'" class="order-labal">Mais Recente</span>
-                      <span *ngIf="ordinance == 'old'" class="order-labal">Mais Antigo</span>
+                      <span *ngIf="ordinance == 'recent'" class="order-labal">Mais Recentes</span>
+                      <span *ngIf="ordinance == 'old'" class="order-labal">Mais Antigos</span>
                     </p>
                   </div>
                   <div>
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index b394d7491..6b200e616 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -9,6 +9,7 @@ import { OrganicEntityPage } from 'src/app/pages/search/organic-entity/organic-e
 import  WordCloud from 'src/plugin/wordcloud2.js';
 import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
 import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page';
+import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 @Component({
   selector: 'app-search',
   templateUrl: './search.page.html',
@@ -421,6 +422,8 @@ export class SearchPage implements OnInit {
 
 
   async viewDetail(id:any) {
+    console.log(id);
+    
     
     if(window.location.pathname  == '/home/agenda'){
 
@@ -430,7 +433,6 @@ export class SearchPage implements OnInit {
           eventId: id
         },
         cssClass: 'modal modal-desktop',
-        backdropDismiss: false
       });
       await modal.present();
       modal.onDidDismiss().then((res)=>{});
@@ -439,6 +441,10 @@ export class SearchPage implements OnInit {
         
       this.viewPublicationDetail(id);
     }
+    else if(window.location.pathname == '/home/gabinete-digital'){
+      console.log('OPEN DOC');
+      
+    }
 
   }
 
@@ -456,5 +462,28 @@ export class SearchPage implements OnInit {
     modal.onDidDismiss().then(()=>{});
 
   }
+
+  async viewExpedientDetail(serialNumber:any) {
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'gabinete-digital-mobile-modal-to-Desktop'
+    }
+
+    const modal = await this.modalController.create({
+      component: ExpedienteDetailPage,
+      componentProps:{
+        serialNumber: serialNumber,
+        profile: 'mdgpr',
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res)=>{
+    });
+  }
   
 }
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 5b868267f..bcc6ea3d2 100644
--- a/src/app/shared/agenda/approve-event/approve-event.component.html
+++ b/src/app/shared/agenda/approve-event/approve-event.component.html
@@ -68,13 +68,13 @@
       <div class="line"></div>
       <div class="middle-content">
         <div *ngIf="loadedEvent.workflowInstanceDataFields.Participants">
-        <h5>Intervenientes</h5>
-        <ion-item class="ion-no-margin ion-no-padding">
-          <ion-label>
-            <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
-          </ion-label>
-        </ion-item>
-      </div>
+          <h5>Intervenientes</h5>
+          <ion-item class="ion-no-margin ion-no-padding">
+            <ion-label>
+              <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
+            </ion-label>
+          </ion-item>
+        </div>
         <h5>Detalhes</h5>
         <ion-item class="ion-no-margin ion-no-padding">
             <p [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>