-
-
-
>
-{{task.CreateDate | date: 'd/M/yy'}}-{{task.CreateDate | date: 'HH:mm'}}+{{task.taskStartDate | date: 'dd-MM-yy'}}+{{task.taskStartDate | date: 'HH:mm'}}-{{ task.Folio }}-{{ task.Remetente }}+{{ task.workflowInstanceFolio }}+{{ task.workflowInstanceDataFields.Sender }}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 03b79232a..e3ad9d40d 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -58,6 +58,7 @@ export class EventsPage implements OnInit {
showLoader: boolean;
taskslist:DailyWorkTask[];
+ expedientList:any;
constructor(private eventService: EventsService,
private router: Router,
@@ -248,26 +249,8 @@ export class EventsPage implements OnInit {
LoadList()
{
this.processes.GetTasksList("Expediente", false).subscribe(result => {
-
- const AllResult = new Array();
-
- result.forEach(element => {
- let task: DailyWorkTask = {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceFolio,
- "Senders": element.originator.email,
- "CreateDate": new Date(element.taskStartDate).toLocaleString(),
- "DocumentURL": element.formURL,
- "Remetente": element.workflowInstanceDataFields.Remetente
- }
- // CreateDate
- AllResult.push(task);
- });
-
- console.log(AllResult);
-
- this.taskslist = this.sortArrayISODate(AllResult).reverse()
-
+ this.expedientList = result.reverse();
+ console.log(this.expedientList);
});
}
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 96b1d03e4..ef1749b61 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
@@ -63,7 +63,7 @@ export class ExpedienteDetailPage implements OnInit {
"Folio": res.workflowInstanceFolio,
"Senders": res.originator.email,
"CreateDate": formatDate(new Date(res.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
- "DocumentURL": res.formURL,
+ "DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
"Remetente": res.workflowInstanceDataFields.Remetente
}
this.fulltask = res;
@@ -93,7 +93,7 @@ export class ExpedienteDetailPage implements OnInit {
viewDocument(){
const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
- const browser = this.iab.create(url,"_blank");
+ const browser = this.iab.create(url,"_parent");
browser.show();
}
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index dd7735e71..2ea7f6a3f 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -48,7 +48,7 @@ export class ExpedientePage implements OnInit {
"Folio": element.workflowInstanceFolio,
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
- "DocumentURL": element.formURL,
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente
}
this.taskslist.push(task);
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 029286d0e..d4d8b8d8a 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -8,7 +8,7 @@