From fd0941999df1a7a4dad3ab7c72f698bd5cf4f037 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 24 Apr 2023 11:47:00 +0100
Subject: [PATCH] fix

---
 src/app/models/dailyworktask.model.ts              |  1 +
 .../diplomas-gerar/diplomas-gerar.page.html        |  4 +++-
 .../gabinete-digital/diplomas/diplomas.page.html   |  4 +++-
 .../gabinete-digital/pedidos/pedidos.page.html     |  4 +++-
 src/app/pipes/custom-task.pipe.ts                  |  1 +
 .../diplomas-assinar/diplomas-assinar.page.html    |  2 +-
 .../diplomas-gerar/diplomas-gerar.page.html        |  2 +-
 .../diplomas-gerar/expedients/expedients.page.html |  6 ++++--
 .../diplomas-gerar/expedients/expedients.page.ts   |  5 ++++-
 .../gabinete-digital/diplomas/diplomas.page.html   |  8 ++++++--
 .../expedientes-pr/expedientes-pr.page.html        |  4 +++-
 .../expedients/expedients.page.html                |  2 +-
 .../gabinete-digital/expedients/expedients.page.ts |  1 +
 .../gabinete-digital/pedidos/pedidos.page.ts       | 14 +++++++++++---
 version/git-version.ts                             | 12 ++++++------
 15 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts
index 0c7032a1e..4caf03926 100644
--- a/src/app/models/dailyworktask.model.ts
+++ b/src/app/models/dailyworktask.model.ts
@@ -147,6 +147,7 @@ export class customTask {
     TaskStartDate: string
     TaskStatus: string
     TaskReceiveDate: string
+    Subject:  string
 
 }
 
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
index f10b192ad..51aaae62a 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
@@ -131,8 +131,10 @@
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
             <div class="item width-100">
               <div class="exp-top-detail">
-                <div class="subject">
+                <div class="subject d-flex">
                   <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.TaskReceiveDate)">Nova</span>
                 </div>
                 <div class="exp-icon">
                   <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  src="assets/images/icons-expediente-attachment.svg"></ion-icon>
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
index 52a51c3b2..c1bd12887 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
@@ -109,8 +109,10 @@
           >
           <div class="item width-100">
             <div class="exp-top-detail">
-              <div class="subject">
+              <div class="subject d-flex">
                 <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.TaskReceiveDate)">Nova</span>
               </div>
               <div class="exp-icon">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index 53040ecb1..252a46e54 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -122,8 +122,10 @@
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
             <div class="item width-100">
               <div class="exp-top-detail">
-                <div class="subject">
+                <div class="subject d-flex">
                   <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.TaskReceiveDate)">Nova</span>
                 </div>
                 <div class="exp-icon">
                   <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
diff --git a/src/app/pipes/custom-task.pipe.ts b/src/app/pipes/custom-task.pipe.ts
index ac4984f93..7fa505a87 100644
--- a/src/app/pipes/custom-task.pipe.ts
+++ b/src/app/pipes/custom-task.pipe.ts
@@ -14,6 +14,7 @@ export class CustomTaskPipe implements PipeTransform {
 
     return {
       "SerialNumber": fullTask.serialNumber,
+      "Subject": fullTask.workflowInstanceDataFields.Subject,
       "Folio": fullTask.workflowInstanceDataFields.Subject,
       "Senders": fullTask.workflowInstanceDataFields.Sender,
       "CreateDate": taskDate,
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index 27318d302..992caedd6 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -66,7 +66,7 @@
           <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
           <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
-              <div class="subject">
+              <div class="subject d-flex">
                 <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.TaskReceiveDate)">Nova</span>
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
index fbfc91347..7baed9b5b 100644
--- a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
@@ -64,7 +64,7 @@
         >
           <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
-              <div class="subject">
+              <div class="subject d-flex">
                 <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.TaskReceiveDate)">Nova</span>
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html
index fd37380d0..ad9285d17 100644
--- a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html
@@ -30,8 +30,10 @@
         >
           <div class="item width-100">
             <div class="exp-top-detail">
