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

---
 .../pages/gabinete-digital/diplomas/diploma/diploma.module.ts   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts
index 868885b08..6bec3e645 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts
@@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular';
 import { DiplomaPageRoutingModule } from './diploma-routing.module';
 
 import { DiplomaPage } from './diploma.page';
+import { SharedModule } from 'src/app/shared/shared.module';
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
+    SharedModule,
     DiplomaPageRoutingModule
   ],
   declarations: [DiplomaPage]

From be716c3abfd9a180dd740df1d5d95ca47c18e52a Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 19 May 2021 16:10:05 +0100
Subject: [PATCH 2/3] save

---
 src/app/models/dailyworktask.model.ts         |  2 ++
 .../despacho-pr/despacho-pr.page.html         | 29 ++-----------------
 .../despachos-pr/despachos-pr.page.ts         |  5 ++--
 .../despachos/despacho/despacho.page.html     |  6 +---
 .../despachos/despacho/despacho.page.ts       | 16 ++++++++++
 .../despachos/despachos.page.html             |  3 ++
 .../despachos/despachos.page.ts               |  2 +-
 .../expediente/expediente.page.ts             |  2 ++
 .../pedidos/pedidos.page.html                 |  3 ++
 .../gabinete-digital/pedidos/pedidos.page.ts  |  4 +--
 .../pendentes/pendentes.page.ts               |  2 ++
 .../despachos-pr/despachos-pr.page.ts         |  2 +-
 .../despachos/despachos.page.html             |  3 ++
 .../despachos/despachos.page.scss             | 13 +++++++++
 .../despachos/despachos.page.ts               |  2 +-
 .../diplomas/diplomas.page.ts                 |  2 ++
 .../expedientes-pr/expedientes-pr.page.ts     |  2 ++
 .../expedients/expedients.page.ts             |  1 +
 .../pedidos/pedidos.page.html                 |  3 ++
 .../pedidos/pedidos.page.scss                 | 13 +++++++++
 .../gabinete-digital/pedidos/pedidos.page.ts  |  5 ++--
 .../pendentes/pendentes.page.ts               |  2 ++
 .../signed-diploma.component.ts               |  4 +++
 23 files changed, 86 insertions(+), 40 deletions(-)

diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts
index 88f0f0b86..15855d3de 100644
--- a/src/app/models/dailyworktask.model.ts
+++ b/src/app/models/dailyworktask.model.ts
@@ -7,10 +7,12 @@ export class DailyWorkTask{
     Remetente:string;
     DocumentsQty:any;
     WorkflowName:string;
+    activityInstanceName: string;
 }
 
 export class tasksList{
     actions: null;
+    activityInstanceName: string;
     formURL: string;
     originator: {
         displayName: string,
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
index c59cd5d79..45e8da87e 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
@@ -22,10 +22,6 @@
         <ion-icon name="calendar" slot="start"></ion-icon>
         <ion-label>Marcar reunião</ion-label>
       </ion-item>
-      <ion-item (click)="discartExpedient()">
-        <ion-icon name="trash" slot="start"></ion-icon>
-        <ion-label>Descartar</ion-label>
-      </ion-item>
       <ion-item hidden disabled>
         <ion-icon name="paper-plane" slot="start"></ion-icon>
         <ion-label>Enviar para pendentes</ion-label>
@@ -57,7 +53,7 @@
       <div class="upper-content">
         <div class="content-details">
           <ion-label>
-            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
+            <p><span class="date">{{customDate}}</span><span class="label">{{ task.WorkflowName }}</span></p>
             <p><span class="color-red">{{ task.DeadlineType }}</span></p>
           </ion-label>
         </div>
@@ -105,9 +101,10 @@
     </div>
 
     <div *ngIf="task" class="aside-right flex-column height-100">
-      <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
+      <div class="buttons" *ngIf="task.WorkflowName == 'Despacho do Presidente da República'">
         <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
         <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+        <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" shape="round" >Gerar Diploma </button>
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
@@ -115,26 +112,6 @@
         <div class="solid"></div>
         <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
-      <div class="buttons" *ngIf="task.activityInstanceName == 'Reexecutar Despacho'">
-        <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
-        <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
-        <div class="solid"></div>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
-        <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
-        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-        <div class="solid"></div>
-        <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
-      </div>
-      <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
-        <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
-        <div class="solid"></div>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
-        <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
-        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-        <div class="solid"></div>
-        <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
-        <button class="btn-cancel" shape="round" >Enviar para Reexecução</button>
-      </div>
     </div>
 
     <div *ngIf="!task">
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 0e1853919..280bb7821 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -25,7 +25,7 @@ export class DespachosPrPage implements OnInit {
   @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
   taskslist:DailyWorkTask[];
-  despachoList:DailyWorkTask[] = [];
+  despachoList:any[] = [];
   deferimentoList:DailyWorkTask[] = [];
   
   taskList:tasksList[] = [];
@@ -99,7 +99,8 @@ export class DespachosPrPage implements OnInit {
         "DocId": element.workflowInstanceDataFields.DocId,
         "WorkflowName": element.workflowDisplayName,
         "FolderID": element.workflowInstanceDataFields.FolderID,
-        "Status": element.workflowInstanceDataFields.Status 
+        "Status": element.workflowInstanceDataFields.Status,
+        "activityInstanceName": element.activityInstanceName,
       }
        
       this.despachoList.push(task)
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 c59cd5d79..ab971bf17 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -22,10 +22,6 @@
         <ion-icon name="calendar" slot="start"></ion-icon>
         <ion-label>Marcar reunião</ion-label>
       </ion-item>
-      <ion-item (click)="discartExpedient()">
-        <ion-icon name="trash" slot="start"></ion-icon>
-        <ion-label>Descartar</ion-label>
-      </ion-item>
       <ion-item hidden disabled>
         <ion-icon name="paper-plane" slot="start"></ion-icon>
         <ion-label>Enviar para pendentes</ion-label>
@@ -133,7 +129,7 @@
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <div class="solid"></div>
         <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
-        <button class="btn-cancel" shape="round" >Enviar para Reexecução</button>
+        <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
       </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 e36176c6b..786ed97cb 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -180,6 +180,19 @@ export class DespachoPage implements OnInit {
     this.processes.CompleteTask(body);
     this.close();
   }
+  reexecute(note:string, documents:any){
+    let body = { 
+      "serialNumber": this.serialnumber, 
+      "action": "Reencaminhar",
+      "ActionTypeId": 98,
+      "dataFields": {
+        "ReviewUserComent": note,
+      },
+      "AttachmentList" :documents,
+    }
+    this.processes.CompleteTask(body);
+    this.close();
+  }
 
   sendExpedienteToPending(){
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
@@ -214,6 +227,9 @@ export class DespachoPage implements OnInit {
         else if(actionName == 'Arquivar'){
           this.arquivar(res.data.note,res.data.documents);
         }
+        else if(actionName == 'Reexecução'){
+          this.reexecute(res.data.note,res.data.documents);
+        }
       }
     });
   }
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index 31b2da96e..746df29cb 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -36,6 +36,9 @@
                   <div class="exp-remetente">
                     <ion-label>{{task.Senders}}</ion-label>
                   </div>
+                  <div class="exp-workflow">
+                    <span class="label">{{task.WorkflowName}}</span>
+                  </div>
                   <div class="exp-icon d-flex align-center">
                     <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
                     <label>{{task.DocumentsQty}}</label>
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index e78f148a3..37e05503e 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -26,7 +26,7 @@ export class DespachosPage implements OnInit {
 @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
 taskslist:DailyWorkTask[];
-despachoList:DailyWorkTask[] = [];
+despachoList:any[] = [];
 deferimentoList:DailyWorkTask[] = [];
 
 taskList:tasksList[] = [];
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index e830759b9..c5c5ce9e0 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -60,6 +60,7 @@ export class ExpedientePage implements OnInit {
               "Remetente": element.workflowInstanceDataFields.Remetente,
               "DocumentsQty": 0,
               "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
             }
             this.taskslist.push(task);
           });
@@ -81,6 +82,7 @@ export class ExpedientePage implements OnInit {
               "Remetente": element.workflowInstanceDataFields.Remetente,
               "DocumentsQty": 0,
               "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
             }
             this.taskslist.push(task);
           });
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index 1c3978ee1..daa331db5 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -79,6 +79,9 @@
                   <div class="exp-remetente">
                     <ion-label>{{task.Remetente}}</ion-label>
                   </div>
