From 9253c33f08f05215aa3d2fc84b8b48f6df66f312 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 9 Mar 2023 12:56:11 +0100
Subject: [PATCH] fix gabinete

---
 .../gabinete-digital/gabinete-digital.page.html      |  8 ++++++--
 .../pages/gabinete-digital/gabinete-digital.page.ts  |  5 +++--
 .../all-processes/all-processes.page.ts              |  4 ++--
 version/git-version.ts                               | 12 ++++++------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 61fe35092..243915577 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -43,7 +43,7 @@
                       <div class="item-top-detail">
                         <div class="item-subject">
                           <!-- ... {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName }} {{ task.activityInstanceName }} -->
-                          <ion-label>{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}</ion-label>
+                          <ion-label>{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}..</ion-label>
                         </div>
                         <div *ngIf="task.DocumentsQty != 0" class="item-icon">
                           <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
@@ -64,6 +64,7 @@
                         </div>
                       </div>
                       <div *ngIf="task.Agenda" class="item-middle-detail-extra">
+                        {{ task | json }}
                         <div class="item-middle-detail-extra-text">
                           <ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
                             <!-- Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Presidente da República -->
@@ -76,7 +77,10 @@
                       </div>
                       <div class="item-bottom-detail d-flex align-items-center">
                         <div class="item-workflow">
-                          <span class="label">{{task.activityInstanceName}}</span>
+                          <span class="label">{{task.activityInstanceName}} .,.,.</span>
+                          <div *ngIf="task.activityInstanceName == 'Aprovar Evento' ">
+                            {{ task | json }}
+                          </div>
                         </div>
                         <div class="item-date">
                           <ion-label>{{ task.CreateDate || task.taskStartDate  | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 635b3ad59..4881dc570 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -481,12 +481,13 @@ export class GabineteDigitalPage implements OnInit {
     /* else if (workflowName == "Expediente") {
       this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
     } */
-    else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR' || activityName == 'Aprovar Evento') {
+    else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR' || activityName == "Aprovar Evento" || workflowName == "Agendar Evento") {
       this.router.navigate(['/home/gabinete-digital/event-list/approve-event', serialNumber, 'gabinete-digital']);
     }
     else {
-
+      throw(`${workflowName} && ${activityName} no route`)
     }
+
   }
 
   onSegmentVistaChange() {
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
index 8bf877621..24a2dd00c 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
@@ -172,11 +172,11 @@ export class AllProcessesPage implements OnInit {
     else if (workflowName == "Pedido de Parecer do Presidente") {
       this.router.navigate(['/home/gabinete-digital/pedidos', serialNumber, 'gabinete-digital']);
     }
-    else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR') {
+    else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR' || activityName == "Aprovar Evento" || workflowName == "Agendar Evento") {
       this.router.navigate(['/home/gabinete-digital/event-list/approve-event', serialNumber, 'gabinete-digital']);
     }
     else {
-      
+      throw(`${workflowName} && ${activityName} no route`)
     }
   }
 
diff --git a/version/git-version.ts b/version/git-version.ts
index f92b0193d..2684cb814 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "66be958e2",
-  "SHA": "66be958e2d7b21b9a80e567bcfc995ec9e53d7cc",
+  "shortSHA": "79509a305",
+  "SHA": "79509a305538f7ae6e4d0327e3a314fe37954f3e",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Thu Mar 9 12:21:09 2023 +0100'",
-  "lastCommitMessage": "fix eventos para approvação not opening",
-  "lastCommitNumber": "4849",
+  "lastCommitTime": "'Thu Mar 9 12:22:54 2023 +0100'",
+  "lastCommitMessage": "merge",
+  "lastCommitNumber": "4852",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/modals/add-note/add-note.page.html\n\tmodified:   src/app/modals/create-process/create-process.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.html\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file