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 @@ Marcar reunião - - - Descartar - Enviar para pendentes @@ -57,7 +53,7 @@ - {{customDate}}{{ task.activityInstanceName }} + {{customDate}}{{ task.WorkflowName }} {{ task.DeadlineType }} @@ -105,9 +101,10 @@ - + Executado Delegar + Gerar Diploma Efectuar Despacho Solicitar Parecer @@ -115,26 +112,6 @@ Enviar para Pendentes - - Executado - Delegar - - Efectuar Despacho - Solicitar Parecer - Marcar Reunião - - Enviar para Pendentes - - - Arquivar - - Efectuar Despacho - Solicitar Parecer - Marcar Reunião - - Enviar para Pendentes - Enviar para Reexecução - 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 @@ Marcar reunião - - - Descartar - Enviar para pendentes @@ -133,7 +129,7 @@ Marcar Reunião Enviar para Pendentes - Enviar para Reexecução + Enviar para Reexecução 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 @@ {{task.Senders}} + + {{task.WorkflowName}} + {{task.DocumentsQty}} 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 @@ {{task.Remetente}} + + {{task.WorkflowName}} + 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 @@ {{task.Senders}} + + {{task.activityInstanceName}} + {{task.DocumentsQty}} 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 @@ {{task.Remetente}} + + {{task.activityInstanceName}} + 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); });
{{customDate}}{{ task.activityInstanceName }}
{{customDate}}{{ task.WorkflowName }}
{{ task.DeadlineType }}