+                  <div class="exp-workflow">
+                    <span class="label">{{task.WorkflowName}}</span>
+                  </div>
                   <div class="exp-icon">
                     <ion-menu-button style="width: 35px; height: 41px;" autoHide="false">
                       <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index 68dc620cc..78ca38316 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -22,13 +22,13 @@ export class PedidosPage implements OnInit {
  @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
  taskslist:DailyWorkTask[];
- parecerList:DailyWorkTask[];
+ parecerList:any[];
  fulltask:any;
  
  parecerListResult:tasksList[] = [];
  deferimentoListResult:tasksList[] = [];
 
- deferimentoList:DailyWorkTask[];
+ deferimentoList:any[];
  taskType: string;
  serialNumber:string;
 
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
index c11da7afd..a3a6acbb0 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
@@ -83,6 +83,7 @@ export class PendentesPage implements OnInit {
                   "DocumentsQty": this.totalDocs,
                   "DocId": element.workflowInstanceDataFields.DocId,
                   "WorkflowName": element.workflowDisplayName,
+                  "activityInstanceName": element.activityInstanceName,
                 }
                 this.pendentesList.push(task);
               },
@@ -97,6 +98,7 @@ export class PendentesPage implements OnInit {
                   "DocumentsQty": 0,
                   "DocId": element.workflowInstanceDataFields.DocId,
                   "WorkflowName": element.workflowDisplayName,
+                  "activityInstanceName": element.activityInstanceName,
                 }
                 this.pendentesList.push(task);
               });
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 5e7075ff4..f934bea27 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
@@ -27,7 +27,7 @@ export class DespachosPrPage implements OnInit {
 @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
 taskslist:DailyWorkTask[];
-despachoList:DailyWorkTask[] = [];
+despachoList:any[]=[];
 deferimentoList:DailyWorkTask[] = [];
 
 taskList:tasksList[] = [];
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html
index 4615edab9..cc00ed241 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html
@@ -35,6 +35,9 @@
                   <div class="exp-remetente">
                     <ion-label>{{task.Senders}}</ion-label>
                   </div>
+                  <div class="exp-workflow">
+                    <span class="label">{{task.activityInstanceName}}</span>
+                  </div>
                   <div class="exp-icon d-flex align-center">
                     <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
                     <label>{{task.DocumentsQty}}</label>
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.scss b/src/app/shared/gabinete-digital/despachos/despachos.page.scss
index e624d0744..58e3a261d 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.scss
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.scss
@@ -174,4 +174,17 @@ ion-item{
   font-size: 45px;
   float: right;
   margin-right: 10px;
+}
+.exp-workflow{
+  float: left;
+  margin-left: 15px;
+
+  .label{
+    border-radius: 20px;
+    background: #ffb703;
+    font-size: 12px;
+    float: right;
+    padding: 2.5px 13.5px 2.5px 13.5px;
+    color: #fff;
+}
 }
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index c5505cb8e..4e5f4443b 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -26,7 +26,7 @@ export class DespachosPage implements OnInit {
  @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
  taskslist:DailyWorkTask[];
- despachoList:DailyWorkTask[] = [];
+ despachoList:any[] = [];
  deferimentoList:DailyWorkTask[] = [];
 
  taskList:tasksList[] = [];
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
index f15e408cb..dcbf1987c 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -71,6 +71,7 @@ async LoadList(){
             "DocumentsQty": this.totalDocs,
             "DocId": element.workflowInstanceDataFields.DocId,
             "WorkflowName": element.workflowDisplayName,
+            "activityInstanceName": element.activityInstanceName,
           }
           this.diplomasList.push(task);
         },
@@ -85,6 +86,7 @@ async LoadList(){
             "DocumentsQty": 0,
             "DocId": element.workflowInstanceDataFields.DocId,
             "WorkflowName": element.workflowDisplayName,
+            "activityInstanceName": element.activityInstanceName,
           }
           this.diplomasList.push(task);
         });
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index ab6e9a640..21e5f15e6 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -73,6 +73,7 @@ export class ExpedientesPrPage implements OnInit {
               "Remetente": element.workflowInstanceDataFields.Remetente,
               "DocumentsQty": 0,
               "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
             }
             this.taskslist.push(task);
           });
@@ -94,6 +95,7 @@ export class ExpedientesPrPage implements OnInit {
               "Remetente": element.workflowInstanceDataFields.Remetente,
               "DocumentsQty": 0,
               "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
             }
             this.taskslist.push(task);
           });
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index e3ce3d3bd..923e5bc37 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -71,6 +71,7 @@ export class ExpedientsPage implements OnInit {
           "Remetente": element.workflowInstanceDataFields.Remetente,
           "DocumentsQty": 0,
           "WorkflowName": element.workflowDisplayName,
+          "activityInstanceName": element.activityInstanceName,
         }
         this.taskslist.push(task);
       });
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 9836b999f..13ff96b2e 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -48,6 +48,9 @@
                   <div class="exp-remetente">
                     <ion-label>{{task.Remetente}}</ion-label>
                   </div>
