improve

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts

@@ -7,13 +7,37 @@ import { IonicModule } from '@ionic/angular';
 import { EventsToApprovePageRoutingModule } from './events-to-approve-routing.module';
 
 import { EventsToApprovePage } from './events-to-approve.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,
-    EventsToApprovePageRoutingModule
+    EventsToApprovePageRoutingModule,
+    //
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
   ],
   declarations: [EventsToApprovePage],
   exports: [EventsToApprovePage]

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

@@ -3,9 +3,34 @@
   <div class="title width-100">
     <div class="title-container d-flex justify-space-between">
       <span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
-      <!-- <button title="Atualizar" title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
-        <ion-icon class="title-icon font-awesome" name="reload-circle"></ion-icon>
-      </button> -->
+      <div>
+        <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-toolbar>
       <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
@@ -40,16 +65,22 @@
             *ngFor="let event of eventoaprovacaostore.get(segment)"
             (click)="goToEventDetail(event)"
           >
-            <!-- (click)="openApproveModal(event)" -->
-            <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>
-              </div>
-              <div class="approve-event-detail">
-                <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
-                <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
-                <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
+            <div class="expediente" *ngIf="TaskService.filter(event, filterName)">
+              <!-- (click)="openApproveModal(event)" -->
+              <div class="event-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100 d-flex">
+                <div class="approve-event-time">
+                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
+                  <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
+                </div>
+                <div class="approve-event-detail">
+                  <div class="p" *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</div>
+                  <div class="p" *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</div>
+                  <div class="h3">{{event.workflowInstanceDataFields.Subject}}</div>
+                </div>
+                <div>
+                  <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(event.deadline)">Para hoje</span>
+                  <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(event.taskStartDate)">Nova</span>
+                </div>
               </div>
             </div>
           </div>

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

@@ -70,7 +70,7 @@
       float: left;
       margin-left: 10px;
     }
-    .approve-event-detail p{
+    .approve-event-detail .p{
       //width: 250px;
       font-family: Roboto;
       font-size: 13px;
@@ -83,8 +83,7 @@
       margin: 0;
       padding-bottom: 10px;
     }
-    .approve-event-detail h3{
-      width: 250px;
+    .approve-event-detail .h3{
       font-family: Roboto;
       font-size: 15px;
       font-weight: bold;

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

@@ -12,7 +12,7 @@ import { Storage } from '@ionic/storage';
 import { SessionStore } from 'src/app/store/session.service';
 import { EventsService } from 'src/app/services/events.service';
 import { environment } from 'src/environments/environment';
-
+import { TaskService } from 'src/app/services/task.service'
 
 @Component({
   selector: 'app-events-to-approve',
@@ -35,7 +35,9 @@ export class EventsToApprovePage implements OnInit {
   color: 'pr' | 'mdgpr'
   eventoaprovacaostore = EventoAprovacaoStore;
   environment = environment
-
+  filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
+  
+  
   constructor(
     private processes:ProcessesService,
     private modalController: ModalController,
@@ -44,6 +46,7 @@ export class EventsToApprovePage implements OnInit {
     private sortService: SortService,
     private storage: Storage,
     public eventService: EventsService,
+    public TaskService: TaskService
     )
     {}