From 3425bb4220e06fbdc720406a5b5f1f06f22039b1 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 27 Apr 2021 00:05:31 +0100
Subject: [PATCH] save

---
 .../despachos/despacho/despacho.page.html     |  2 +-
 .../despachos/despacho/despacho.page.ts       |  1 +
 .../despachos/despachos.page.html             |  2 +-
 .../expedients/expedients.page.html           | 34 +++++++++++++++----
 .../expedients/expedients.page.ts             | 11 +++---
 5 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
index 513299d8f..faecbdd20 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -57,7 +57,7 @@
         <div class="content-details">
           <ion-label>
             <p><span class="date">{{customDate}}</span><span class="label">{{ task.WorkflowName }}</span></p>
-            <p><span class="color-red">Muitíssimo urgente</span></p>
+            <p><span class="color-red">{{ task.DeadlineType }}</span></p>
           </ion-label>
         </div>
       </div>
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index 38a4141de..b06385163 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -83,6 +83,7 @@ export class DespachoPage implements OnInit {
         "FsId": res.workflowInstanceDataFields.FsId,
         "DocId": res.workflowInstanceDataFields.DocId,
         "WorkflowName": res.workflowDisplayName,
+        "DeadlineType": res.workflowInstanceDataFields.DeadlineType,
       }
       this.fulltask = res;
       console.log('GetTask', res);
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html
index c481a1146..002ec1b37 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html
@@ -40,7 +40,7 @@
                     <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
                   </div>
                   <div class="exp-remetente">
-                    <ion-label>{{task.Remetente}}</ion-label>
+                    <ion-label>{{task.Senders}}</ion-label>
                   </div>
                   <div class="exp-icon">
                     <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
index 3de5d21ac..a9ac42974 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -2,14 +2,14 @@
   <div class="title">
     <div class="thetitle"><ion-label >Correspondência</ion-label></div>
     <div class="theicon">
-      <button class="btn-no-color" (click)="doRefresh($event)">
+      <button class="btn-no-color" (click)="doRefresh()">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
     </div>
   </div>
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
-      <ion-segment-button value="expediente">
+      <ion-segment-button value="expedientes">
         Expediente
       </ion-segment-button>
       <ion-segment-button value="pendentes">
@@ -29,7 +29,7 @@
     </ion-refresher>
   
   <div class="width-100" [ngSwitch]="segment" *ngIf="taskslist">
-    <ion-list *ngSwitchCase="'expediente'">
+    <ion-list *ngSwitchCase="'expedientes'">
       <ion-item 
           class="expediente ion-no-padding"  
           *ngFor = "let task of taskslist"
@@ -56,10 +56,30 @@
           </ion-item>
     </ion-list>
     <ion-list *ngSwitchCase="'pendentes'">
-      <ion-item-group>
-        <ion-item-sliding>
-        </ion-item-sliding>
-      </ion-item-group>
+      <ion-item 
+          class="expediente ion-no-padding"  
+          *ngFor = "let task of taskslist"
+          (click)="viewExpedientDetail(task.SerialNumber)"
+          >
+          <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+            <div class="item width-100">
+              <div class="exp-top-detail">
+                <div class="exp-date">
+                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                </div>
+                <div class="exp-remetente">
+                  <ion-label>{{task.Remetente}}</ion-label>
+                </div>
+                <div class="exp-icon">
+                  <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <label></label>
+                </div>
+              </div>
+              <div class="exp-bottom-detail">
+                <ion-label>{{ task.Folio }}</ion-label>
+              </div>
+            </div>
+          </ion-item>
     </ion-list>
   </div>
   <div *ngIf="!taskslist">
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index 1492ae2ea..dabf8aaf3 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -37,11 +37,13 @@ export class ExpedientsPage implements OnInit {
 
   ngOnInit() {
     //Inicializar segment
-    this.segment = "expediente";
+    this.segment = "expedientes";
     this.LoadList();
   }
 
-  segmentChanged(ev: any) {
+  segmentChanged(){
+    console.log(this.segment);
+    
     this.LoadList();
   }
 
@@ -56,7 +58,7 @@ export class ExpedientsPage implements OnInit {
 
   LoadList(){
     switch(this.segment){
-      case "Expediente":
+      case "expedientes":
         this.processes.GetTasksList("Expediente", false).subscribe(result => {
           console.log(result);
           this.taskslist = new Array();
@@ -75,7 +77,7 @@ export class ExpedientsPage implements OnInit {
           console.log(this.taskslist);
         });
         break;
-      case "Pendentes":
+      case "pendentes":
         this.processes.GetTasksList("Expediente", false).subscribe(result => {
           console.log(result);
           this.taskslist = new Array();
@@ -95,7 +97,6 @@ export class ExpedientsPage implements OnInit {
         });
         break;
     }
-    
   }
 
   doRefresh(event) {