+                  <div class="exp-workflow">
+                    <span class="label">{{task.activityInstanceName}}</span>
+                  </div>
                   <div class="exp-icon">
                     <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
                     <label></label>
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
index e624d0744..58e3a261d 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
@@ -174,4 +174,17 @@ ion-item{
   font-size: 45px;
   float: right;
   margin-right: 10px;
+}
+.exp-workflow{
+  float: left;
+  margin-left: 15px;
+
+  .label{
+    border-radius: 20px;
+    background: #ffb703;
+    font-size: 12px;
+    float: right;
+    padding: 2.5px 13.5px 2.5px 13.5px;
+    color: #fff;
+}
 }
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 5ee7859a8..3c724117b 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -23,13 +23,13 @@ export class PedidosPage implements OnInit {
   @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
   taskslist:DailyWorkTask[];
-  parecerList:DailyWorkTask[];
+  parecerList:any[];
   fulltask:any;
   
   parecerListResult:tasksList[] = [];
   deferimentoListResult:tasksList[] = [];
 
-  deferimentoList:DailyWorkTask[];
+  deferimentoList:any[];
   taskType: string;
 
   @Input() serialNumber:string;
@@ -85,6 +85,7 @@ export class PedidosPage implements OnInit {
             "DocumentsQty": 0,
             "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
             "WorkflowName": element.workflowDisplayName,
+            "activityInstanceName": element.activityInstanceName,
           }
           this.parecerList.push(task);
         });
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index 4ecf14498..f9d4ec769 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -87,6 +87,7 @@ export class PendentesPage implements OnInit {
           "DocumentsQty": this.totalDocs,
           "DocId": element.workflowInstanceDataFields.DocId,
           "WorkflowName": element.workflowDisplayName,
+          "activityInstanceName": element.activityInstanceName,
         }
         this.pendentesList.push(task);
       },
@@ -101,6 +102,7 @@ export class PendentesPage implements OnInit {
           "DocumentsQty": 0,
           "DocId": element.workflowInstanceDataFields.DocId,
           "WorkflowName": element.workflowDisplayName,
+          "activityInstanceName": element.activityInstanceName,
         }
         this.pendentesList.push(task);
       });
diff --git a/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts
index ebdf45a2e..050ad8d07 100644
--- a/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts
+++ b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts
@@ -72,6 +72,7 @@ async LoadList(){
             "DocumentsQty": this.totalDocs,
             "DocId": element.workflowInstanceDataFields.DocId,
             "WorkflowName": element.workflowDisplayName,
+            "activityInstanceName": element.activityInstanceName,
           }
           this.diplomasList.push(task);
         },
@@ -86,6 +87,7 @@ async LoadList(){
             "DocumentsQty": 0,
             "DocId": element.workflowInstanceDataFields.DocId,
             "WorkflowName": element.workflowDisplayName,
+            "activityInstanceName": element.activityInstanceName,
           }
           this.diplomasList.push(task);
         });
@@ -112,6 +114,7 @@ async LoadList(){
             "DocumentsQty": this.totalDocs,
             "DocId": element.workflowInstanceDataFields.DocId,
             "WorkflowName": element.workflowDisplayName,
+            "activityInstanceName": element.activityInstanceName,
           }
           this.diplomasList.push(task);
         },
@@ -126,6 +129,7 @@ async LoadList(){
             "DocumentsQty": 0,
             "DocId": element.workflowInstanceDataFields.DocId,
             "WorkflowName": element.workflowDisplayName,
+            "activityInstanceName": element.activityInstanceName,
           }
           this.diplomasList.push(task);
         });

From 8a778cc461ddd856737690a3bf87e715b89c43ac Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 19 May 2021 16:12:21 +0100
Subject: [PATCH 3/3] save

---
 src/app/shared/gabinete-digital/pedidos/pedidos.page.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 13ff96b2e..346fda517 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -81,6 +81,9 @@
                   <div class="exp-remetente">
                     <ion-label>{{task.Remetente}}</ion-label>
                   </div>
+                  <div class="exp-workflow">
+                    <span class="label">{{task.activityInstanceName}}</span>
+                  </div>
                   <div class="exp-icon">
                     <ion-menu-button style="width: 35px; height: 41px;" autoHide="false">
                       <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>