peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 05:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixed on Init presenting correspondencia and a filter presenting only the correspondencias that have enough data

Browse Source
This commit is contained in:
Eudes Inácio
2021-12-01 15:24:29 +01:00
parent 6a912b740d
commit 9bc657d2ca
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/events/events.page.ts
+22 -14
View File
@@ -197,10 +197,13 @@ export class EventsPage implements OnInit {
this.showLoader = true; this.showLoader = true;
let date = new Date(); let date = new Date();
date.setMonth(date.getMonth() + 1); let month = date.getMonth() + 1;
let start = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); //date.setMonth(date.getMonth() + 1);
let end = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " 23:59:59"; let start = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
let end = date.getFullYear() + "-" + month + "-" + date.getDate() + " 23:59:59";
console.log('Data start yahaya', start)
console.log('Data end yahaya', end)
if (this.loggeduser.Profile == 'MDGPR') { if (this.loggeduser.Profile == 'MDGPR') {
@@ -368,8 +371,9 @@ export class EventsPage implements OnInit {
getEventsFromLocalDb() { getEventsFromLocalDb() {
let date = new Date(); let date = new Date();
date.setMonth(date.getMonth() + 1); let month = date.getMonth() + 1;
let dateToday = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate(); //date.setMonth(date.getMonth() + 1);
let dateToday = date.getFullYear() + "-" + month + "-" + date.getDate();
console.log('dateeeeee', dateToday) console.log('dateeeeee', dateToday)
if (this.platform.is('desktop') || this.platform.is('mobileweb')) { if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
@@ -420,16 +424,20 @@ export class EventsPage implements OnInit {
var expedientlist: any = new Array(); var expedientlist: any = new Array();
process.forEach((element) => { process.forEach((element) => {
let task = { if(JSON.parse(element.workflowInstanceDataFields).TaskMessage || JSON.parse(element.workflowInstanceDataFields).Note) {
activityInstanceName: element.activityInstanceName,
deadline: null, let task = {
serialNumber: element.serialNumber, activityInstanceName: element.activityInstanceName,
taskStartDate: element.taskStartDate, deadline: null,
totalDocuments: element.totalDocuments, serialNumber: element.serialNumber,
workflowDisplayName: element.workflowDisplayName, taskStartDate: element.taskStartDate,
workflowInstanceDataFields: JSON.parse(element.workflowInstanceDataFields) totalDocuments: element.totalDocuments,
workflowDisplayName: element.workflowDisplayName,
workflowInstanceDataFields: JSON.parse(element.workflowInstanceDataFields)
}
expedientlist.push(task);
} }
expedientlist.push(task);
}) })
console.log('OFOFOFOOF22222', expedientlist) console.log('OFOFOFOOF22222', expedientlist)