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

fix gabinete labels

Browse Source
This commit is contained in:
Peter Maquiran
2023-04-18 09:37:41 +01:00
parent 71d39b51e3
commit a87f461963
8 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/models/Expediente.ts
+1
View File
@@ -15,5 +15,6 @@ export interface ExpedienteFullTask {
deadline: string; deadline: string;
taskStatus: string taskStatus: string
TaskStatus: string; TaskStatus: string;
taskReceiveDate: string
workflowInstanceDataFields: ExpedienteFullTaskWorkflowInstanceDataFields; workflowInstanceDataFields: ExpedienteFullTaskWorkflowInstanceDataFields;
} }
src/app/models/dailyworktask.model.ts
+3
View File
@@ -146,6 +146,8 @@ export class customTask {
Deadline: string Deadline: string
TaskStartDate: string TaskStartDate: string
TaskStatus: string TaskStatus: string
TaskReceiveDate: string
} }
@@ -180,6 +182,7 @@ export interface ExpedienteTask {
Subject: string Subject: string
Deadline: string Deadline: string
TaskStatus: string TaskStatus: string
TaskReceiveDate: string
} }
src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+2 -1
View File
@@ -172,7 +172,8 @@ export class DiplomasPage implements OnInit, OnDestroy {
"Status": element.workflowInstanceDataFields.Status, "Status": element.workflowInstanceDataFields.Status,
"Deadline": element.Deadline, "Deadline": element.Deadline,
"TaskStartDate": element.taskStartDate, "TaskStartDate": element.taskStartDate,
"TaskStatus": element.taskStatus "TaskStatus": element.taskStatus,
"TaskReceiveDate": element.taskReceiveDate
} }
} }
src/app/pipes/custom-task.pipe.ts
+2 -1
View File
@@ -27,7 +27,8 @@ export class CustomTaskPipe implements PipeTransform {
"activityInstanceName": fullTask.activityInstanceName, "activityInstanceName": fullTask.activityInstanceName,
"Status": fullTask.workflowInstanceDataFields.Status, "Status": fullTask.workflowInstanceDataFields.Status,
"Deadline": fullTask.deadline, "Deadline": fullTask.deadline,
"TaskStatus": fullTask.taskStatus "TaskStatus": fullTask.taskStatus,
"TaskReceiveDate": fullTask.taskReceiveDate
} }
} }
src/app/pipes/expediente-task.pipe.ts
+2 -1
View File
@@ -24,7 +24,8 @@ export class ExpedienteTaskPipe implements PipeTransform {
"activityInstanceName": fullTask.activityInstanceName, "activityInstanceName": fullTask.activityInstanceName,
"Status": fullTask.workflowInstanceDataFields.Status, "Status": fullTask.workflowInstanceDataFields.Status,
"Deadline": fullTask.deadline, "Deadline": fullTask.deadline,
"TaskStatus": fullTask.taskStatus "TaskStatus": fullTask.taskStatus,
"TaskReceiveDate": fullTask.taskReceiveDate
} }
} }
src/app/services/task.service.ts
+2 -2
View File
@@ -89,9 +89,9 @@ export class TaskService {
filter(item, attribute) { filter(item, attribute) {
if(attribute == 'Para hoje') { if(attribute == 'Para hoje') {
return this.deadlineIsToday(item.TaskStartDate || item.taskStartDate) return this.deadlineIsToday(item.TaskReceiveDate || item.taskReceiveDate)
} else if (attribute == 'Novos') { } else if (attribute == 'Novos') {
return this.lessThen24Hours(item.TaskStartDate || item.taskStartDate) return this.lessThen24Hours(item.TaskReceiveDate || item.taskReceiveDate)
} else if (attribute == 'Lidos') { } else if (attribute == 'Lidos') {
return item.TaskStatus == 'Open' || item.taskStatus == 'Open' return item.TaskStatus == 'Open' || item.taskStatus == 'Open'
} else if (attribute == 'Não lidos') { } else if (attribute == 'Não lidos') {
src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+2 -1
View File
@@ -114,7 +114,8 @@ export class DiplomasPage implements OnInit {
"Status": element.workflowInstanceDataFields.Status, "Status": element.workflowInstanceDataFields.Status,
"Deadline": element.deadline, "Deadline": element.deadline,
"TaskStartDate": element.taskStartDate, "TaskStartDate": element.taskStartDate,
"TaskStatus": element.taskStatus "TaskStatus": element.taskStatus,
"TaskReceiveDate": element.taskReceiveDate
} }
} }
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "d585331bd", "shortSHA": "71d39b51e",
"SHA": "d585331bd748143c00f4a61d74186efb5fad51e3", "SHA": "71d39b51e3230fa401717cc6479c00622e0ec109",
"branch": "feature/gabineteLabels", "branch": "feature/gabineteLabels",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Apr 17 17:24:35 2023 +0100'", "lastCommitTime": "'Tue Apr 18 09:02:51 2023 +0100'",
"lastCommitMessage": "fix", "lastCommitMessage": "change chat enviroment",
"lastCommitNumber": "4915", "lastCommitNumber": "4916",
"change": "", "change": "",
"changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged <file>...\" 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 <file>...\" 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" "changeAuthor": "peter.maquiran"
} }