-
+
{{ task.Subject }}
+ Para hoje
+ Nova
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.scss b/src/app/pages/gabinete-digital/expediente/expediente.page.scss
index 6a8675ebd..93384bd41 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.scss
@@ -233,4 +233,18 @@ ion-item{
font-size: 45px;
float: right;
margin-right: 10px;
+}
+
+.dead-line {
+ font-size: 12px;
+ color: red;
+}
+
+.new-task {
+ border-radius: 20px;
+ background: #efefef;
+ font-size: 12px;
+ float: right;
+ padding: 2.5px 13.5px 2.5px 13.5px;
+ color: #46465b;
}
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 2fd8c68bd..cc8658317 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -11,6 +11,8 @@ import { ThemeService } from 'src/app/services/theme.service'
import { SortService } from 'src/app/services/functions/sort.service';
import { Storage } from '@ionic/storage';
import { EventTrigger } from 'src/app/services/eventTrigger.service';
+import { TaskDeadlineService } from 'src/app/services/task-deadline.service'
+import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-expediente',
@@ -43,7 +45,9 @@ export class ExpedientePage implements OnInit {
public ThemeService: ThemeService,
private sortService: SortService,
private storage: Storage,
- private eventTriger: EventTrigger
+ private eventTriger: EventTrigger,
+ public TaskDeadlineService: TaskDeadlineService,
+ public TaskService: TaskService
) {
this.eventTriger.getObservable().subscribe((event) => {
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
index 1c03e8fa5..754c8bf05 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
@@ -170,6 +170,7 @@ export class ExpedientePrPage implements OnInit {
"WorkflowName": res.workflowDisplayName,
"activityInstanceName": res.activityInstanceName,
"Status": res.workflowInstanceDataFields.Status,
+ "Deadline": res.deadline,
}
this.fulltask = res;
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index be7c96be9..80a6150df 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -79,7 +79,7 @@
{{task.activityInstanceName}}
- {{ task.CreateDate || task.taskStartDate | date: 'dd-MM-yyyy HH:mm' }}
+ {{ task.CreateDate || task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 590082ff2..c5a09dd10 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -314,7 +314,8 @@ export class GabineteDigitalPage implements OnInit {
"workflowID": element.workflowID,
"workflowInstanceDataFields": element.workflowInstanceDataFields,
"workflowInstanceID": element.workflowInstanceID,
- "workflowName": element.workflowName
+ "workflowName": element.workflowName,
+ "deadline": element.deadline
}
this.sqliteservice.addProcess(process);
@@ -348,6 +349,7 @@ export class GabineteDigitalPage implements OnInit {
"activityInstanceName": element.activityInstanceName,
"Status": element.workflowInstanceDataFields.Status,
"Agenda": element.workflowInstanceDataFields.Agenda,
+ "deadline": element.deadline,
"customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent),
}
@@ -381,6 +383,7 @@ export class GabineteDigitalPage implements OnInit {
"Status": workflowInstanceDataFields.Status,
"Agenda": workflowInstanceDataFields.Agenda,
"customDate": this.setFormatDate(new Date(workflowInstanceDataFields.StartDate), new Date(workflowInstanceDataFields.EndDate), workflowInstanceDataFields.IsAllDayEvent),
+ "deadline": element.deadline
}
this.allProcessesList.push(task);
@@ -688,6 +691,7 @@ export class GabineteDigitalPage implements OnInit {
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
+ "deadline": element.deadline
}
}));
@@ -705,6 +709,7 @@ export class GabineteDigitalPage implements OnInit {
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
+ "deadline": element.deadline
}
}));
@@ -759,6 +764,7 @@ export class GabineteDigitalPage implements OnInit {
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
"Status": element.workflowInstanceDataFields.Status,
+ "deadline": element.deadline
}
}))
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index 0b205d55e..ebddb964d 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -132,6 +132,7 @@ export class PedidoPage implements OnInit {
"ProcessInstanceID": res.workflowInstanceDataFields.InstanceID,
"activityInstanceName": res.activityInstanceName,
"Status": res.workflowInstanceDataFields.Status,
+ "Deadline": res.deadline,
}
this.updateProcess(res);
diff --git a/src/app/pipes/custom-task.pipe.ts b/src/app/pipes/custom-task.pipe.ts
index d4280c1a3..7a41f2d8f 100644
--- a/src/app/pipes/custom-task.pipe.ts
+++ b/src/app/pipes/custom-task.pipe.ts
@@ -17,6 +17,7 @@ export class CustomTaskPipe implements PipeTransform {
"Folio": fullTask.workflowInstanceDataFields.Subject,
"Senders": fullTask.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
+ "TaskStartDate": fullTask.taskStartDate,
"DocumentURL": fullTask.workflowInstanceDataFields.ViewerRequest,
"Remetente": fullTask.workflowInstanceDataFields.Remetente,
"DocumentsQty": fullTask.totalDocuments,
@@ -25,6 +26,7 @@ export class CustomTaskPipe implements PipeTransform {
"WorkflowName": fullTask.workflowDisplayName,
"activityInstanceName": fullTask.activityInstanceName,
"Status": fullTask.workflowInstanceDataFields.Status,
+ "Deadline": fullTask.deadline,
}
}
diff --git a/src/app/pipes/expediente-task.pipe.ts b/src/app/pipes/expediente-task.pipe.ts
index cd3a82b45..6cd2af8eb 100644
--- a/src/app/pipes/expediente-task.pipe.ts
+++ b/src/app/pipes/expediente-task.pipe.ts
@@ -14,7 +14,7 @@ export class ExpedienteTaskPipe implements PipeTransform {
return {
"SerialNumber": fullTask.serialNumber,
- "taskStartDate": fullTask.taskStartDate,
+ "TaskStartDate": fullTask.taskStartDate,
"Subject": fullTask.workflowInstanceDataFields.Subject,
"Folio": fullTask.workflowInstanceDataFields.Subject,
"Senders": fullTask.workflowInstanceDataFields.Sender,
@@ -23,6 +23,7 @@ export class ExpedienteTaskPipe implements PipeTransform {
"WorkflowName": fullTask.workflowDisplayName,
"activityInstanceName": fullTask.activityInstanceName,
"Status": fullTask.workflowInstanceDataFields.Status,
+ "Deadline": fullTask.deadline
}
}
diff --git a/src/app/services/task-deadline.service.spec.ts b/src/app/services/task-deadline.service.spec.ts
new file mode 100644
index 000000000..e9dc02560
--- /dev/null
+++ b/src/app/services/task-deadline.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { TaskDeadlineService } from './task-deadline.service';
+
+describe('TaskDeadlineService', () => {
+ let service: TaskDeadlineService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(TaskDeadlineService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/services/task-deadline.service.ts b/src/app/services/task-deadline.service.ts
new file mode 100644
index 000000000..cb784dfe6
--- /dev/null
+++ b/src/app/services/task-deadline.service.ts
@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { momentG } from 'src/plugin/momentG';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class TaskDeadlineService {
+
+ constructor() { }
+
+ date(isoDateString:string) {
+ return momentG(new Date(), 'dd MMMM yyyy') == momentG(new Date(isoDateString), 'dd MMMM yyyy')
+ }
+
+ lessthen24Hours(isoDateString:string) {
+ const creationDate = new Date(isoDateString)
+ const creationDatePlus24h = new Date(creationDate)
+ creationDatePlus24h.setHours((creationDate.getHours() + 24))
+
+ return creationDatePlus24h.getTime() > creationDate.getTime()
+ }
+}
diff --git a/src/app/services/task.service.spec.ts b/src/app/services/task.service.spec.ts
new file mode 100644
index 000000000..0bbd21466
--- /dev/null
+++ b/src/app/services/task.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { TaskService } from './task.service';
+
+describe('TaskService', () => {
+ let service: TaskService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(TaskService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts
new file mode 100644
index 000000000..186cc2c13
--- /dev/null
+++ b/src/app/services/task.service.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { momentG } from 'src/plugin/momentG';
+
+
+@Injectable({
+ providedIn: 'root'
+})
+export class TaskService {
+
+ constructor() { }
+
+ deadlineIsToday(isoDateString:string) {
+ return momentG(new Date(), 'dd MMMM yyyy') == momentG(new Date(isoDateString), 'dd MMMM yyyy')
+ }
+
+ lessThen24Hours(isoDateString:string) {
+ const creationDate = new Date(isoDateString)
+ const creationDatePlus24h = new Date(creationDate)
+ creationDatePlus24h.setHours((creationDate.getHours() + 24))
+ const currentDate = new Date()
+
+ return creationDatePlus24h.getTime() > currentDate.getTime()
+ }
+}
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
index 13fbf3246..a3e1e1380 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
@@ -72,7 +72,7 @@
{{task.activityInstanceName}}