-              <div class="subject">
-                <ion-label>{{ task.Subject }}</ion-label>
+              <div class="subject d-flex">
+                <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.TaskReceiveDate)">Nova</span>
               </div>
               <div class="exp-icon">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts
index c7c1dfdc2..2ecb18465 100644
--- a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts
@@ -6,6 +6,8 @@ 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 { Storage } from '@ionic/storage';
+import { TaskService } from 'src/app/services/task.service'
+
 
 @Component({
   selector: 'app-expedients',
@@ -29,7 +31,8 @@ export class ExpedientsPage implements OnInit {
     private router: Router,
     public ThemeService: ThemeService,
     private sortService: SortService,
-    private storage: Storage
+    private storage: Storage,
+    public TaskService: TaskService
   ) {
     this.profile = 'mdgpr';
 
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
index bb6ffa725..a09093d46 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
@@ -64,8 +64,10 @@
         >
           <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
-              <div class="subject">
+              <div class="subject d-flex">
                 <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.TaskReceiveDate)">Nova</span>
               </div>
               <div class="exp-icon">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
@@ -101,8 +103,10 @@
         >
           <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
-              <div class="subject">
+              <div class="subject d-flex">
                 <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.TaskReceiveDate)">Nova</span>
               </div>
               <div class="exp-icon">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 1f9ffafad..0160347b2 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -52,8 +52,10 @@
       >
         <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
           <div class="exp-top-detail">
-            <div class="subject">
+            <div class="subject d-flex">
               <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.TaskReceiveDate)">Nova</span>
             </div>
             <div class="exp-icon">
               <ion-icon *ngIf="ThemeService.currentTheme == 'default'"  src="assets/images/icons-expediente-attachment.svg"></ion-icon>
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
index 8031fd5b9..36d411e20 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -61,7 +61,7 @@
         >
           <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
             <div class="exp-top-detail">
-              <div class="subject">
+              <div class="subjectc d-flex">
                 <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.TaskReceiveDate)">Nova</span>
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index f3ef3aa31..d478e1b7c 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -88,6 +88,7 @@ export class ExpedientsPage implements OnInit {
 
       this.expedientegbstore.reset(this.taskslist);
     }, (error) => {
+      this.skeletonLoader = false
       this.getEventsFromLocalDb();
     });
   }
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index bba94b01b..02a3bbcbd 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -82,10 +82,16 @@ export class PedidosPage implements OnInit {
     if(this.segment == 'parecer') {
       this.taskType = "Pedido de Parecer";
 
-      let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
-      let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
+      let parecer = [];
+      let parecerPr = [];
 
-      this.skeletonLoader = false
+      try {
+        parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
+        parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
+        this.skeletonLoader = false
+      } catch (error) {    
+        this.skeletonLoader = false
+      }
 
       let allParecer = parecer.concat(parecerPr).reverse();
 
@@ -118,6 +124,8 @@ export class PedidosPage implements OnInit {
 
         this.pedidosstore.resetdeferimento(this.sortService.sortDate(this.deferimentoList, 'CreateDate'));
 
+      },() => {
+        this.skeletonLoader = false
       });
     }
     this.skeletonLoader = false
diff --git a/version/git-version.ts b/version/git-version.ts
index 97bc99831..8fb9b9962 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "8639f08f9",
-  "SHA": "8639f08f9eedebab62ccbacd220495ee9c00b03f",
+  "shortSHA": "04785f32f",
+  "SHA": "04785f32f92e970c7be48e91384d2df3845df9a0",
   "branch": "feature/gabineteLabels",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Fri Apr 21 16:26:13 2023 +0100'",
-  "lastCommitMessage": "fix",
-  "lastCommitNumber": "4927",
+  "lastCommitTime": "'Mon Apr 24 11:30:21 2023 +0100'",
+  "lastCommitMessage": "fix count",
+  "lastCommitNumber": "4928",
   "change": "",
-  "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/events/events.page.scss\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/models/dailyworktask.model.ts\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/pedidos/pedidos.page.html\n\tmodified:   src/app/pipes/custom-task.pipe.ts\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-gerar/expedients/expedients.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas/diplomas.page.html\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/expedients/expedients.page.ts\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file