Merge branch 'feature/gabinete' into developer

src/app/shared/gabinete-digital/pedidos/pedidos.page.html

@@ -31,6 +31,8 @@
   <div class="width-100" [ngSwitch]="segment">
     <div *ngIf="parecerList">
       <ion-list *ngSwitchCase="'parecer'">
+        <!-- *ngFor = "let task of parecerList; let i = index"
+        (click)="viewExpedientDetail(task.SerialNumber)" -->
         <ion-item 
             class="expediente ion-no-padding"  
             *ngFor = "let task of parecerList"
@@ -77,8 +79,9 @@
                     <ion-label>{{task.Remetente}}</ion-label>
                   </div>
                   <div class="exp-icon">
-                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                    <label></label>
+                    <ion-menu-button 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">

src/app/shared/gabinete-digital/pedidos/pedidos.page.ts

@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angu
 import { Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
-import { DailyWorkTask } from '../../../models/dailyworktask.model';
+import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { formatDate } from '@angular/common';
 import { LoadingService } from 'src/app/services/loading.service';
@@ -24,6 +24,11 @@ export class PedidosPage implements OnInit {
 
   taskslist:DailyWorkTask[];
   parecerList:DailyWorkTask[];
+  fulltask:any;
+  
+  parecerListResult:tasksList[] = [];
+  deferimentoListResult:tasksList[] = [];
+
   deferimentoList:DailyWorkTask[];
   taskType: string;
   serialNumber:string;
@@ -61,6 +66,7 @@ export class PedidosPage implements OnInit {
     if(this.segment == 'parecer'){
       this.taskType = "Pedido de Parecer";
       this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => {
+        this.taskslist = result;
         console.log(result);
         
         this.parecerList = new Array();
@@ -86,6 +92,7 @@ export class PedidosPage implements OnInit {
     else if(this.segment == 'deferimento'){
       this.taskType = "Pedido de Deferimento";
       this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
+        this.taskslist = result;
         console.log(result);
         
         this.deferimentoList = new Array();
@@ -100,6 +107,7 @@ export class PedidosPage implements OnInit {
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
             "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "FolderId": element.workflowInstanceDataFields.FolderId,
             "WorkflowName": element.workflowDisplayName,
           }
           this.deferimentoList.push(task);
@@ -144,5 +152,6 @@ export class PedidosPage implements OnInit {
     });
   }
 
+
 }