From 53c91682d333cbc63f30c4d1f1cfb841f918b17c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Apr 2023 13:17:39 +0100
Subject: [PATCH] improve code name

---
 .../gabinete-digital.page.html                | 60 +++++++++++++------
 version/git-version.ts                        | 12 ++--
 2 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index e44f63b37..542f64fe3 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -159,7 +159,9 @@
                     <!-- <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Despacho do Presidente da República</p> -->
                     <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">
                       Despachos {{ environment.despachoLabel }} <br>
-                      <span class="new-task-count">{{ despachoprstore.newList.length}} Despacho <span *ngIf="despachoprstore.newList.length >=2">s</span> {{ environment.despachoLabel }} novo <span *ngIf="despachoprstore.newList.length >=2">s</span></span></p>
+                      <span class="new-task-count" *ngIf="despachoprstore.newList.length >=2">{{ despachoprstore.newList.length}} Despachos  {{ environment.despachoLabel }} novos </span>
+                      <span class="new-task-count" *ngIf="despachoprstore.newList.length == 1">{{ despachoprstore.newList.length}} Despacho  {{ environment.despachoLabel }} novo </span>
+                    </p>
 
                     <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && !p.userPermission([p.permissionList.Gabinete.md_tasks])">
                       Despachos criados por mim<br>
@@ -179,9 +181,13 @@
                 </div>
                 <p class="text-center exp-card-title " *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])">
                   Diplomas assinados PR <br>
-                  <span class="new-task-count">{{ deplomasStore.diplomasAssinadoListNewCount.length}} Diploma <span *ngIf="deplomasStore.diplomasAssinadoListNewCount.length >=2">s</span> por Assinar PR novo<span *ngIf="deplomasStore.diplomasAssinadoListNewCount.length >=2">s</span></span></p>
+                  <span class="new-task-count" *ngIf="deplomasStore.diplomasAssinadoListNewCount.length >=2">{{ deplomasStore.diplomasAssinadoListNewCount.length}} Diplomas por Assinar PR novos</span>
+                  <span class="new-task-count" *ngIf="deplomasStore.diplomasAssinadoListNewCount.length ==1">{{ deplomasStore.diplomasAssinadoListNewCount.length}} Diploma por Assinar PR novo</span>
+                </p>
                 <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" >Diplomas <br>
-                  <span class="new-task-count">{{ deplomasStore.diplomasAssinadoListNewCount.length}} Diplomas novo</span></p>
+                  <span class="new-task-count" *ngIf="deplomasStore.diplomasAssinadoListNewCount.length >=2">{{ deplomasStore.diplomasAssinadoListNewCount.length}} Diplomas novo</span>
+                  <span class="new-task-count" *ngIf="deplomasStore.diplomasAssinadoListNewCount.length ==1">{{ deplomasStore.diplomasAssinadoListNewCount.length}} Diploma novo</span>
+                </p>
                 <p class="text-center exp-card-content"> {{ deplomasStore.countDiplomasAssinadoListCount }}
                   <span class="title1">Documentos</span></p>
               </div>
@@ -198,7 +204,9 @@
                   <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
                 </div>
                 <p class="text-center exp-card-title">Diplomas por Assinar {{ environment.PR}} <br>
