bug fix on task filter

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

@@ -41,7 +41,7 @@
             <div class="item width-100 expedientes">
               <div class="exp-top-detail">
                 <div class="subject d-flex align-center">
-                  <ion-label>{{ task.Folio }}</ion-label>
+                  <ion-label [class.gb-seen]="TaskService.seen(task)">{{ 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>

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

@@ -40,7 +40,7 @@
             <div class="item width-100 expediente">
               <div class="exp-top-detail">
                 <div class="subject d-flex align-center">
-                  <ion-label>{{ task.Folio }}</ion-label>
+                  <ion-label [class.gb-seen]="TaskService.seen(task)">{{ 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>

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

@@ -23,7 +23,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 
@@ -68,7 +68,7 @@
             <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 || task.workflowInstanceDataFields.Subject }}</ion-label>
+                  <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.workflowInstanceDataFields.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>

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

@@ -43,7 +43,7 @@
             <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>
+                  <ion-label [class.gb-seen]="TaskService.seen(task)">{{ 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>

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

@@ -18,7 +18,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 
@@ -65,7 +65,7 @@
               <div class="item width-100 expediente">
                 <div class="exp-top-detail">
                   <div class="subject d-flex align-center">
-                    <ion-label>{{ task.Folio }}</ion-label>
+                    <ion-label [class.gb-seen]="TaskService.seen(task)">{{ 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>

src/app/pages/gabinete-digital/expediente/expediente.page.html

@@ -26,7 +26,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 
@@ -62,7 +62,7 @@
         <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.Subject }}</ion-label>
+              <ion-label [class.gb-seen]="TaskService.seen(task)">{{ 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>

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

@@ -24,7 +24,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 
@@ -61,7 +61,7 @@
           <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.Subject }}</ion-label>
+                <ion-label [class.gb-seen]="TaskService.seen(task)">{{ 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>

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -301,8 +301,8 @@
                   <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'Dispatches'"  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-despachos-presidente-hover.svg"></ion-icon>
                 </div>
                 <p class="text-center exp-card-title ">Despachos<br>
-                  <span class="new-task-count" *ngIf="deplomasStore.diplomasReviewListNewCount.length >=2">{{ despachoStore.newList.length}} Despachos novos</span>
+                  <span class="new-task-count" *ngIf="despachoStore.newList.length >=2">{{ despachoStore.newList.length}} Despachos novos</span>
-                  <span class="new-task-count" *ngIf="deplomasStore.diplomasReviewListNewCount.length ==1">{{ despachoStore.newList.length}} Despacho novo</span>
+                  <span class="new-task-count" *ngIf="despachoStore.newList.length ==1">{{ despachoStore.newList.length}} Despacho novo</span>
                   </p>
                 <p class="text-center exp-card-content"> {{despachoStore.count}} <span class="title1">Documentos</span> </p>
               </div>
@@ -369,6 +369,8 @@
                   <span class="new-task-count" *ngIf="pendentesstore.newList.length >=2">{{ pendentesstore.newList.length}} Meus Pendente</span>
                   <span class="new-task-count" *ngIf="pendentesstore.newList.length ==1">{{ pendentesstore.newList.length}} Meu Pendent</span>
                 </p>
+
+                <p class="text-center exp-card-content"> <span class="number">{{pendentesstore.count}} </span> <span class="title1">Documentos</span></p>
               </div>
             
 

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

@@ -22,7 +22,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 
@@ -77,7 +77,7 @@
             <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>
+                  <ion-label [class.gb-seen]="TaskService.seen(task)">{{ 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>

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

@@ -23,7 +23,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 

src/app/pipes/evento-approve.pipe.spec.ts

@@ -0,0 +1,8 @@
+import { EventoApprovePipe } from './evento-approve.pipe';
+
+describe('EventoApprovePipe', () => {
+  it('create an instance', () => {
+    const pipe = new EventoApprovePipe();
+    expect(pipe).toBeTruthy();
+  });
+});

src/app/pipes/evento-approve.pipe.ts

@@ -0,0 +1,37 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'eventoApprove'
+})
+export class EventoApprovePipe implements PipeTransform {
+
+  transform(fullTask): unknown {
+    let date = new Date(fullTask.taskStartDate);
+    let month = date.getMonth() + 1;
+          let taskDate = date.getFullYear() + "-" + month +"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+
+    return {
+      "SerialNumber": fullTask.serialNumber,
+      "Folio": fullTask.workflowInstanceDataFields.Subject,
+      "Event": {
+        StartDate: '',
+        EndDate: '',
+        Agenda: '',
+        Location: ''
+      },
+      "CreateDate": taskDate,
+      "TaskStartDate": fullTask.taskStartDate,
+      "DocumentURL": fullTask.workflowInstanceDataFields.ViewerRequest,
+      "Remetente": fullTask.workflowInstanceDataFields.Remetente,
+      "DocumentsQty": fullTask.totalDocuments,
+      "DocId": fullTask.workflowInstanceDataFields.DispatchDocId,
+      "FolderID": fullTask.workflowInstanceDataFields.FolderID,
+      "WorkflowName": fullTask.workflowDisplayName,
+      "activityInstanceName": fullTask.activityInstanceName,
+      "Status": fullTask.workflowInstanceDataFields.Status,
+      "Deadline": fullTask.deadline,
+      "TaskStatus": fullTask.taskStatus
+    }
+  }
+
+}

src/app/pipes/pipes.module.ts

@@ -7,10 +7,11 @@ import { PublicationPipe } from './publication.pipe';
 import { ExpedienteTaskPipe } from './expediente-task.pipe';
 import { ParticipantsPipe } from './participants.pipe';
 import { SafehtmlPipe } from './safehtml.pipe';
+import { EventoApprovePipe } from './evento-approve.pipe';
 
 
 @NgModule({
-  declarations: [FilterPipe, SearchDocumentPipe, CustomTaskPipe, EventPipe, PublicationPipe, ExpedienteTaskPipe, ParticipantsPipe, SafehtmlPipe],
+  declarations: [FilterPipe, SearchDocumentPipe, CustomTaskPipe, EventPipe, PublicationPipe, ExpedienteTaskPipe, ParticipantsPipe, SafehtmlPipe, EventoApprovePipe],
   exports: [FilterPipe, SafehtmlPipe],
   imports: []
 })

src/app/services/task.service.ts

@@ -33,17 +33,24 @@ export class TaskService {
   }
 
   filter(item, attribute) {
+    console.log('ITEM-ATRI',item)
+    console.log('ITEM-ATRI',attribute)
+
 
     if(attribute == 'Para hoje') {
-      return this.deadlineIsToday(item.TaskStartDate)
+      return this.deadlineIsToday(item.TaskStartDate || item.taskStartDate)
     } else if (attribute == 'Novos') {
-      return this.lessThen24Hours(item.TaskStartDate)
+      return this.lessThen24Hours(item.TaskStartDate || item.taskStartDate)
     } else if (attribute == 'Lidos') {
-      return item.TaskStatus == 'open'
+      return item.TaskStatus == 'Open' || item.taskStatus == 'Open'
     } else if (attribute == 'Não lidos') {
-      return item.TaskStatus != 'open'
+      return !(item.TaskStatus == 'Open' || item.taskStatus == 'Open')
     }
-
     return true
   }
+
+
+  seen(item) {
+    return item.TaskStatus == 'Open' || item.taskStatus == 'Open'
+  }
 }

src/app/shared/gabinete-digital/all-processes/all-processes.module.ts

@@ -8,12 +8,37 @@ import { AllProcessesPageRoutingModule } from './all-processes-routing.module';
 
 import { AllProcessesPage } from './all-processes.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,
-    AllProcessesPageRoutingModule
+    AllProcessesPageRoutingModule,
+    //
+    MatInputModule,
+    MatNativeDateModule,
+    NgxMatDatetimePickerModule,
+    NgxMatTimepickerModule,
+    NgxMatNativeDateModule,
+    NgxMatMomentModule,
+    MatSelectModule,
+    MatButtonModule,
   ],
   exports: [AllProcessesPage],
   declarations: [AllProcessesPage]

src/app/shared/gabinete-digital/all-processes/all-processes.page.html

@@ -2,11 +2,39 @@
   <!-- <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar> -->
   <div class="title">
     <div class="thetitle"><ion-label >Todas as tarefas</ion-label></div>
-    <!-- <div class="theicon">
+
-      <button title="Atualizar" class="btn-no-color" (click)="refreshing()">
+    <div class="theicon">
+      <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>
+      <!-- <button title="Atualizar" class="btn-no-color" (click)="refreshing()">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
-      </button>
+      </button> -->
-    </div> -->
+    </div>
   </div>
 </ion-header>
 <ion-content>
@@ -28,54 +56,59 @@
         <div class="listview">
           <ion-list *ngIf="AllProcess">
             <div
-              class="item-wrapper item-hover ion-no-padding cursor-pointer"
+              class="item-hover ion-no-padding cursor-pointer"
               *ngFor = "let task of AllProcess"
               (click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName|| task.workflowDisplayName , task.activityInstanceName)">
-              <div class="item width-100">
+              <div class="item-wrapper" *ngIf="TaskService.filter(task, filterName)">
-                <div class="item-top-detail">
+                <div class="item width-100 " >
-                  <div class="item-subject">
+                  <div class="item-top-detail">
+                    <div class="item-subject d-flex">
   
-                    <!-- {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName || task.workflowDisplayName }} {{ task.activityInstanceName }} -->
+                      <!-- {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName || task.workflowDisplayName }} {{ task.activityInstanceName }} -->
                       
-                    <ion-label>{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}</ion-label>
+                      <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}</ion-label>
+                      <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline || task.deadline)">Para hoje</span>
+                      <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskStartDate || task.taskStartDate)">Nova</span>
+                    </div>
+                    <div *ngIf="task.DocumentsQty != 0" class="item-icon">
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                      <label>{{task.DocumentsQty || task.totalDocuments}}</label>
+                    </div>
                   </div>
