Pendentes
+
+
+
+
+ Para hoje
+
+
+
+ Novos
+
+
+
+ Lidos
+
+
+
+ Não lidos
+
+
+
+ Todos
+
+
+
+
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
index 0f28c2c25..a412cce06 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
@@ -39,7 +39,8 @@ export class PendentesPage implements OnInit {
pendentesstore = PendentesStore;
customTaskPipe = new CustomTaskPipe()
listToPresent = [];
-
+ filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
+
constructor(
private processes: ProcessesService,
private alertService: AlertService,
diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts
index fe73f89f7..d2f87d0e8 100644
--- a/src/app/services/task.service.ts
+++ b/src/app/services/task.service.ts
@@ -10,10 +10,20 @@ export class TaskService {
constructor() { }
deadlineIsToday(isoDateString:string) {
+
+ if(!isoDateString) {
+ return false
+ }
return momentG(new Date(), 'dd MMMM yyyy') == momentG(new Date(isoDateString), 'dd MMMM yyyy')
}
lessThen24Hours(isoDateString:string) {
+
+ if(!isoDateString) {
+ console.log('no created date')
+ return true
+ }
+
const creationDate = new Date(isoDateString)
const creationDatePlus24h = new Date(creationDate)
creationDatePlus24h.setHours((creationDate.getHours() + 24))
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts
index 4f4f714bf..7e53cf76c 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts
@@ -9,6 +9,23 @@ import { DespachosPrPageRoutingModule } from './despachos-pr-routing.module';
import { DespachosPrPage } from './despachos-pr.page';
import { TaskListPageModule } from '../generic/task-list/task-list.module';
+
+import { MatInputModule } from '@angular/material/input';
+import { MatNativeDateModule } from '@angular/material/core';
+
+import {
+ NgxMatDatetimePickerModule,
+ NgxMatNativeDateModule,
+ NgxMatTimepickerModule
+} from '@angular-material-components/datetime-picker';
+
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatSelectModule } from '@angular/material/select';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
+
+
+
@NgModule({
imports: [
CommonModule,
@@ -16,7 +33,16 @@ import { TaskListPageModule } from '../generic/task-list/task-list.module';
IonicModule,
DespachosPrPageRoutingModule,
// entryComponents
- TaskListPageModule
+ TaskListPageModule,
+ //
+ MatInputModule,
+ MatNativeDateModule,
+ NgxMatDatetimePickerModule,
+ NgxMatTimepickerModule,
+ NgxMatNativeDateModule,
+ NgxMatMomentModule,
+ MatSelectModule,
+ MatButtonModule,
],
exports: [DespachosPrPage],
declarations: [DespachosPrPage]
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
index 4c97854b7..e6b30c2de 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -2,14 +2,38 @@
- {{ environment.dispatchPR}}
- Despachos
+ {{ environment.dispatchPR}}
-
+ -->
+
@@ -27,6 +51,7 @@
[taskList] = despachosprstore.list
[skeletonLoader] = skeletonLoader
(viewTaskDetail)="goToDespacho($event)"
+ [filterName]="filterName"
>
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
index cc7e8812e..3d780009c 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -23,7 +23,8 @@ export class DespachosPrPage implements OnInit {
loggeduser: LoginUserRespose;
despachosprstore = DespachosprStore;
environment = environment
-
+ filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
+
constructor (
private processes:ProcessesService,
private authService: AuthService,
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.module.ts b/src/app/shared/gabinete-digital/despachos/despachos.module.ts
index e6598bf66..7f7e97ff8 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.module.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.module.ts
@@ -9,6 +9,21 @@ import { DespachosPageRoutingModule } from './despachos-routing.module';
import { DespachosPage } from './despachos.page';
import { TaskListPageModule } from 'src/app/shared/gabinete-digital/generic/task-list/task-list.module'
+
+import { MatInputModule } from '@angular/material/input';
+import { MatNativeDateModule } from '@angular/material/core';
+
+import {
+ NgxMatDatetimePickerModule,
+ NgxMatNativeDateModule,
+ NgxMatTimepickerModule
+} from '@angular-material-components/datetime-picker';
+
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatSelectModule } from '@angular/material/select';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
+
@NgModule({
imports: [
CommonModule,
@@ -16,7 +31,16 @@ import { TaskListPageModule } from 'src/app/shared/gabinete-digital/generic/task
IonicModule,
DespachosPageRoutingModule,
// entryComponents
- TaskListPageModule
+ TaskListPageModule,
+ //
+ MatInputModule,
+ MatNativeDateModule,
+ NgxMatDatetimePickerModule,
+ NgxMatTimepickerModule,
+ NgxMatNativeDateModule,
+ NgxMatMomentModule,
+ MatSelectModule,
+ MatButtonModule,
],
exports: [DespachosPage],
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html
index d7479c220..a3785a151 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html
@@ -6,6 +6,31 @@
+
+
+
+
+ Para hoje
+
+
+
+ Novos
+
+
+
+ Lidos
+
+
+
+ Não lidos
+
+
+
+ Todos
+
+
+
+