diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 5b7551515..70afc1726 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -77,10 +77,10 @@ export class DespachoPrPage implements OnInit { } /* this.serialnumber = paramMap.get('SerialNumber'); */ this.LoadTaskDetail(this.serialnumber); - this.LoadRelatedEvents(this.serialnumber); + // this.LoadRelatedEvents(this.serialnumber); }); this.LoadTaskDetail(this.serialnumber); - this.LoadRelatedEvents(this.serialnumber); + // this.LoadRelatedEvents(this.serialnumber); } close(){ @@ -156,22 +156,22 @@ export class DespachoPrPage implements OnInit { }) } - async LoadRelatedEvents(serial: string) { - if (this.eventsList == null) { - this.attachmentsService.getAttachmentsBySerial(serial).subscribe(res => { - console.log(res); - res.forEach(att => { - if (this.eventsList == null) { - this.eventsList = new Array(); - } - this.events.getEvent(att.ParentId).subscribe(event => { - this.eventsList.push(event); - console.log(this.eventsList); - }); - }); - }); - } - } + // async LoadRelatedEvents(serial: string) { + // if (this.eventsList == null) { + // this.attachmentsService.getAttachmentsBySerial(serial).subscribe(res => { + // console.log(res); + // res.forEach(att => { + // if (this.eventsList == null) { + // this.eventsList = new Array(); + // } + // this.events.getEvent(att.ParentId).subscribe(event => { + // this.eventsList.push(event); + // console.log(this.eventsList); + // }); + // }); + // }); + // } + // } viewDocument(docId:string){ this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{ 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 937285408..3ab5f6188 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html @@ -56,15 +56,12 @@
Documentos Anexados
- - -

{{ attachment.Assunto }}

-

{{ attachment.DocNumber }}

-

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

-
-
+ + +

{{ Document.Assunto }}

+

{{ Document.Sender}}{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}

+
+
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 dc991f9fa..e62d88b1e 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -71,10 +71,10 @@ export class DespachoPage implements OnInit { } /* this.serialnumber = paramMap.get('SerialNumber'); */ this.LoadTaskDetail(this.serialnumber); - this.LoadRelatedEvents(this.serialnumber); + // this.LoadRelatedEvents(this.serialnumber); }); this.LoadTaskDetail(this.serialnumber); - this.LoadRelatedEvents(this.serialnumber); + // this.LoadRelatedEvents(this.serialnumber); } close() { @@ -167,20 +167,20 @@ export class DespachoPage implements OnInit { }) } - async LoadRelatedEvents(serial: string) { - if (this.eventsList == null) { - this.attachmentsService.getAttachmentsBySerial(serial).subscribe(res => { - res.forEach(att => { - if (this.eventsList == null) { - this.eventsList = new Array(); - } - this.events.getEvent(att.ParentId).subscribe(event => { - this.eventsList.push(event); - }); - }); - }); - } - } + // async LoadRelatedEvents(serial: string) { + // if (this.eventsList == null) { + // this.attachmentsService.getAttachmentsBySerial(serial).subscribe(res => { + // res.forEach(att => { + // if (this.eventsList == null) { + // this.eventsList = new Array(); + // } + // this.events.getEvent(att.ParentId).subscribe(event => { + // this.eventsList.push(event); + // }); + // }); + // }); + // } + // } viewDocument(docId:string){ this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{ diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html index 90ac4a433..d1031da4f 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html @@ -60,13 +60,15 @@
Documentos Anexados
- -

{{ attachment.Assunto }}

-

{{ attachment.DocNumber }}

-

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

-
+ class="ion-no-margin ion-no-padding cursor-pointer" + > + +

{{ attachment.Assunto }}

+

{{ attachment.DocNumber }}

+

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

+
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html index 275e809f4..eeaa42369 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -60,13 +60,14 @@
Documentos Anexados
- -

{{ attachment.Assunto }}

-

{{ attachment.DocNumber }}

-

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

-
+ class="ion-no-margin ion-no-padding cursor-pointer" + > + +

{{ attachment.Assunto }}

+

{{ attachment.DocNumber }}

+

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

+
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index b09ce714b..be25665bc 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -74,7 +74,7 @@ export class ExpedienteDetailPage implements OnInit { ngOnInit() { this.LoadTaskDetail(this.serialNumber); - this.LoadRelatedEvents(this.serialNumber); + } close() { @@ -294,18 +294,7 @@ export class ExpedienteDetailPage implements OnInit { } async LoadRelatedEvents(serial: string) { - if (this.eventsList == null) { - this.attachments.getAttachmentsBySerial(serial).subscribe(res => { - res.forEach(att => { - if (this.eventsList == null) { - this.eventsList = new Array(); - } - this.events.getEvent(att.ParentId).subscribe(event => { - this.eventsList.push(event); - }); - }); - }); - } + } viewDocument(DocId:string) { diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index eadea10bd..44ff72e21 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -56,15 +56,9 @@ export class ExpedientePage implements OnInit { this.skeletonLoader = true try { - const expedientePr: object[] = await this.processes.GetTasksList("Expediente", false).toPromise() - const expedienteMD: object[] = await this.processes.GetTasksList("Expediente", false).toPromise() + const expediente: object[] = await this.processes.GetTasksList("Expediente", false).toPromise() - const result = expedientePr.concat(expedienteMD) - - console.log('result', result); - console.log('expedientePr', expedientePr) - console.log('expedienteMD', expedienteMD) - + const result = expediente this.taskslist = new Array(); let res = result.reverse().filter((data: any) => data.workflowInstanceDataFields.Status == "Active"); @@ -87,9 +81,11 @@ export class ExpedientePage implements OnInit { } this.taskslist.push(task); }); + console.log(this.taskslist); this.expedienteStorage.reset(this.taskslist); this.skeletonLoader = false; + } catch (error) { this.toastService.badRequest('Processo não encontrado') this.goBack() diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index bb10b3c3c..4e3e11e74 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -60,13 +60,15 @@
Documentos Anexados
- -

{{ attachment.Assunto }}

-

{{ attachment.DocNumber }}

-

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

-
+ class="ion-no-margin ion-no-padding cursor-pointer" + > + +

{{ attachment.Assunto }}

+

{{ attachment.DocNumber }}

+

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

+
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 6ec2bf528..570bef65f 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -184,7 +184,7 @@ export class PedidoPage implements OnInit { }) } - viewDocument(docId:string){ + viewDocument(docId:string) { this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{ const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); const browser = this.iab.create(url,"_blank");