merge and add new features

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

@@ -18,14 +18,21 @@
             Lidos
           </mat-option>
 
-          <mat-option value="Não Lidos" >
+          <mat-option value="Não lidos" >
             Não lidos
           </mat-option>
 
+
+          <mat-option value="OverdueTasks">
+            Em atraso
+          </mat-option>
+
+
           <mat-option value="Todos" >
             Todos
           </mat-option>
 
+          
         </mat-select>
       </mat-form-field>
       <!-- <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
@@ -58,6 +65,7 @@
           <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
               <div class="subject">
+                {{ task.taskStatus || task.TaskStatus }}
                 <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
               </div>
               <div class="exp-icon">
@@ -95,7 +103,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
     }
   }