From cfee132e26bf21bb10b2635f995dffa42eca514a Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 26 May 2021 11:19:30 +0100
Subject: [PATCH 1/3] save

---
 .../despachos-pr/despachos-pr.page.html              | 12 ++++++++----
 .../despachos-pr/despachos-pr.page.ts                |  6 ++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
index c0a3d444b..f2f88160d 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -22,16 +22,16 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="main-content width-100">
+  <div class="width-100">
     <div *ngIf="despachoList">
       <ion-list>
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
             *ngFor = "let task of despachoList; let i = index"
-            (click)="goToDespachoPr(task.SerialNumber)"
+            (click)="viewExpedientDetail(task.SerialNumber)"
             >
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-              <div class="item width-100" *ngIf="task.Status == 'Active'">
+              <div class="item width-100">
                 <div class="exp-top-detail">
                   <div class="exp-date">
                     <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
@@ -45,6 +45,10 @@
                   <div class="exp-icon d-flex align-center">
                     <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
                     <label>{{task.DocumentsQty}}</label>
+
+                    <!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+                      <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    </ion-menu-button> -->
                   </div>
                 </div>
                 <div class="exp-bottom-detail">
@@ -56,7 +60,7 @@
 
     </div>
   </div>
-  <div *ngIf="loading">
+  <div *ngIf="despachoList.length < 1">
   
     <ion-list>
       <ion-item>
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 b7b48e168..0bb4bdb56 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
@@ -98,13 +98,15 @@ goToDespachoPr(serialNumber:any){
   this.loading = true;
 
   let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+  console.log(result);
+  
   let despachosPr;
   switch (this.loggeduser.Profile) {
     case 'MDGPR':
-      despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
+      despachosPr = result.reverse().filter(data => data.activityInstanceName == "Assinar diploma");
       break;
     case 'PR':
-      despachosPr = result.reverse().filter(data => data.activityInstanceName == "Assinar diploma");
+      despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
       break;
   }
   console.log(despachosPr);

From 98c28dd121983460f1df3840a650ea8c3317f95d Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 26 May 2021 11:31:54 +0100
Subject: [PATCH 2/3] save

---
 src/app/services/processes.service.ts                           | 2 +-
 .../shared/gabinete-digital/despachos-pr/despachos-pr.page.html | 2 +-
 .../shared/gabinete-digital/despachos-pr/despachos-pr.page.scss | 1 -
 .../shared/gabinete-digital/despachos-pr/despachos-pr.page.ts   | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts
index 08274b58e..c83674154 100644
--- a/src/app/services/processes.service.ts
+++ b/src/app/services/processes.service.ts
@@ -184,7 +184,7 @@ export class ProcessesService {
   }
 
   postDespatchoPr(body:any) {
-    const geturl = environment.apiURL + 'Processes/CreateExpedientePR';
+    const geturl = environment.apiURL + 'Processes/CreateDispatchPR';
     let options = { 
       headers: this.headers,
     };
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
index f2f88160d..6f2b9249c 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -22,7 +22,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100">
+  <div class="main-content width-100">
     <div *ngIf="despachoList">
       <ion-list>
         <ion-item 
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss
index 8e7074999..d3ee9e06a 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss
@@ -1,5 +1,4 @@
 @import '~src/function.scss';
-/* CONTENT */
 .main-content{
     padding: 30px 20px 0 20px !important;
     margin: 0;
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 0bb4bdb56..74d7ce17d 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
@@ -103,7 +103,7 @@ goToDespachoPr(serialNumber:any){
   let despachosPr;
   switch (this.loggeduser.Profile) {
     case 'MDGPR':
-      despachosPr = result.reverse().filter(data => data.activityInstanceName == "Assinar diploma");
+      despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
       break;
     case 'PR':
       despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");

From 4df493d4b1865ea05fbd0f82f8d26ba28a2e4309 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 26 May 2021 11:39:40 +0100
Subject: [PATCH 3/3] save

---
 .../gabinete-digital/despachos-pr/despachos-pr.page.html | 2 +-
 .../gabinete-digital/despachos-pr/despachos-pr.page.ts   | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
index 6f2b9249c..db0e2b989 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -28,7 +28,7 @@
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
             *ngFor = "let task of despachoList; let i = index"
-            (click)="viewExpedientDetail(task.SerialNumber)"
+            (click)="goToDespacho(task.SerialNumber)"
             >
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
               <div class="item width-100">
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 74d7ce17d..c381398b3 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
@@ -163,6 +163,15 @@ doRefresh() {
   }, 2000);
 }
 
+goToDespacho(serialNumber:any){
+  let navigationExtras: NavigationExtras = {
+    queryParams: {
+      "serialNumber": serialNumber,
+    }
+  };
+  this.router.navigate(['/home/gabinete-digital/despachos-pr/despacho-pr'], navigationExtras);
+}
+
 async viewExpedientDetail(serialNumber:any) {
   console.log(this.profile);