add labels

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]

src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html

@@ -2,14 +2,38 @@
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="main-header">
     <div class="thetitle">
-      <ion-label *ngIf="loggeduser.Profile =='MDGPR'" >{{ environment.dispatchPR}}</ion-label>
-      <ion-label *ngIf="loggeduser.Profile =='PR'" >Despachos</ion-label>
+      <ion-label  >{{ environment.dispatchPR}}</ion-label>
     </div>
-    <!-- <div class="theicon">
-      <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
+    <div class="theicon">
+      <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+        <mat-select [(value)]="filterName">
+
+          <mat-option value="Para hoje" >
+            Para hoje
+          </mat-option>
+
+          <mat-option value="Novos" >
+            Novos
+          </mat-option>
+
+          <mat-option value="Lidos" >
+            Lidos
+          </mat-option>
+
+          <mat-option value="Não Lidos" >
+            Não lidos
+          </mat-option>
+
+          <mat-option value="Todos" >
+            Todos
+          </mat-option>
+
+        </mat-select>
+      </mat-form-field>
+      <!-- <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
-      </button>
-    </div> -->
+      </button> -->
+    </div>
   </div>
 
 </ion-header>
@@ -27,6 +51,7 @@
     [taskList] = despachosprstore.list
     [skeletonLoader] = skeletonLoader
     (viewTaskDetail)="goToDespacho($event)"
+    [filterName]="filterName"
   > </app-task-list>
 
 </ion-content>

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,

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],

src/app/shared/gabinete-digital/despachos/despachos.page.html

@@ -6,6 +6,31 @@
       <!-- <button title="Atualizar" class="btn-no-color" (click)="refreshing()">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
       </button> -->
+      <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+        <mat-select [(value)]="filterName">
+
+          <mat-option value="Para hoje" >
+            Para hoje
+          </mat-option>
+
+          <mat-option value="Novos" >
+            Novos
+          </mat-option>
+
+          <mat-option value="Lidos" >
+            Lidos
+          </mat-option>
+
+          <mat-option value="Não Lidos" >
+            Não lidos
+          </mat-option>
+
+          <mat-option value="Todos" >
+            Todos
+          </mat-option>
+
+        </mat-select>
+      </mat-form-field>
     </div>
   </div>
 </ion-header>
@@ -24,6 +49,7 @@
     [taskList] = despachoStore.list
     [skeletonLoader] = skeletonLoader
     (viewTaskDetail)="goToDespacho($event)"
+    [filterName]="filterName"
   >
   </app-task-list>
 

src/app/shared/gabinete-digital/despachos/despachos.page.ts

