diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 732eb0a5c..4327ff6de 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -193,7 +193,7 @@ export class AgendaPage implements OnInit { this.updateEventListBox() - }, 4000) + }, 1000) } diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 593dbc17a..b7f6208ec 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -81,7 +81,7 @@
- {{ task.Folio }} + {{ task.Folio }} {{ task.Status }}
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index b62fc6596..e6ed488c3 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -83,11 +83,11 @@ export class PedidosPage implements OnInit { this.openPedido.emit(data); } - async LoadList(){ + async LoadList() { this.skeletonLoader = true - if(this.segment == 'parecer'){ + if(this.segment == 'parecer') { this.taskType = "Pedido de Parecer"; let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise(); @@ -96,7 +96,6 @@ export class PedidosPage implements OnInit { this.skeletonLoader = false let allParecer = parecer.concat(parecerPr).reverse(); - console.log(allParecer); this.parecerList = new Array(); @@ -107,18 +106,18 @@ export class PedidosPage implements OnInit { let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); let task = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.ParecerDocID, - "FolderID": element.workflowInstanceDataFields.FolderID, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - "Status": element.workflowInstanceDataFields.Status, + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.originator.email, + "CreateDate": taskDate, + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": 0, + "DocId": element.workflowInstanceDataFields.ParecerDocID, + "FolderID": element.workflowInstanceDataFields.FolderID, + "WorkflowName": element.workflowDisplayName, + "activityInstanceName": element.activityInstanceName, + "Status": element.workflowInstanceDataFields.Status, } this.parecerList.push(task); }); @@ -127,17 +126,20 @@ 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; + + this.taskslist = result.filter(data => data.workflowInstanceDataFields.Status == "Active") + this.skeletonLoader = false this.deferimentoList = new Array(); - let res = result.reverse(); + let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active") + res.forEach(element => { let date = new Date(element.taskStartDate); - date.setMonth(date.getMonth() + 1); - let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); + date.setMonth(date.getMonth() + 1); + let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); - let task = { + let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, "Senders": element.workflowInstanceDataFields.Sender, @@ -149,8 +151,9 @@ export class PedidosPage implements OnInit { "FolderID": element.workflowInstanceDataFields.FolderID, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, - } - this.deferimentoList.push(task); + "Status": element.workflowInstanceDataFields.Status, + } + this.deferimentoList.push(task); }); }); diff --git a/src/app/store/calendar.service.ts b/src/app/store/calendar.service.ts index cbeff654f..adb006069 100644 --- a/src/app/store/calendar.service.ts +++ b/src/app/store/calendar.service.ts @@ -10,12 +10,13 @@ import { LocalstoreService } from './localstore.service' export class CalendarService { private _eventSource : eventSource[] = [] + private keyName: string; - constructor(localstoreService: LocalstoreService) { + constructor(private localstoreService: LocalstoreService) { - const keyName = (SHA1(this.constructor.name+ 'eventSource')).toString() + this.keyName = (SHA1(this.constructor.name+ 'eventSource')).toString() - let restore = localstoreService.get(keyName, []) + let restore = localstoreService.get(this.keyName, []) setTimeout(()=>{ restore.forEach((element, eventIndex) => { @@ -31,15 +32,7 @@ export class CalendarService { }); }); - },1) - - setTimeout(() => { - setInterval(()=> { - - localstoreService.set(keyName, this._eventSource) - - }, 5000) - }, 10000) + },10) } @@ -85,6 +78,13 @@ export class CalendarService { this._eventSource = (filtered) + + + setTimeout(() => { + + this.localstoreService.set(this.keyName, this._eventSource) + + }, 10) } } \ No newline at end of file