From a14ca7366d00e29cf10b5d406292299e6290d51f Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 5 Aug 2021 15:37:00 +0100
Subject: [PATCH 1/3] save

---
 src/app/modals/add-note/add-note.page.ts                    | 3 ++-
 src/app/pages/gabinete-digital/gabinete-digital.page.html   | 6 +++---
 src/app/pages/gabinete-digital/gabinete-digital.page.scss   | 1 +
 .../gabinete-digital/all-processes/all-processes.page.html  | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/modals/add-note/add-note.page.ts b/src/app/modals/add-note/add-note.page.ts
index 2178ed4c0..f5df8d202 100644
--- a/src/app/modals/add-note/add-note.page.ts
+++ b/src/app/modals/add-note/add-note.page.ts
@@ -14,6 +14,7 @@ export class AddNotePage implements OnInit {
   note: string = '';
   documents:SearchDocument[] = [];
   loadedAttachments:any;
+  hideThisFeature: boolean = true;
 
   constructor(
     private modalController: ModalController,
@@ -62,4 +63,4 @@ export class AddNotePage implements OnInit {
   }
 
 
-}
\ No newline at end of file
+}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 50baa07d4..a11d52157 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -31,11 +31,11 @@
               </ion-segment>
           </div>
         </div>
-        <div [ngSwitch]="segmentVista" class="height-100">
+        <div [ngSwitch]="segmentVista" class="overflow-y-auto">
           <!-- This is the list view -->
 
