diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index 4b0baa695..88f0f0b86 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -53,5 +53,4 @@ export class tasksList{ workflowInstanceFolio: string workflowInstanceID: number workflowName: string - } \ No newline at end of file diff --git a/src/app/models/search-document.ts b/src/app/models/search-document.ts index 1fb009d8c..a74bc46a6 100644 --- a/src/app/models/search-document.ts +++ b/src/app/models/search-document.ts @@ -5,6 +5,7 @@ export class SearchDocument { Data: string; DocTypeDesc: string; EntidadeOrganicaId: number; - EntidadeOrganicaNome: string - Id: string + EntidadeOrganicaNome: string; + Id: string; + appName?: string; } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 5b6381d4d..f8e3ad8cb 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -36,7 +36,8 @@

{{count_exp_dailywork}} Documentos

-
+ +
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 0efe5ef58..cab989dc9 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -31,6 +31,8 @@
+ {{task.Remetente}}
- - + + +
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index b7f025d04..2fce3ffe9 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/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 { }); } + } \ No newline at end of file