@@ -13,6 +13,8 @@ export class DespachosPage implements OnInit {
 
   despachoStore = DespachoStore;
   skeletonLoader = true;
+  filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
+  
 
   constructor (
    private router: Router,

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts

@@ -8,12 +8,37 @@ import { DiplomasAssinarPageRoutingModule } from './diplomas-assinar-routing.mod
 
 import { DiplomasAssinarPage } from './diplomas-assinar.page';
 
+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,
     FormsModule,
     IonicModule,
-    DiplomasAssinarPageRoutingModule
+    DiplomasAssinarPageRoutingModule,
+    //
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
+    
   ],
   exports: [DiplomasAssinarPage],
   declarations: [DiplomasAssinarPage]

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html

@@ -3,9 +3,34 @@
   <div class="title">
     <div class="thetitle"><ion-label >Diplomas para assinar</ion-label></div>
     <div class="theicon">
-      <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
+      <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+        <mat-select [(value)]="filterName">
+
+          <mat-option value="Para hoje" >
+            Para hoje
+          </mat-option>
+
+          <mat-option value="Novos" >
+            Novos
+          </mat-option>
+
+          <mat-option value="Lidos" >
+            Lidos
+          </mat-option>
+
+          <mat-option value="Não Lidos" >
+            Não lidos
+          </mat-option>
+
+          <mat-option value="Todos" >
+            Todos
+          </mat-option>
+
+        </mat-select>
+      </mat-form-field>
+      <!-- <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
-      </button>
+      </button> -->
     </div>
   </div>
 </ion-header>
@@ -29,13 +54,13 @@
         <!-- *ngFor = "let task of parecerList; let i = index"
         (click)="viewExpedientDetail(task.SerialNumber)" -->
         <div
-          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
+          class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of deplomasStore.diplomasParaAssinarList"
           (click)="goToDiploma(task.SerialNumber)"
         >
           <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
           <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-          <div class="item width-100">
+          <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
               <div class="subject">
                 <ion-label>{{ task.Folio || task.workflowInstanceDataFields.Subject }}</ion-label>

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts

@@ -6,7 +6,7 @@ import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
-
+import { TaskService } from 'src/app/services/task.service'
 
 @Component({
   selector: 'app-diplomas-assinar',
@@ -21,12 +21,15 @@ export class DiplomasAssinarPage implements OnInit {
 
   deplomasStore = DeplomasStore
   customTaskPipe = new CustomTaskPipe()
+  filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
+  
 
   constructor(
     private processes:ProcessesService,
     private router: Router,
     private sortService: SortService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    public TaskService: TaskService
     ) {}
 
   ngOnInit() {

src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts

@@ -8,12 +8,38 @@ import { DiplomasGerarPageRoutingModule } from './diplomas-gerar-routing.module'
 
 import { DiplomasGerarPage } from './diplomas-gerar.page';
 
+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,
     FormsModule,
     IonicModule,
-    DiplomasGerarPageRoutingModule
+    DiplomasGerarPageRoutingModule,
+    //
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
+    ReactiveFormsModule
+    
   ],
   declarations: [DiplomasGerarPage],
   exports: [DiplomasGerarPage]

src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html

@@ -2,11 +2,36 @@
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
     <div class="thetitle"><ion-label >Diplomas por gerar</ion-label></div>
-    <!-- <div class="theicon">
-      <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
+    <div class="theicon">
+      <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+        <mat-select [(value)]="filterName">
+
+          <mat-option value="Para hoje" >
+            Para hoje
+          </mat-option>
+
+          <mat-option value="Novos" >
+            Novos
+          </mat-option>
+
+          <mat-option value="Lidos" >
+            Lidos
+          </mat-option>
+
+          <mat-option value="Não Lidos" >
+            Não lidos
+          </mat-option>
+
+          <mat-option value="Todos" >
+            Todos
+          </mat-option>
+
+        </mat-select>
+      </mat-form-field>
+      <!-- <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
-      </button>
-    </div> -->
+      </button> -->
+    </div>
   </div>
 </ion-header>
 <ion-content>
@@ -27,11 +52,11 @@
 
       <ion-list >
         <div
-          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
+          class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of deplomasStore.DiplomaGerarList"
           (click)="goToDiploma(task.SerialNumber)"
         >
-          <div class="item width-100">
+          <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
               <div class="subject">
                 <ion-label>{{ task.Folio }}</ion-label>

src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts

@@ -6,6 +6,7 @@ import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
+import { TaskService } from 'src/app/services/task.service'
 
 @Component({
   selector: 'app-diplomas-gerars',
@@ -20,12 +21,15 @@ export class DiplomasGerarPage implements OnInit {
 
   deplomasStore = DeplomasStore
   customTaskPipe = new CustomTaskPipe()
+  filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
+  
 
   constructor(
     private processes:ProcessesService,
     private router: Router,
     private sortService: SortService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    public TaskService: TaskService
     ) {}
 
   ngOnInit() {

src/app/shared/gabinete-digital/diplomas/diplomas.module.ts

@@ -8,12 +8,38 @@ import { DiplomasPageRoutingModule } from './diplomas-routing.module';
 
 import { DiplomasPage } from './diplomas.page';
 
+
+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,
     FormsModule,
     IonicModule,
-    DiplomasPageRoutingModule
+    DiplomasPageRoutingModule,
+    //
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
   ],
   exports: [DiplomasPage],
   declarations: [DiplomasPage]

src/app/shared/gabinete-digital/diplomas/diplomas.page.html

@@ -2,11 +2,36 @@
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
     <div class="thetitle"><ion-label >Diplomas</ion-label></div>
-    <!-- <div class="theicon">
-      <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
+    <div class="theicon">
+      <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+        <mat-select [(value)]="filterName">
+
+          <mat-option value="Para hoje" >
+            Para hoje
+          </mat-option>
+
+          <mat-option value="Novos" >
+            Novos
+          </mat-option>
+
+          <mat-option value="Lidos" >
+            Lidos
+          </mat-option>
+
+          <mat-option value="Não Lidos" >
+            Não lidos
+          </mat-option>
+
+          <mat-option value="Todos" >
+            Todos
+          </mat-option>
+
+        </mat-select>
+      </mat-form-field>
+      <!-- <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
-      </button>
-    </div> -->
+      </button> -->
+    </div>
   </div>
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
@@ -26,11 +51,11 @@
     <div *ngIf="deplomasStore.diplomasReviewList.length >= 1 && p.userPermission([p.permissionList.Gabinete.md_tasks])">
       <ion-list *ngSwitchCase="'validar'">
         <div
-          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
+          class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of deplomasStore.diplomasReviewList"
           (click)="goToDiploma(task.SerialNumber)"
         >
-          <div class="item width-100">
+          <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
               <div class="subject">
                 <ion-label>{{ task.Folio }}</ion-label>
@@ -62,12 +87,12 @@
     <div *ngIf="deplomasStore.diplomasAssinadoList.length >= 1">
       <ion-list *ngSwitchCase="'assinados'">
         <div
-          class="expediente ion-no-padding ion-no-margin cursor-pointer"
+          class=" ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of deplomasStore.diplomasAssinadoList"
 
           (click)="goToDiploma(task.SerialNumber)"
         >
-          <div class="item width-100">
+          <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
               <div class="subject">
                 <ion-label>{{ task.Folio }}</ion-label>

src/app/shared/gabinete-digital/diplomas/diplomas.page.ts

@@ -7,6 +7,7 @@ import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SortService } from 'src/app/services/functions/sort.service';
 import { PermissionService } from 'src/app/services/permission.service';
+import { TaskService } from 'src/app/services/task.service'
 
 @Component({
   selector: 'app-diplomas',
@@ -24,6 +25,7 @@ export class DiplomasPage implements OnInit {
   @Input() segment:string;
 
 
+  filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
   deplomasStore = DeplomasStore
   customTaskPipe = new CustomTaskPipe()
 
@@ -33,6 +35,7 @@ export class DiplomasPage implements OnInit {
     public ThemeService: ThemeService,
     private sortService: SortService,
     public p: PermissionService,
+    public TaskService: TaskService
   ) {}
 
   ngOnInit() {

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html

@@ -36,12 +36,12 @@
 
         <ion-list class="width-100" >
           <div
-            class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
+            class="item-hover ion-no-padding ion-no-margin cursor-pointer"
             *ngFor="let event of eventoaprovacaostore.get(segment)"
             (click)="goToEventDetail(event)"
           >
             <!-- (click)="openApproveModal(event)" -->
-            <div class="event-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100">
+            <div class="event-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100 expediente">
               <div class="approve-event-time">
                 <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
                 <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module.ts

@@ -8,12 +8,37 @@ import { ExpedientesPrPageRoutingModule } from './expedientes-pr-routing.module'
 
 import { ExpedientesPrPage } from './expedientes-pr.page';
 
+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,
     FormsModule,
     IonicModule,
-    ExpedientesPrPageRoutingModule
+    ExpedientesPrPageRoutingModule,
+    //
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
   ],
   exports: [ ExpedientesPrPage],
   declarations: [ ExpedientesPrPage]

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html

@@ -2,11 +2,36 @@
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
     <div class="thetitle"><ion-label >Expediente</ion-label></div>
-    <!-- <div class="theicon" (click)="refreshing()">
-      <button title="Atualizar" class="btn-no-color" (click)="refreshing()">
+    <div class="theicon" (click)="refreshing()">
+      <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+        <mat-select [(value)]="filterName">
+
+          <mat-option value="Para hoje" >
+            Para hoje
+          </mat-option>
+
+          <mat-option value="Novos" >
+            Novos
+          </mat-option>
+
+          <mat-option value="Lidos" >
+            Lidos
+          </mat-option>
+
+          <mat-option value="Não Lidos" >
+            Não lidos
+          </mat-option>
+
+          <mat-option value="Todos" >
+            Todos
+          </mat-option>
+
+        </mat-select>
+      </mat-form-field>
+      <!-- <button title="Atualizar" class="btn-no-color" (click)="refreshing()">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
-      </button>
-    </div> -->
+      </button> -->
+    </div>
   </div>
 </ion-header>
 <ion-content>
@@ -15,11 +40,11 @@
 
     <ion-list *ngIf="expedienteGdStore.list.length >= 1">
       <div
-        class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
+        class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
         *ngFor = "let task of expedienteGdStore.list"
         (click)="goToExpediente(task.SerialNumber)"
       >
-        <div class="item width-100">
+        <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
           <div class="exp-top-detail">
             <div class="subject">
               <ion-label>{{ task.Subject }}</ion-label>

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -8,6 +8,7 @@ import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SortService } from 'src/app/services/functions/sort.service';
 import { SessionStore } from 'src/app/store/session.service';
+import { TaskService } from 'src/app/services/task.service'
 
 
 @Component({
@@ -25,6 +26,8 @@ export class ExpedientesPrPage implements OnInit {
   expedienteTaskPipe = new ExpedienteTaskPipe()
 
   loggeduser: LoginUserRespose;
+  filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
+  
   @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
 
   constructor(
@@ -32,6 +35,7 @@ export class ExpedientesPrPage implements OnInit {
     private router: Router,
     public ThemeService: ThemeService,
     private sortService: SortService,
+        public TaskService: TaskService
     ) {
       this.loggeduser = SessionStore.user;
     }

src/app/shared/gabinete-digital/expedients/expedients.module.ts

@@ -8,12 +8,37 @@ import { ExpedientsPageRoutingModule } from './expedients-routing.module';
 
 import { ExpedientsPage } from './expedients.page';
 
+
+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,
     FormsModule,
     IonicModule,
-    ExpedientsPageRoutingModule
+    ExpedientsPageRoutingModule,
+    //
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
   ],
   exports: [ExpedientsPage],
   declarations: [ExpedientsPage]

src/app/shared/gabinete-digital/expedients/expedients.page.html

@@ -2,11 +2,36 @@
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
     <div class="thetitle"><ion-label >Expediente</ion-label></div>
-    <!-- <div class="theicon">
-      <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
+    <div class="theicon">
+      <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+        <mat-select [(value)]="filterName">
+
+          <mat-option value="Para hoje" >
+            Para hoje
+          </mat-option>
+
+          <mat-option value="Novos" >
+            Novos
+          </mat-option>
+
+          <mat-option value="Lidos" >
+            Lidos
+          </mat-option>
+
+          <mat-option value="Não Lidos" >
+            Não lidos
+          </mat-option>
+
+          <mat-option value="Todos" >
+            Todos
+          </mat-option>
+
+        </mat-select>
+      </mat-form-field>
+      <!-- <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
-      </button>
-    </div> -->
+      </button> -->
+    </div>
   </div>
 </ion-header>
 <ion-content>
@@ -24,14 +49,16 @@
 
       <ion-list *ngIf="expedientegbstore.list.length >=0">
         <div
-          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
+          class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of expedientegbstore.list"
           (click)="goToExpediente(task.SerialNumber)"
         >
-          <div class="item width-100">
+          <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
               <div class="subject">
                 <ion-label>{{ task.Subject }}</ion-label>
+                <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
+                <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
               </div>
               <div class="exp-icon">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>

src/app/shared/gabinete-digital/expedients/expedients.page.ts

@@ -7,6 +7,7 @@ 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 { TaskService } from 'src/app/services/task.service'
 
 @Component({
   selector: 'app-expedients',
@@ -24,14 +25,16 @@ export class ExpedientsPage implements OnInit {
   expedientegbstore = ExpedienteGdStore
 
   expedienteTaskPipe = new ExpedienteTaskPipe()
-
+  filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
+  
   constructor(
     private processes: ProcessesService,
     private router: Router,
     public ThemeService: ThemeService,
     private sortService: SortService,
     private storage: Storage,
-    private eventTriger: EventTrigger
+    private eventTriger: EventTrigger,
+    public TaskService: TaskService
   ) {
     this.profile = 'mdgpr';
     this.eventTriger.getObservable().subscribe((event) => {

src/app/shared/gabinete-digital/generic/task-list/task-list.page.html

@@ -4,13 +4,13 @@
     <div *ngIf="taskList.length >= 0">
       <ion-list part="divo">
         <div
-          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
+          class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of taskList; let i = index"
           (click)="viewTaskDetail.emit(task)"
         >
           <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
 
-          <div class="item width-100">
+          <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
               <div class="subject d-flex align-center">
                 <ion-label>{{ task.Folio }}</ion-label>

src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts

@@ -12,6 +12,7 @@ export class TaskListPage implements OnInit {
 
   @Input() taskList: customTask[] = [];
   @Input() skeletonLoader: boolean = false
+  @Input() filterName: string
   @Output() viewTaskDetail = new EventEmitter<customTask>();
   
   constructor(

src/app/shared/gabinete-digital/pedidos/pedidos.module.ts

@@ -8,12 +8,37 @@ import { PedidosPageRoutingModule } from './pedidos-routing.module';
 
 import { PedidosPage } from './pedidos.page';
 
+
+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,
     FormsModule,
     IonicModule,
-    PedidosPageRoutingModule
+    PedidosPageRoutingModule,
+    //
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
   ],
   exports: [PedidosPage],
   declarations: [PedidosPage]

src/app/shared/gabinete-digital/pedidos/pedidos.page.html

@@ -2,11 +2,36 @@
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
     <div class="thetitle"><ion-label >Pedidos</ion-label></div>
-    <!-- <div class="theicon">
-      <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
+    <div class="theicon btn-refresh">
+      <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+        <mat-select [(value)]="filterName">
+
+          <mat-option value="Para hoje" >
+            Para hoje
+          </mat-option>
+
+          <mat-option value="Novos" >
+            Novos
+          </mat-option>
+
+          <mat-option value="Lidos" >
+            Lidos
+          </mat-option>
+
+          <mat-option value="Não Lidos" >
+            Não lidos
+          </mat-option>
+
+          <mat-option value="Todos" >
+            Todos
+          </mat-option>
+
+        </mat-select>
+      </mat-form-field>
+      <!-- <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
-      </button>
-    </div> -->
+      </button> -->
+    </div>s
   </div>
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
@@ -36,16 +61,18 @@
         <!-- *ngFor = "let task of pedidosstore.listparecer; let i = index"
         (click)="viewExpedientDetail(task.SerialNumber)" -->
         <div
-          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
+          class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of pedidosstore.listparecer"
           (click)="goToPedido(task.SerialNumber)"
         >
           <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
           <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-          <div class="item width-100">
+          <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
-              <div class="subject">
+              <div class="subject d-flex align-center">
                 <ion-label>{{ task.Folio }}</ion-label>
+                <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
+                <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
               </div>
               <div class="exp-icon">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
@@ -60,7 +87,6 @@
             </div>
             <div class="exp-middle-detail">
               <div class="exp-workflow">
-                <span class="label-deadline label">Deadline</span>
                 <span class="label mr-10">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
@@ -75,16 +101,18 @@
     <div *ngIf="pedidosstore.listdeferimento.length >= 1">
       <ion-list *ngSwitchCase="'deferimento'">
         <div
-          class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
+          class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
           *ngFor = "let task of pedidosstore.listdeferimento"
           (click)="goToPedido(task.SerialNumber)"
         >
           <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
           <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-          <div class="item width-100">
+          <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
-              <div class="subject">
+              <div class="subject d-flex align-center">
                 <ion-label>{{ task.Folio }}</ion-label>
+                <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
+                <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate)">Nova</span>
               </div>
               <div class="exp-icon">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
@@ -99,7 +127,6 @@
             </div>
             <div class="exp-middle-detail">
               <div class="exp-workflow">
-                <span class="label-deadline label">Deadline</span>
                 <span class="label mr-10">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">

src/app/shared/gabinete-digital/pedidos/pedidos.page.ts

@@ -9,7 +9,7 @@ import { PedidosStore } from 'src/app/store/pedidos-store.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
-
+import { TaskService } from 'src/app/services/task.service'
 
 @Component({
   selector: 'app-pedidos',
@@ -39,13 +39,15 @@ export class PedidosPage implements OnInit {
   skeletonLoader = true
   pedidosstore = PedidosStore;
   customTaskPipe = new CustomTaskPipe()
-
+  filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
+  
   constructor(
     private router: Router,
     private processes:ProcessesService,
     private modalController: ModalController,
     private sortService: SortService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    public TaskService: TaskService,
     ) {
       this.profile = 'mdgpr';
   }

src/app/shared/gabinete-digital/pendentes/pendentes.module.ts

@@ -9,6 +9,23 @@ import { PendentesPageRoutingModule } from './pendentes-routing.module';
 import { PendentesPage } from './pendentes.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,17 @@ import { TaskListPageModule } from '../generic/task-list/task-list.module';
     IonicModule,
     PendentesPageRoutingModule,
     // entryComponents
-    TaskListPageModule
+    TaskListPageModule,
+
+    //
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
   ],
   exports: [PendentesPage],
   declarations: [PendentesPage]

src/app/shared/gabinete-digital/pendentes/pendentes.page.html

@@ -2,11 +2,36 @@
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
     <div class="thetitle"><ion-label >Pendentes</ion-label></div>
-    <!-- <div class="theicon">
-      <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
+    <div class="theicon">
+      <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
+        <mat-select [(value)]="filterName">
+
+          <mat-option value="Para hoje" >
+            Para hoje
+          </mat-option>
+
+          <mat-option value="Novos" >
+            Novos
+          </mat-option>
+
+          <mat-option value="Lidos" >
+            Lidos
+          </mat-option>
+
+          <mat-option value="Não Lidos" >
+            Não lidos
+          </mat-option>
+
+          <mat-option value="Todos" >
+            Todos
+          </mat-option>
+
+        </mat-select>
+      </mat-form-field>
+      <!-- <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
-      </button>
-    </div> -->
+      </button> -->
+    </div>
   </div>
 </ion-header>
 <ion-content>
@@ -23,6 +48,7 @@
     [taskList] = pendentesstore.list
     [skeletonLoader] = skeletonLoader
     (viewTaskDetail)="viewTaskDetails($event)"
+    [filterName]="filterName"
   > </app-task-list>
 
 </ion-content>

src/app/shared/gabinete-digital/pendentes/pendentes.page.ts

@@ -26,6 +26,8 @@ export class PendentesPage implements OnInit {
   @Input() profile:string;
   segment:string;
   @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
+  filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
+  
 
   constructor(
     private processes:ProcessesService,