diff --git a/src/app/shared/agenda/event-list/event-list.component.html b/src/app/shared/agenda/event-list/event-list.component.html index 8101f01fb..75cf66738 100644 --- a/src/app/shared/agenda/event-list/event-list.component.html +++ b/src/app/shared/agenda/event-list/event-list.component.html @@ -28,7 +28,7 @@
@@ -47,7 +47,7 @@
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index ab74ad7e1..ff379ad14 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -26,8 +26,8 @@ export class DespachosPage implements OnInit { @ViewChild(CalendarComponent) myCal: CalendarComponent; taskslist:DailyWorkTask[]; - despachoList:DailyWorkTask[]; - deferimentoList:DailyWorkTask[]; + despachoList:DailyWorkTask[] = []; + deferimentoList:DailyWorkTask[] = []; taskList:tasksList[] = []; @@ -41,6 +41,7 @@ export class DespachosPage implements OnInit { loadedAttachments:any; dicIndex = 0; + inicial = false constructor ( private processes:ProcessesService, @@ -72,58 +73,53 @@ export class DespachosPage implements OnInit { this.openExpedientDetail.emit(data); } - LoadList(){ - this.processes.GetTasksList("Despacho", false).subscribe(result => { - console.log(result); - - this.despachoList = new Array(); - let res = result.reverse(); - res.forEach(element => { - let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; - let DocId = element.workflowInstanceDataFields.FolderID; + async LoadList(){ - this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{ - this.totalDocs = res.DocumentsTotal; - console.log(res.DocumentsTotal); - console.log(element); - + + let result = await this.processes.GetTasksList("Despacho", false).toPromise(); + + console.log(result); - let task = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": this.totalDocs, - "DocId": element.workflowInstanceDataFields.DocId, - "WorkflowName": element.workflowDisplayName, - } - this.despachoList.push(task); - }, - (error)=>{ - let task = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocId, - "WorkflowName": element.workflowDisplayName, - } - this.despachoList.push(task); - - }); - }); + this.despachoList = new Array(); - //this + await result.forEach( (element, index) => { + + let task = { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.workflowInstanceDataFields.Sender, + "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": '', + "DocId": element.workflowInstanceDataFields.DocId, + "WorkflowName": element.workflowDisplayName, + "FolderID": element.workflowInstanceDataFields.FolderID + } + + this.despachoList.push(task) + + }); - - console.log(this.despachoList); - }); - } + this.despachoList = this.sortArrayISODate(this.despachoList).reverse() + + this.despachoList.forEach( (element, index) => { + // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; + let FolderID = element['FolderID']; + + this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{ + element.DocumentsQty = res.DocumentsTotal + }) + + }); + + } + + sortArrayISODate(myArray: any){ + return myArray.sort(function(a, b) { + return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); + }); + } doRefresh(event) { this.LoadList();