diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 146f80f1f..2b82f6575 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -89,7 +89,7 @@ export class TaskService { filter(item, attribute) { if(attribute == 'Para hoje') { - return this.deadlineIsToday(item.TaskReceiveDate || item.taskReceiveDate) + return this.deadlineIsToday(item.Deadline || item.deadline) } else if (attribute == 'Novos') { return this.lessThen24Hours(item.TaskReceiveDate || item.taskReceiveDate) } else if (attribute == 'Lidos') { @@ -124,7 +124,7 @@ export class TaskService { this.read = this.AllProcess.filter((item) => this.filter(item,'Lidos')).length this.unread = this.AllProcess.filter((item) => this.filter(item,'Não lidos')).length this.deadline = this.AllProcess.filter((task) => this.deadlineIsToday(task.Deadline || task.deadline)).length - this.new = this.AllProcess.filter((task) => this.lessThen24Hours(task.TaskStartDate || task.taskStartDate)).length + this.new = this.AllProcess.filter((task) => this.lessThen24Hours(task.TaskReceiveDate || task.taskReceiveDate)).length this.overdueTasks = this.AllProcess.filter((task) => this.overdueTask(task.Deadline || task.deadline)).length } diff --git a/version/git-version.ts b/version/git-version.ts index afc17b8bc..5c2e76b59 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "45a401430", - "SHA": "45a4014307bb15795eb55a4b84de2f9e9c84f5ed", + "shortSHA": "27fd1d876", + "SHA": "27fd1d8765a87f2c043934044e9259f9bc59a283", "branch": "feature/gabineteLabels", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Apr 18 11:51:56 2023 +0100'", - "lastCommitMessage": "fix variables", - "lastCommitNumber": "4918", + "lastCommitTime": "'Tue Apr 18 14:38:32 2023 +0100'", + "lastCommitMessage": "fix", + "lastCommitNumber": "4919", "change": "", - "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html", + "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/services/task.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file