diff --git a/src/app/models/Expediente.ts b/src/app/models/Expediente.ts index 7fbe6a073..f44c74f2d 100644 --- a/src/app/models/Expediente.ts +++ b/src/app/models/Expediente.ts @@ -15,5 +15,6 @@ export interface ExpedienteFullTask { deadline: string; taskStatus: string TaskStatus: string; + taskReceiveDate: string workflowInstanceDataFields: ExpedienteFullTaskWorkflowInstanceDataFields; } \ No newline at end of file diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index b827dabf6..0c7032a1e 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -146,6 +146,8 @@ export class customTask { Deadline: string TaskStartDate: string TaskStatus: string + TaskReceiveDate: string + } @@ -180,6 +182,7 @@ export interface ExpedienteTask { Subject: string Deadline: string TaskStatus: string + TaskReceiveDate: string } diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index c816b34d0..f60352b92 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -172,7 +172,8 @@ export class DiplomasPage implements OnInit, OnDestroy { "Status": element.workflowInstanceDataFields.Status, "Deadline": element.Deadline, "TaskStartDate": element.taskStartDate, - "TaskStatus": element.taskStatus + "TaskStatus": element.taskStatus, + "TaskReceiveDate": element.taskReceiveDate } } diff --git a/src/app/pipes/custom-task.pipe.ts b/src/app/pipes/custom-task.pipe.ts index ef48c3cee..ac4984f93 100644 --- a/src/app/pipes/custom-task.pipe.ts +++ b/src/app/pipes/custom-task.pipe.ts @@ -27,7 +27,8 @@ export class CustomTaskPipe implements PipeTransform { "activityInstanceName": fullTask.activityInstanceName, "Status": fullTask.workflowInstanceDataFields.Status, "Deadline": fullTask.deadline, - "TaskStatus": fullTask.taskStatus + "TaskStatus": fullTask.taskStatus, + "TaskReceiveDate": fullTask.taskReceiveDate } } diff --git a/src/app/pipes/expediente-task.pipe.ts b/src/app/pipes/expediente-task.pipe.ts index 8ad1055ff..6e5aba6fe 100644 --- a/src/app/pipes/expediente-task.pipe.ts +++ b/src/app/pipes/expediente-task.pipe.ts @@ -24,7 +24,8 @@ export class ExpedienteTaskPipe implements PipeTransform { "activityInstanceName": fullTask.activityInstanceName, "Status": fullTask.workflowInstanceDataFields.Status, "Deadline": fullTask.deadline, - "TaskStatus": fullTask.taskStatus + "TaskStatus": fullTask.taskStatus, + "TaskReceiveDate": fullTask.taskReceiveDate } } diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 79d25185d..146f80f1f 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -89,9 +89,9 @@ export class TaskService { filter(item, attribute) { if(attribute == 'Para hoje') { - return this.deadlineIsToday(item.TaskStartDate || item.taskStartDate) + return this.deadlineIsToday(item.TaskReceiveDate || item.taskReceiveDate) } else if (attribute == 'Novos') { - return this.lessThen24Hours(item.TaskStartDate || item.taskStartDate) + return this.lessThen24Hours(item.TaskReceiveDate || item.taskReceiveDate) } else if (attribute == 'Lidos') { return item.TaskStatus == 'Open' || item.taskStatus == 'Open' } else if (attribute == 'Não lidos') { diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index 8563a6296..1303fb96b 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -114,7 +114,8 @@ export class DiplomasPage implements OnInit { "Status": element.workflowInstanceDataFields.Status, "Deadline": element.deadline, "TaskStartDate": element.taskStartDate, - "TaskStatus": element.taskStatus + "TaskStatus": element.taskStatus, + "TaskReceiveDate": element.taskReceiveDate } } diff --git a/version/git-version.ts b/version/git-version.ts index 4358a9e7e..0d108773d 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "d585331bd", - "SHA": "d585331bd748143c00f4a61d74186efb5fad51e3", + "shortSHA": "71d39b51e", + "SHA": "71d39b51e3230fa401717cc6479c00622e0ec109", "branch": "feature/gabineteLabels", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Apr 17 17:24:35 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4915", + "lastCommitTime": "'Tue Apr 18 09:02:51 2023 +0100'", + "lastCommitMessage": "change chat enviroment", + "lastCommitNumber": "4916", "change": "", - "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/environments/suport/dev.ts", + "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/models/Expediente.ts\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pipes/custom-task.pipe.ts\n\tmodified: src/app/pipes/expediente-task.pipe.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file