Improve counting

This commit is contained in:
Peter Maquiran
2021-07-20 08:51:29 +01:00
parent 590d7d8139
commit a46474e0aa
4 changed files with 39 additions and 36 deletions
+1 -1
View File
@@ -193,7 +193,7 @@ export class AgendaPage implements OnInit {
this.updateEventListBox() this.updateEventListBox()
}, 4000) }, 1000)
} }
@@ -81,7 +81,7 @@
<div class="item width-100"> <div class="item width-100">
<div class="exp-top-detail"> <div class="exp-top-detail">
<div class="subject"> <div class="subject">
<ion-label>{{ task.Folio }}</ion-label> <ion-label>{{ task.Folio }} {{ task.Status }}</ion-label>
</div> </div>
<div class="exp-icon"> <div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon> <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
@@ -83,11 +83,11 @@ export class PedidosPage implements OnInit {
this.openPedido.emit(data); this.openPedido.emit(data);
} }
async LoadList(){ async LoadList() {
this.skeletonLoader = true this.skeletonLoader = true
if(this.segment == 'parecer'){ if(this.segment == 'parecer') {
this.taskType = "Pedido de Parecer"; this.taskType = "Pedido de Parecer";
let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise(); let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
@@ -96,7 +96,6 @@ export class PedidosPage implements OnInit {
this.skeletonLoader = false this.skeletonLoader = false
let allParecer = parecer.concat(parecerPr).reverse(); let allParecer = parecer.concat(parecerPr).reverse();
console.log(allParecer);
this.parecerList = new Array(); 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 taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
let task = { let task = {
"SerialNumber": element.serialNumber, "SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject, "Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.originator.email, "Senders": element.originator.email,
"CreateDate": taskDate, "CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente, "Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0, "DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.ParecerDocID, "DocId": element.workflowInstanceDataFields.ParecerDocID,
"FolderID": element.workflowInstanceDataFields.FolderID, "FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName, "WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName, "activityInstanceName": element.activityInstanceName,
"Status": element.workflowInstanceDataFields.Status, "Status": element.workflowInstanceDataFields.Status,
} }
this.parecerList.push(task); this.parecerList.push(task);
}); });
@@ -127,17 +126,20 @@ export class PedidosPage implements OnInit {
else if(this.segment == 'deferimento') { else if(this.segment == 'deferimento') {
this.taskType = "Pedido de Deferimento"; this.taskType = "Pedido de Deferimento";
this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => { 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.skeletonLoader = false
this.deferimentoList = new Array(); this.deferimentoList = new Array();
let res = result.reverse(); let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active")
res.forEach(element => { res.forEach(element => {
let date = new Date(element.taskStartDate); let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1); date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
let task = { let task = {
"SerialNumber": element.serialNumber, "SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject, "Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender, "Senders": element.workflowInstanceDataFields.Sender,
@@ -149,8 +151,9 @@ export class PedidosPage implements OnInit {
"FolderID": element.workflowInstanceDataFields.FolderID, "FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName, "WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName, "activityInstanceName": element.activityInstanceName,
} "Status": element.workflowInstanceDataFields.Status,
this.deferimentoList.push(task); }
this.deferimentoList.push(task);
}); });
}); });
+12 -12
View File
@@ -10,12 +10,13 @@ import { LocalstoreService } from './localstore.service'
export class CalendarService { export class CalendarService {
private _eventSource : eventSource[] = [] 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(()=>{ setTimeout(()=>{
restore.forEach((element, eventIndex) => { restore.forEach((element, eventIndex) => {
@@ -31,15 +32,7 @@ export class CalendarService {
}); });
}); });
},1) },10)
setTimeout(() => {
setInterval(()=> {
localstoreService.set(keyName, this._eventSource)
}, 5000)
}, 10000)
} }
@@ -85,6 +78,13 @@ export class CalendarService {
this._eventSource = (filtered) this._eventSource = (filtered)
setTimeout(() => {
this.localstoreService.set(this.keyName, this._eventSource)
}, 10)
} }
} }