-                  <span class="new-task-count">{{ deplomasStore.diplomasParaAssinarNewCount.length}} Diploma<span *ngIf="deplomasStore.diplomasParaAssinarNewCount.length >=2">s</span>  por Assinar {{ environment.PR}} novo<span *ngIf="deplomasStore.diplomasParaAssinarNewCount.length >=2">s</span></span></p>
+                  <span class="new-task-count" *ngIf="deplomasStore.diplomasParaAssinarNewCount.length >=2">{{ deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas  por Assinar {{ environment.PR}} novos</span>
+                  <span class="new-task-count" *ngIf="deplomasStore.diplomasParaAssinarNewCount.length ==1">{{ deplomasStore.diplomasParaAssinarNewCount.length}} Diploma por Assinar {{ environment.PR}} novo</span>
+                </p>
                 <p class="text-center exp-card-content"> {{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
               </div>
               
@@ -211,7 +219,9 @@
                 </div>
                 <p class="text-center exp-card-title " >
                   Diplomas por Validar<br>
-                  <span class="new-task-count">{{ deplomasStore.diplomasReviewListNewCount.length}} Diploma<span *ngIf="deplomasStore.diplomasReviewListNewCount.length >=2">s</span> por validar novo<span *ngIf="deplomasStore.diplomasReviewListNewCount.length >=2">s</span></span></p>
+                  <span class="new-task-count" *ngIf="deplomasStore.diplomasReviewListNewCount.length >=2">{{ deplomasStore.diplomasReviewListNewCount.length}} Diplomas por validar novos</span>
+                  <span class="new-task-count" *ngIf="deplomasStore.diplomasReviewListNewCount.length ==1">{{ deplomasStore.diplomasReviewListNewCount.length}} Diploma por validar novo</span>
+                </p>
                 <!-- <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas por Assinar PR</p> -->
                 <p class="text-center exp-card-content"> {{ deplomasStore.deplomasReviewCount }} <span class="title1">Documentos</span> </p>
               </div>
@@ -227,7 +237,9 @@
                   <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
                 </div>
                 <p class="text-center exp-card-title">Diplomas para Assinar<br>
-                  <span class="new-task-count">{{ deplomasStore.diplomasParaAssinarNewCount.length}} Diploma<span *ngIf="deplomasStore.diplomasReviewListNewCount.length >=2">s</span> para assinar novo<span *ngIf="deplomasStore.diplomasReviewListNewCount.length >=2">s</span></span></p>
+                  <span class="new-task-count" *ngIf="deplomasStore.diplomasParaAssinarNewCount.length >= 2">{{ deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas para assinar novos</span>
+                  <span class="new-task-count " *ngIf="deplomasStore.diplomasParaAssinarNewCount.length == 1">{{ deplomasStore.diplomasParaAssinarNewCount.length}} Diploma para assinar novo</span>
+                </p>
                 <p class="text-center exp-card-content"> {{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
               </div>
               
@@ -244,7 +256,9 @@
 
                 <p class="text-center exp-card-title" >
                   Diplomas por elaborar <br>
-                  <span class="new-task-count">{{ deplomasStore.diplomasGerarListNewCount.length}} Diploma<span *ngIf="deplomasStore.diplomasReviewListNewCount.length >=2">s</span> por elaborar novo<span *ngIf="deplomasStore.diplomasReviewListNewCount.length >=2">s</span></span></p>
+                  <span class="new-task-count" *ngIf="deplomasStore.diplomasReviewListNewCount.length >=2">{{ deplomasStore.diplomasGerarListNewCount.length}} Diplomas por elaborar novos</span>
+                  <span class="new-task-count" *ngIf="deplomasStore.diplomasReviewListNewCount.length ==1">{{ deplomasStore.diplomasGerarListNewCount.length}} Diploma por elaborar novo</span>
+                </p>
                 <p class="text-center exp-card-content"> {{  deplomasStore.DiplomaGerarList.length }} <span class="title1">Documentos</span></p>
 
               </div>
@@ -269,9 +283,8 @@
                 </div>
 
                 <p class="text-center exp-card-title ">Expediente <br>
-                  <span *ngIf="despachoStore.newList.length == 1" class="new-task-count">{{ expedientegbstore.newList.length}} Expediente novo</span>
-                  <span *ngIf="despachoStore.newList.length >= 2" class="new-task-count">{{ expedientegbstore.newList.length}} Expedientes novos</span>
-                  <span class="new-task-count">{{ expedientegbstore.newList.length}} Expediente novo</span>
+                  <span *ngIf="expedientegbstore.newList.length == 1" class="new-task-count">{{ expedientegbstore.newList.length}} Expediente novo</span>
+                  <span *ngIf="expedientegbstore.newList.length >= 2" class="new-task-count">{{ expedientegbstore.newList.length}} Expedientes novos</span>
                 </p>
 
                 <p class="text-center exp-card-content"> {{expedientegbstore.count}} <span class="title1">Documentos</span></p>
@@ -288,8 +301,9 @@
                   <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">{{ despachoStore.newList.length}} 
-                    Despacho<span *ngIf="deplomasStore.diplomasReviewListNewCount.length >=2">s</span> novo<span *ngIf="despachoStore.newList.length >=2">s</span></span></p>
+                  <span class="new-task-count" *ngIf="deplomasStore.diplomasReviewListNewCount.length >=2">{{ despachoStore.newList.length}} Despachos novos</span>
+                  <span class="new-task-count" *ngIf="deplomasStore.diplomasReviewListNewCount.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>
               
@@ -307,10 +321,14 @@
                 </div>
                 <p *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">
                   Pedidos de Parecer<br>
-                  <span class="new-task-count">{{ pedidosstore.listParecerCount.length}} Pedido<span *ngIf="pedidosstore.listParecerCount.length >=2">s</span> de Parecer</span></p>
+                  <span class="new-task-count" *ngIf="pedidosstore.listParecerCount.length >=2" >{{ pedidosstore.listParecerCount.length}} Pedidos de Parecer</span>
+                  <span class="new-task-count" *ngIf="pedidosstore.listParecerCount.length ==1" >{{ pedidosstore.listParecerCount.length}} Pedido de Parecer</span>
+                </p>
                 <p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">
                   Pedidos de Parecer solicitados por mim <br>
-                  <span class="new-task-count">{{ pedidosstore.listParecerCount.length}} Despacho<span *ngIf="pedidosstore.listParecerCount.length >=2">s</span> de Parecer</span></p>
+                  <span class="new-task-count" *ngIf="pedidosstore.listParecerCount.length >=2">{{ pedidosstore.listParecerCount.length}} Pedido de Parecer solicitados por mim</span>
+                  <span class="new-task-count" *ngIf="pedidosstore.listParecerCount.length ==1">{{ pedidosstore.listParecerCount.length}} Pedidos de Parecer solicitados por mim</span>
+                </p>
                 <p class="text-center exp-card-content"> {{pedidosstore.countparecer}} <span class="title1">Documentos</span></p>
               </div>
               
@@ -326,7 +344,9 @@
                 </div>
                 <p class="text-center exp-card-title ">
                   Pedidos de Deferimento<br>
-                  <span class="new-task-count">{{ pedidosstore.listDeferimentoCount.length}} Pedido<span *ngIf="pedidosstore.listDeferimentoCount.length >=2">s</span> de Deferimento</span></p>
+                  <span class="new-task-count" *ngIf="pedidosstore.listDeferimentoCount.length >=2">{{ pedidosstore.listDeferimentoCount.length}} Pedidos de Deferimento</span>
+                  <span class="new-task-count" *ngIf="pedidosstore.listDeferimentoCount.length ==1">{{ pedidosstore.listDeferimentoCount.length}} Pedidos de Deferimento</span>
+                </p>
                 <p class="text-center exp-card-content"> {{pedidosstore.countdeferimento}} <span class="title1">Documentos</span></p>
               </div>
             
@@ -341,10 +361,14 @@
                 </div>
                 <p *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">
                   Pendentes<br>
-                  <span class="new-task-count">{{ pendentesstore.newList.length}} Pendente<span *ngIf="pendentesstore.newList.length >=2">s</span> novo<span *ngIf="pendentesstore.newList.length >=2">s</span></span></p>
+                  <span class="new-task-count" *ngIf="pendentesstore.newList.length >=2">{{ pendentesstore.newList.length}} Pendentes novos</span>
+                  <span class="new-task-count" *ngIf="pendentesstore.newList.length >=2">{{ pendentesstore.newList.length}} Pendente novo</span>
+                </p>
                 <p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">Meus Pendentes<br>
-                  <span class="new-task-count">{{ pendentesstore.newList.length}} Meus Pendente<span *ngIf="pendentesstore.newList.length >=2">s</span> novo<span *ngIf="pendentesstore.newList.length >=2">s</span></span></p>
-                <p class="text-center exp-card-content"> <span class="number">{{pendentesstore.count}} </span> <span class="title1">Documentos</span></p>
+
+                  <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>
               </div>
             
 
diff --git a/version/git-version.ts b/version/git-version.ts
index 77bf66f23..da2ba38ba 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "0660b4454",
-  "SHA": "0660b44542d43dc8b7686276f45c5ce11c23a402",
+  "shortSHA": "f8614029a",
+  "SHA": "f8614029af16d0de93330a48cba69a45036f095e",
   "branch": "feature/gabineteLabels",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Wed Apr 12 14:39:26 2023 +0100'",
-  "lastCommitMessage": "add label to gabinete",
-  "lastCommitNumber": "4897",
+  "lastCommitTime": "'Thu Apr 13 12:51:38 2023 +0100'",
+  "lastCommitMessage": "add labels",
+  "lastCommitNumber": "4898",
   "change": "",
-  "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/app.module.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diplomas.module.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.module.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pendentes/pendentes.module.ts\n\tmodified:   src/app/pages/gabinete-digital/pendentes/pendentes.page.html\n\tmodified:   src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts\n\tmodified:   src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified:   src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified:   src/app/shared/gabinete-digital/despachos/despachos.module.ts\n\tmodified:   src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas/diplomas.module.ts\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.page.html\n\tmodified:   src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module.ts\n\tmodified:   src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified:   src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified:   src/app/shared/gabinete-digital/expedients/expedients.module.ts\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/generic/task-list/task-list.page.html\n\tmodified:   src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.module.ts\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.module.ts\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified:   src/app/store/deplomas.service.ts\n\tmodified:   src/app/store/despacho-store.service.ts\n\tmodified:   src/app/store/despachospr-store.service.ts\n\tmodified:   src/app/store/expedientegd-store.service.ts\n\tmodified:   src/app/store/pedidos-store.service.ts\n\tmodified:   src/app/store/pendestes-store.service.ts\n\tmodified:   src/global.scss",
+  "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file