-                  <div *ngIf="task.DocumentsQty != 0" class="item-icon">
+                  <div class="item-middle-detail">
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    <div class="item-remetente">
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
+                      <ion-label *ngIf="task.Senders">{{task.Senders }}</ion-label>
-                    <label>{{task.DocumentsQty || task.totalDocuments}}</label>
+                      <ion-label *ngIf="task.workflowInstanceDataFields">{{ task.workflowInstanceDataFields.Sender }}</ion-label>
+                    </div>
                   </div>
-                </div>
+                  <div *ngIf="task.Agenda" class="item-middle-detail">
-                <div class="item-middle-detail">
+                    <div class="item-remetente">
-                  <div class="item-remetente">
+                      <ion-label>{{task.customDate}}</ion-label>
-                    <ion-label *ngIf="task.Senders">{{task.Senders }}</ion-label>
+                    </div>
-                    <ion-label *ngIf="task.workflowInstanceDataFields">{{ task.workflowInstanceDataFields.Sender }}</ion-label>
                   </div>
-                </div>
+                  <div *ngIf="task.Agenda" class="item-middle-detail-extra">
-                <div *ngIf="task.Agenda" class="item-middle-detail">
+                    <div class="item-middle-detail-extra-text">
-                  <div class="item-remetente">
+                      <ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
-                    <ion-label>{{task.customDate}}</ion-label>
+                        <!-- Agenda {{task.Agenda}} do Presidente da República -->
+                        Agenda {{task.Agenda}} do Titular
+                      </ion-label>
+                      <ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial MDGPR' || task.WorkflowName == 'Agenda Pessoal MDGPR'">
+                        A sua agenda {{task.Agenda}}
+                      </ion-label>
+                    </div>
                   </div>