-          <div *ngSwitchCase="'listview'" class="height-100">
-            <ion-item-sliding class="overflow-y-auto height-100">
+          <div *ngSwitchCase="'listview'">
+            <ion-item-sliding>
             <div class="listview">
               <ion-list *ngIf="allProcessesList">
                 <div
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index e0389dcc9..09467c78e 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -126,6 +126,7 @@ ion-segment-button{
     overflow: hidden;
     .listview{
       width: 100%t;
+      height: auto !important;
       padding: 0px 20px 15px 20px !important;
       overflow: auto;
     }
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
index 31543277f..bf0053c90 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
@@ -1,6 +1,6 @@
 <ion-header class="ion-no-border">
   <div class="title">
-    <div class="thetitle"><ion-label >Todas as Tarefas</ion-label></div>
+    <div class="thetitle"><ion-label >Todas as tarefas</ion-label></div>
     <div class="theicon">
       <button class="btn-no-color" (click)="doRefresh()">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>

From 2c28abbf12704c4b68dfb3d98af664a16c101188 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 6 Aug 2021 09:02:51 +0100
Subject: [PATCH 2/3] save

---
 src/app/modals/add-note/add-note.page.html    | 33 ++++++++++++++++++-
 src/app/modals/add-note/add-note.page.scss    |  3 ++
 src/app/modals/add-note/add-note.page.ts      | 10 +++++-
 .../expediente-pr/expediente-pr.page.ts       |  3 +-
 .../pedidos/pedido/pedido.page.ts             |  1 +
 .../despachos-pr/despachos-pr.page.ts         | 15 +++------
 .../despachos/despachos.page.ts               |  8 ++---
 .../diplomas-assinar/diplomas-assinar.page.ts |  7 +---
 8 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/src/app/modals/add-note/add-note.page.html b/src/app/modals/add-note/add-note.page.html
index c84b4d793..7713f1d59 100644
--- a/src/app/modals/add-note/add-note.page.html
+++ b/src/app/modals/add-note/add-note.page.html
@@ -8,7 +8,38 @@
 
 <ion-content>
   <div class="ion-input-class-no-height">
-    <ion-textarea [(ngModel)]="note" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
+    <ion-textarea *ngIf="!hideThisFeature" [(ngModel)]="note" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
+    <ion-textarea *ngIf="hideThisFeature" [(ngModel)]="note" placeholder="Detalhes" rows="4" cols="20"></ion-textarea>
+  </div>
+
+  <div *ngIf="hideThisFeature" class="ion-item-container-no-border" (click)="getDoc()">
+    <ion-label class="d-flex align-center">
+      <button class="btn-no-color">
+      <div class="attach-icon">
+        <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
+      </div>
+      <div class="attach-document pl-10">
+        <ion-label>Anexar Documentos</ion-label>
+      </div>
+    </button>
+    </ion-label>
+  </div>
+
+  <div class="list "  *ngFor="let document of documents; let i = index" >
+    <ion-list>
+      <ion-item>
+      <ion-label>
+        <p class="d-flex ion-justify-content-between">
+          <span class="attach-title-item">{{document.Assunto}}</span>
+          <span class="app-name">{{document.appName}}</span>
+          <span class="close-button text-black cursor-pointer" (click)="removeAttachment(i)" >
+            <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
+          </span>
+        </p>
+        <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
+      </ion-label>
+    </ion-item>
+    </ion-list>
   </div>
 
   <!-- <div class="main-content d-flex height-100">
diff --git a/src/app/modals/add-note/add-note.page.scss b/src/app/modals/add-note/add-note.page.scss
index 04d427a30..b7ffe32c7 100644
--- a/src/app/modals/add-note/add-note.page.scss
+++ b/src/app/modals/add-note/add-note.page.scss
@@ -26,6 +26,7 @@ float: left;
     margin: 0px auto;
     padding: 0 !important;
     overflow: auto;
+    border: 1px solid red;
   }
   .container-div{
     margin-bottom: 15px;
@@ -77,11 +78,13 @@ float: left;
     margin: 5px 5px 5px 10px;
     padding: 5px;
     float: left;
+    border: 1px solid red !important;
   }
   .attach-icon{
     width: 37px;
     font-size: 35px;
     float: left;
+    border: 1px solid red !important;
   }
   .attach-title-item{
     width: 100%;
diff --git a/src/app/modals/add-note/add-note.page.ts b/src/app/modals/add-note/add-note.page.ts
index f5df8d202..ca44440fc 100644
--- a/src/app/modals/add-note/add-note.page.ts
+++ b/src/app/modals/add-note/add-note.page.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { AnimationController, ModalController } from '@ionic/angular';
+import { AnimationController, ModalController, NavParams } from '@ionic/angular';
 import { SearchDocument } from 'src/app/models/search-document';
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
@@ -19,15 +19,23 @@ export class AddNotePage implements OnInit {
   constructor(
     private modalController: ModalController,
     private animationController: AnimationController,
+    private navParams: NavParams,
   ) {
     this.note = '';
+    this.hideThisFeature = this.navParams.get('showAttachmentBtn');
    }
 
   ngOnInit() {
+    console.log( this.navParams);
+
+    console.log(this.hideThisFeature);
+
   }
+
   close(){
     this.modalController.dismiss('');
   }
+
   save(){
     let body = {
       "note":this.note,
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
index bb2ca18ca..317f0645b 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
@@ -356,9 +356,10 @@ export class ExpedientePrPage implements OnInit {
     const modal = await this.modalController.create({
       component: AddNotePage,
       componentProps:{
+        showAttachmentBtn: false,
       },
       cssClass: classs,
-      backdropDismiss: true
+      //backdropDismiss: true
     });
 
     await modal.present();
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index 2bb7481ac..c197343f6 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -457,6 +457,7 @@ export class PedidoPage implements OnInit {
     const modal = await this.modalController.create({
       component: AddNotePage,
       componentProps:{
+        showAttachmentBtn: true,
       },
       cssClass: classs,
       backdropDismiss: true
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 277a0537e..79992a246 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -69,9 +69,9 @@ constructor (
     const pathname = location.pathname + location.search
 
     this.LoadList();
-    
+
     this.router.events.forEach((event) => {
-      if (event instanceof NavigationStart && 
+      if (event instanceof NavigationStart &&
           event.url.startsWith('/home/gabinete-digital?despachospr=true')) {
             if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
               this.refreshing()
@@ -111,7 +111,7 @@ constructor (
 
     let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
     this.despachoList = [];
-    
+
     let despachosPr;
     switch (this.loggeduser.Profile) {
       case 'MDGPR':
@@ -168,7 +168,7 @@ constructor (
  }
 
 doRefresh() {
-  
+
 
   setTimeout(() => {
     this.LoadList();
@@ -177,12 +177,7 @@ doRefresh() {
 }
 
 goToDespacho(serialNumber:any){
-  let navigationExtras: NavigationExtras = {
-    queryParams: {
-      "serialNumber": serialNumber,
-    }
-  };
-  this.router.navigate(['/home/gabinete-digital/despachos-pr/despacho-pr'], navigationExtras);
+  this.router.navigate(['/home/gabinete-digital/despachos-pr',serialNumber,'gabinete-digital']);
 }
 
 async viewExpedientDetail(serialNumber:any) {
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index 7503aab55..f240eb219 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -72,7 +72,7 @@ export class DespachosPage implements OnInit {
     this.LoadList();
 
     this.router.events.forEach((event) => {
-      if (event instanceof NavigationStart && 
+      if (event instanceof NavigationStart &&
         event.url.startsWith('/home/gabinete-digital?despachos=true')) {
           if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
             this.doRefresh()
@@ -105,7 +105,7 @@ export class DespachosPage implements OnInit {
     this.skeletonLoader = true
 
     let result = await this.processes.GetTasksList("Despacho", false).toPromise();
-    
+
     this.despachoList = new Array();
 
     await result.filter(data => data.workflowInstanceDataFields.Status == "Active").forEach( (element, index) => {
@@ -136,7 +136,7 @@ export class DespachosPage implements OnInit {
     this.despachoList = this.sortArrayISODate(this.despachoList).reverse();
     this.despachoStore.reset(this.despachoList);
     this.skeletonLoader = false
-    
+
   }
 
   sortArrayISODate(myArray: any){
@@ -146,7 +146,7 @@ export class DespachosPage implements OnInit {
   }
 
   doRefresh() {
-   
+
     setTimeout(() => {
       this.LoadList();
     }, 1000);
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index 2de70874a..1f3249f74 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -48,12 +48,7 @@ skeletonLoader = true
   }
 
   goToDiploma(serialNumber:any){
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-          "serialNumber": serialNumber,
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras);
+    this.router.navigate(['/home/gabinete-digital/diplomas-assinar',serialNumber,'gabinete-digital']);
   }
 
   doRefresh() {

From 33b614661ef03d87fcb49289fda48ef961b5834e Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 6 Aug 2021 09:15:21 +0100
Subject: [PATCH 3/3] fix route concuir despacho

---
 .../shared/gabinete-digital/all-processes/all-processes.page.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
index 3ec5a2257..289662379 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
@@ -135,7 +135,7 @@ export class AllProcessesPage implements OnInit {
       }
     }
     else if(workflowName == 'Despacho do Presidente da República') {
-      if(activityName == 'Tarefa de Despacho'){
+      if(activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho'){
         this.router.navigate(['/home/gabinete-digital/despachos-pr',serialNumber,'gabinete-digital']);
       }
       else if(activityName == 'Revisar Diploma' || activityName == 'Assinar Diploma'){