doneit-web/version/git-version.ts

export let versionData = {
  "shortSHA": "4a82191e9",
  "SHA": "4a82191e92e682077011e89f8a58e784bffdf46a",
  "branch": "develop_bitOut-fix",
  "lastCommitAuthor": "'Peter Maquiran'",
  "lastCommitTime": "'Wed Dec 28 14:53:04 2022 +0100'",
  "lastCommitMessage": "fix publication loaders",
  "lastCommitNumber": "4592",
  "change": "diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts\nindex d1f828d09..5ce452934 100644\n--- a/src/app/home/home.page.ts\n+++ b/src/app/home/home.page.ts\n@@ -207,12 +207,12 @@ export class HomePage implements OnInit {\n \n   updateList() {\n \n-    /*  this.notificationsService.registerCallback(\n-       'despachos',\n-       () => {\n-         this.despachoRule.getList({ updateStore: true })\n-       }\n-     ) */\n+    // this.notificationsService.registerCallback(\n+    //   'despachos',\n+    //   () => {\n+    //     // this.despachoRule.getList({ updateStore: true })\n+    //   }\n+    // ) \n \n     document.addEventListener('pause', function () {\n       // console.log('App going to background');\ndiff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts\nindex 5d120d2e9..5eb08091c 100644\n--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts\n+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts\n@@ -21,6 +21,13 @@ import { DeplomasStore } from 'src/app/store/deplomas.service';\n import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';\n \n import { DespachoService } from 'src/app/Rules/despacho.service';\n+import { ExpedienteService } from 'src/app/Rules/expediente.service';\n+import { PendentesService  } from 'src/app/Rules/pendentes.service';\n+import { AproveEventService } from 'src/app/Rules/aprove-event.service';\n+import { ParecerService } from 'src/app/Rules/parecer.service';\n+import { DeferimentosServiceService  } from 'src/app/Rules/deferimentos-service.service';\n+import { DeplomasServiceService } from 'src/app/Rules/deplomas-service.service'\n+import { DespachoPRService } from 'src/app/Rules/despacho-pr.service'\n import { ChangeProfileService } from 'src/app/services/change-profile.service';\n import { PermissionService } from 'src/app/services/permission.service';\n import { ThemeService } from 'src/app/services/theme.service'\n@@ -54,24 +61,6 @@ export class GabineteDigitalPage implements OnInit {\n   allProcessesList: any = new Array();\n   skeletonLoader: boolean;\n \n-  count_exp_dailywork = 0;\n-  count_exp_pr = 0\n-  count_desp_dailywork = 0;\n-  count_desp_pending = 0;\n-  count_par_dailywork = 0;\n-  count_par_pending = 0;\n-  count_def_dailywork = 0;\n-  count_def_pending = 0;\n-  count_exp_pp: string;\n-  count_exp_pd: string;\n-  count_dip_apr: string;\n-  count_dip_pv = 0;\n-  count_de_pr = 0;\n-  count_ev_apr = 0;\n-  count_ev_md = 0;\n-  count_total_pending = 0;\n-  count_desp_pr_active = 0;\n-  count_all_processes = 0;\n \n   selectedElement = \"\";\n \n@@ -147,7 +136,14 @@ export class GabineteDigitalPage implements OnInit {\n     private sortService: SortService,\n     private dataService: DataService,\n     private storage: Storage,\n-    public p: PermissionService\n+    public p: PermissionService,\n+    private ExpedienteService: ExpedienteService,\n+    private PendentesService: PendentesService,\n+    private DeferimentosServiceService: DeferimentosServiceService,\n+    private DeplomasServiceService: DeplomasServiceService,\n+    private AproveEventService: AproveEventService,\n+    private  ParecerService: ParecerService,\n+    private DespachoPRService: DespachoPRService\n   ) {\n \n \n@@ -547,6 +543,8 @@ export class GabineteDigitalPage implements OnInit {\n       if(!this.loadProcess['expedientes']) {\n         try {\n           this.loadProcess['expedientes'] = true\n+\n+          await this.ExpedienteService.getList()\n           let expedientes: any = await this.processesbackend.GetTaskListExpediente(false).toPromise();\n           expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == \"Active\")\n           expedientes = expedientes.filter((item) => {\n@@ -584,7 +582,6 @@ export class GabineteDigitalPage implements OnInit {\n         }\n       } \n   \n-  \n     })();\n \n     (async()=>{\n@@ -592,29 +589,11 @@ export class GabineteDigitalPage implements OnInit {\n       if(!this.loadProcess['parecerespareceresPr']) {\n         try {\n           this.loadProcess['parecerespareceresPr'] = true\n-  \n-          let pareceres, pareceresPr;\n-          pareceres = await this.processesbackend.GetTasksList(\"Pedido de Parecer\", false).toPromise();\n-          pareceresPr = await this.processesbackend.GetTasksList(\"Pedido de Parecer do Presidente\", false).toPromise();\n-          let allParecer = pareceres.concat(pareceresPr);\n-  \n-          this.count_par_dailywork = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == \"Active\")).length;\n-          this.pedidosstore.countparecer = this.count_par_dailywork;\n           \n-          this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == \"Active\").map((element) => {\n-            return {\n-              \"SerialNumber\": element.serialNumber,\n-              \"Folio\": element.workflowInstanceDataFields.Subject,\n-              \"Senders\": element.workflowInstanceDataFields.Sender,\n-              \"CreateDate\": new Date(element.taskStartDate),\n-              \"DocumentURL\": element.workflowInstanceDataFields.ViewerRequest,\n-              \"Remetente\": element.workflowInstanceDataFields.Remetente,\n-              \"DocumentsQty\": element.totalDocuments,\n-              \"DocId\": element.workflowInstanceDataFields.DocIdDiferimento,\n-              \"WorkflowName\": element.workflowDisplayName,\n-              \"activityInstanceName\": element.activityInstanceName,\n-            }\n-          }));    \n+          let allParecer = await this.ParecerService.GetTasksList();\n+          this.pedidosstore.countparecer = Object.keys(allParecer).length;\n+          \n+          this.pedidosstore.resetparecer(allParecer);    \n   \n           delete this.loadProcess['parecerespareceresPr']\n         } catch(error) {\n@@ -630,24 +609,9 @@ export class GabineteDigitalPage implements OnInit {\n         try {\n           this.loadProcess['deferimentos'] = true\n   \n-          let deferimentos = await this.processesbackend.GetTasksList(\"Pedido de Deferimento\", false).toPromise();\n-          this.count_def_dailywork = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == \"Active\")).length;\n-          this.pedidosstore.countdeferimento = this.count_def_dailywork;\n-      \n-          this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == \"Active\").map((element) => {\n-            return {\n-              \"SerialNumber\": element.serialNumber,\n-              \"Folio\": element.workflowInstanceDataFields.Subject,\n-              \"Senders\": element.workflowInstanceDataFields.Sender,\n-              \"CreateDate\": new Date(element.taskStartDate),\n-              \"DocumentURL\": element.workflowInstanceDataFields.ViewerRequest,\n-              \"Remetente\": element.workflowInstanceDataFields.Remetente,\n-              \"DocumentsQty\": element.totalDocuments,\n-              \"DocId\": element.workflowInstanceDataFields.DocIdDiferimento,\n-              \"WorkflowName\": element.workflowDisplayName,\n-              \"activityInstanceName\": element.activityInstanceName,\n-            }\n-          }));\n+          let deferimentos = await this.DeferimentosServiceService.getList()\n+          this.pedidosstore.countdeferimento = Object.keys(deferimentos).length;\n+          this.pedidosstore.resetdeferimento(deferimentos);\n   \n           delete this.loadProcess['deferimentos']\n         } catch(error) {\n@@ -676,19 +640,21 @@ export class GabineteDigitalPage implements OnInit {\n     })();\n \n \n-    (async()=>{\n-      let pendentes\n-      try {\n-        pendentes = await this.processesbackend.GetPendingTasks(false).toPromise();\n-        this.count_total_pending = Object.keys(pendentes).length;\n-        this.pendentesstore.count = this.count_total_pending;\n-    \n-        pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element))\n-    \n-        this.pendentesstore.reset(pendentes);\n-      } catch (error) {\n-      }\n+    (async() => {\n+      // let pendentes\n+      if(!this.loadProcess['pendentes']) {\n+        try {\n+          this.loadProcess['pendentes'] = true\n+  \n+          let pendentes = await this.PendentesService.getList()\n+      \n+          this.pendentesstore.reset(pendentes);\n   \n+          delete this.loadProcess['pendentes']\n+        } catch(error) {\n+          delete this.loadProcess['pendentes']\n+        }\n+      } \n     })();\n \n \n@@ -697,52 +663,23 @@ export class GabineteDigitalPage implements OnInit {\n         try {\n           let depachoAPI: any = await this.processesbackend.GetTasksList(\"Despacho do Presidente da República\", false).toPromise();\n           if(this.loggeduser.Profile != 'PR') {\n-        \n-            let depacho = depachoAPI.reverse().filter(data => data.activityInstanceName == \"Tarefa de Despacho\");\n-            depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == \"Active\");\n       \n-            depacho = depacho.map((e)=> this.customTaskPipe.transform(e))\n-       \n+            let depacho = await this.DespachoPRService.getList(depachoAPI)\n             this.despachoprstore.reset(depacho)\n+\n           } else if(this.loggeduser.Profile == 'PR') {\n-            \n-            let depacho = depachoAPI.filter(data => data.activityInstanceName == \"Concluir Despacho\").filter(data => data.workflowInstanceDataFields.Status == \"Active\")\n-            depacho = depacho.map((e)=> this.customTaskPipe.transform(e))\n+      \n+            let depacho = await this.DespachoPRService.getList(depachoAPI)\n             this.despachoprstore.reset(depacho)\n-  \n-            let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == \"Revisar Diploma\");\n-            this.count_dip_pv = Object.keys(diplomasValidar).length;\n-        \n-            diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != \"Tarefa de Despacho\");\n-        \n-        \n-            this.deplomasStore.resetDiplomasReview(diplomasValidar.map((element)=> {\n-        \n-              let date = new Date(element.taskStartDate);\n-              date.setMonth(date.getMonth() + 1);\n-              let taskDate = date.getFullYear()+\"-\"+ date.getMonth()+\"-\"+date.getDate()+\" \"+date.getHours()+\":\"+date.getMinutes()+ \":\"+date.getSeconds();\n-        \n-              return {\n-                \"SerialNumber\": element.serialNumber,\n-                \"Folio\": element.workflowInstanceDataFields.Subject,\n-                \"Senders\": element.workflowInstanceDataFields.Sender,\n-                \"CreateDate\": taskDate,\n-                \"DocumentURL\": element.workflowInstanceDataFields.ViewerRequest,\n-                \"Remetente\": element.workflowInstanceDataFields.Remetente,\n-                \"DocumentsQty\": element.totalDocuments,\n-                \"DocId\": element.workflowInstanceDataFields.DocIdDiferimento,\n-                \"WorkflowName\": element.workflowDisplayName,\n-                \"activityInstanceName\": element.activityInstanceName,\n-                \"Status\": element.workflowInstanceDataFields.Status,\n-              }\n-            }))\n-        \n-        \n-            let diplomasAssinar = depachoAPI.filter(data => data.activityInstanceName == \"Assinar Diploma\");\n+\n+            this.deplomasStore.resetDiplomasReview(\n+              await this.DeplomasServiceService.getListReview(depachoAPI)\n+            )\n         \n+            let diplomasAssinar = await this.DeplomasServiceService.getListAssinar(depachoAPI)\n             this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)\n         \n-            let diplomasAssinados = depachoAPI.filter(data => data.activityInstanceName == \"Diploma Assinado\");\n+            let diplomasAssinados = await this.DeplomasServiceService.getListAssinados(depachoAPI)\n             this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados)\n           }\n   \n@@ -755,21 +692,16 @@ export class GabineteDigitalPage implements OnInit {\n     })();\n \n \n-    (async()=>{\n+    (async() => {\n       if(!this.loadProcess['EventosMD']) {\n         try {\n           this.loadProcess['EventosMD'] = true\n-  \n-          let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise();\n-          let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();\n-          let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);\n-  \n-          eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')\n+\n+          let eventsMDGPRList = await this.AproveEventService.GetTasksListEventosMD()\n   \n           this.eventoaprovacaostore.countMd = eventsMDGPRList.length\n           this.eventoaprovacaostore.resetmd(eventsMDGPRList);\n           \n-  \n           delete this.loadProcess['EventosMD']\n         } catch(error) {\n           delete this.loadProcess['EventosMD']\n@@ -784,10 +716,8 @@ export class GabineteDigitalPage implements OnInit {\n         try {\n           this.loadProcess['EventosPR'] = true\n   \n-          let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise();\n-          let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise();\n-          let eventsPRList = prEventsOficial.concat(prEventsPessoal);\n-          eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')\n+\n+          let eventsPRList = await this.AproveEventService.GetTasksListEventosPR()\n       \n           this.eventoaprovacaostore.countPr = eventsPRList.length\n           this.eventoaprovacaostore.resetpr(eventsPRList);\n@@ -800,17 +730,6 @@ export class GabineteDigitalPage implements OnInit {\n   \n     })();\n \n-    (async()=>{\n-      this.processesbackend.GetToApprovedEvents('Agenda', 'true').subscribe(res => {\n-        this.count_ev_apr = res;\n-      }, (error) =>{\n-        console.error(error)\n-      });\n-    })();\n-\n-    this.count_exp_pp = \"-\";\n-    this.count_exp_pd = \"-\";\n-    this.count_dip_apr = \"-\";\n   }\n \n   doRefresh(event) {\ndiff --git a/src/app/pipes/custom-task.pipe.ts b/src/app/pipes/custom-task.pipe.ts\nindex 6ebb1169d..d4280c1a3 100644\n--- a/src/app/pipes/custom-task.pipe.ts\n+++ b/src/app/pipes/custom-task.pipe.ts\n@@ -28,4 +28,4 @@ export class CustomTaskPipe implements PipeTransform {\n     }\n   }\n \n-}\n+}\n\\ No newline at end of file\ndiff --git a/src/app/store/loader.service.ts b/src/app/store/loader.service.ts\nindex 53a3784a7..01ea9be85 100644\n--- a/src/app/store/loader.service.ts\n+++ b/src/app/store/loader.service.ts\n@@ -9,12 +9,30 @@ export class LoaderService {\n     name: string\n   }[] = []\n \n+  private loader = {}\n+\n   constructor() { }\n \n-  get loading(){\n+  get loading() {\n     return this.loadingList.length != 0\n   }\n \n+\n+  initialize(name) {\n+    this.loader[name] = []\n+    return {\n+      push() { \n+        this.loader[name].push()\n+      },\n+      pop() {\n+        this.loader[name].pop()\n+      },\n+      isLoader() {\n+        this.loader[name].length\n+      }\n+    }\n+  }\n+  \n   push({name = ''}) {\n     this.loadingList.push({\n       name: name",
  "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tnew file:   src/app/Rules/aprove-event.service.spec.ts\n\tnew file:   src/app/Rules/aprove-event.service.ts\n\tmodified:   src/app/Rules/deadline.service.ts\n\tnew file:   src/app/Rules/deferimentos-service.service.spec.ts\n\tnew file:   src/app/Rules/deferimentos-service.service.ts\n\tmodified:   src/app/Rules/deploma.service.ts\n\tnew file:   src/app/Rules/deplomas-service.service.spec.ts\n\tnew file:   src/app/Rules/deplomas-service.service.ts\n\tnew file:   src/app/Rules/despacho-pr.service.spec.ts\n\tnew file:   src/app/Rules/despacho-pr.service.ts\n\tmodified:   src/app/Rules/despacho.service.ts\n\tmodified:   src/app/Rules/expediente.service.ts\n\tnew file:   src/app/Rules/parecer.service.spec.ts\n\tnew file:   src/app/Rules/parecer.service.ts\n\tmodified:   src/app/Rules/pedido.service.ts\n\tmodified:   src/app/Rules/pendentes.service.ts\n\tmodified:   src/app/Rules/process-document.service.ts\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified:   src/app/home/home.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pipes/custom-task.pipe.ts\n\tmodified:   src/app/store/loader.service.ts",
  "changeAuthor": "peter.maquiran"
}