-                </div>
+                  <div class="item-bottom-detail d-flex align-items-center">
-                <div *ngIf="task.Agenda" class="item-middle-detail-extra">
+                    <div class="item-workflow">
-                  <div class="item-middle-detail-extra-text">
+                      <span class="label">{{task.activityInstanceName}}</span>
-                    <ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
+                    </div>
-                      <!-- Agenda {{task.Agenda}} do Presidente da República -->
+                    <div class="item-date">
-                      Agenda {{task.Agenda}} do Titular
+                      <ion-label>{{ task.CreateDate || task.taskStartDate || task.TaskStartDate  | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
-                    </ion-label>
+                    </div>
-                    <ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial MDGPR' || task.WorkflowName == 'Agenda Pessoal MDGPR'">
-                      A sua agenda {{task.Agenda}}
-                    </ion-label>
-                  </div>
-                </div>
-                <div class="item-bottom-detail d-flex align-items-center">
-                  <div class="item-workflow">
-                    <span class="label">{{task.activityInstanceName}}</span>
-                  </div>
-                  <div class="item-date">
-                    <ion-label>{{ task.CreateDate || task.taskStartDate || task.TaskStartDate  | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                   </div>
                 </div>
               </div>
+
             </div>
           </ion-list>
         </div>

src/app/shared/gabinete-digital/all-processes/all-processes.page.scss

@@ -164,3 +164,7 @@ ion-list{
     }
   }
 }
+
+.new-task {
+  height: 23px;
+}

src/app/shared/gabinete-digital/all-processes/all-processes.page.ts

@@ -11,7 +11,7 @@ import { DespachosprStore } from 'src/app/store/despachospr-store.service';
 import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';
 import { PedidosStore } from 'src/app/store/pedidos-store.service';
 import { SessionStore } from 'src/app/store/session.service';
-
+import { TaskService } from 'src/app/services/task.service'
 
 @Component({
   selector: 'app-all-processes',
@@ -35,10 +35,12 @@ export class AllProcessesPage implements OnInit {
   deplomasStore = DeplomasStore
   
   AllProcess = []
+  filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos'
   
   constructor(
     private router: Router,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    public TaskService: TaskService
   ) {
     this.loggeduser = SessionStore.user;
 

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

@@ -20,7 +20,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 

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

@@ -21,7 +21,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 

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

@@ -18,7 +18,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 
@@ -63,7 +63,8 @@
           <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>
+                {{ task.taskStatus || task.TaskStatus }}
+                <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.workflowInstanceDataFields.Subject }}</ion-label>
               </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/diplomas-gerar/diplomas-gerar.page.html

@@ -18,7 +18,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 
@@ -59,7 +59,7 @@
           <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>
+                <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
               </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/diplomas/diplomas.page.html

@@ -18,7 +18,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 
@@ -58,7 +58,8 @@
           <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>
+                {{ task.taskStatus || task.TaskStatus }}
+                <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
               </div>
               <div class="exp-icon">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
@@ -95,7 +96,8 @@
           <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>
+                {{ task.taskStatus || task.TaskStatus }}
+                <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
               </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/diplomas/diplomas.page.ts

@@ -114,6 +114,7 @@ export class DiplomasPage implements OnInit {
       "Status": element.workflowInstanceDataFields.Status,
       "Deadline": element.deadline,
       "TaskStartDate": element.taskStartDate,
+      "TaskStatus": element.taskStatus
     }
   }
 

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)">
+      <div>
-        <ion-icon class="title-icon font-awesome" name="reload-circle"></ion-icon>
+        <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
-      </button> -->
+          <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="expediente" *ngIf="TaskService.filter(event, filterName)">
-            <div class="event-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100 expediente">
+              <!-- (click)="openApproveModal(event)" -->
-              <div class="approve-event-time">
+              <div class="event-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100 d-flex">
-                <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
+                <div class="approve-event-time">
-                <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
+                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
-              </div>
+                  <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
-              <div class="approve-event-detail">
+                </div>
-                <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>
+                <div class="approve-event-detail">
-                <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
+                  <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>
-                <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
+                  <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{
+    .approve-event-detail .h3{
-      width: 250px;
       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,6 +35,8 @@ 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,
@@ -44,6 +46,7 @@ export class EventsToApprovePage implements OnInit {
     private sortService: SortService,
     private storage: Storage,
     public eventService: EventsService,
+    public TaskService: TaskService
     )
     {}
 

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

@@ -18,7 +18,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 
@@ -47,7 +47,7 @@
         <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>
+              <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Subject }}</ion-label>
             </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.html

@@ -18,7 +18,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 
@@ -56,7 +56,7 @@
           <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>
+                <ion-label [class.gb-seen]="TaskService.seen(task)">{{ 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>

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

@@ -13,7 +13,7 @@
           <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>
+                <ion-label [class.gb-seen]="TaskService.seen(task)">{{ 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>

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

@@ -18,7 +18,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 

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

@@ -18,7 +18,7 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 

src/environments/environment.prod.ts

@@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr'
 import { doneITProd } from './suport/doneIt'
 
 
-export const environment: Environment = oaprProd;
+export const environment: Environment = doneITProd;

src/environments/environment.ts

@@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr'
 import { doneITDev } from './suport/doneIt'
 
 
-export const environment: Environment = oaprDev
+export const environment: Environment = doneITDev

src/global.scss

@@ -1491,3 +1491,8 @@ ion-textarea.heigh-200  textarea {
 .lowercase {
   text-transform: lowercase;
 }
+
+
+.gb-seen {
+  font-weight: normal !important;
+}

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "53c91682d",
+  "shortSHA": "98bbbc4da",
-  "SHA": "53c91682d333cbc63f30c4d1f1cfb841f918b17c",
+  "SHA": "98bbbc4da21010930ef496259e2c1111af26b9ed",
   "branch": "feature/gabineteLabels",
-  "lastCommitAuthor": "'Peter Maquiran'",
+  "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Thu Apr 13 13:17:39 2023 +0100'",
+  "lastCommitTime": "'Fri Apr 14 10:36:32 2023 +0100'",
-  "lastCommitMessage": "improve code name",
+  "lastCommitMessage": "envirement changed",
-  "lastCommitNumber": "4899",
+  "lastCommitNumber": "4900",
   "change": "",
-  "changeStatus": "On branch feature/gabineteLabels\nYour branch is behind 'origin/feature/gabineteLabels' by 3 commits, and can be fast-forwarded.\n  (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/environments/environment.prod.ts\n\tmodified:   src/environments/environment.ts",
+  "changeStatus": "On branch feature/gabineteLabels\nYour branch and 'origin/feature/gabineteLabels' have diverged,\nand have 1 and 3 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/pages/gabinete-digital/pendentes/pendentes.page.html\n\tnew file:   src/app/pipes/evento-approve.pipe.spec.ts\n\tnew file:   src/app/pipes/evento-approve.pipe.ts\n\tmodified:   src/app/pipes/pipes.module.ts\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.module.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.scss\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified:   src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified:   src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified:   src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified:   src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified:   src/app/shared/gabinete-digital/generic/task-list/task-list.page.html\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified:   src/environments/environment.prod.ts\n\tmodified:   src/environments/environment.ts\n\tmodified:   src/global.scss",
   "changeAuthor": "eudes.inacio"
 }