From 85eafdea13c8cdf0e437d351fd0abf5ba7801952 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 17 Jan 2023 16:11:56 +0100
Subject: [PATCH] fix gabinete

---
 .../pages/agenda/new-event/new-event.page.html |  2 +-
 .../pages/agenda/new-event/new-event.page.ts   | 16 +++++++---------
 .../gabinete-digital.page.html                 |  4 ++--
 .../gabinete-digital/gabinete-digital.page.ts  |  2 +-
 .../agenda/new-event/new-event.page.html       |  2 +-
 .../shared/agenda/new-event/new-event.page.ts  |  2 +-
 .../all-processes/all-processes.page.ts        | 18 ++++++++----------
 version/git-version.ts                         | 14 +++++++-------
 8 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index 38d2679d0..f6323e183 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -30,7 +30,7 @@
               
               <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars}}">
                 <div *ngIf="calendars != 'Meu calendario' "> Agenda de {{calendars}} </div>
-                    <div *ngIf="calendars == 'Meu calendario'"> Agenda de {{loggeduser.FullName}} </div>
+                <div *ngIf="calendars == 'Meu calendario'"> Agenda de {{loggeduser.FullName}} </div>
                   
               </mat-option>
 
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts
index a1bf277c6..5eaaa4bbc 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -103,15 +103,6 @@ export class NewEventPage implements OnInit {
     this.selectedDate = this.navParams.get('eventSelectedDate');
     this.taskParticipants = this.navParams.get('attendees');
 
-
-    if(!this.CalendarName) {
-      if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
-        this.CalendarName = 'Meu calendario';
-      } else if(this.eventService.calendarNamesAry.length == 1 ) {
-        this.CalendarName = this.eventService.calendarNamesAry[0]
-      }
-    }
-
   }
 
   ngOnInit() {
@@ -119,6 +110,13 @@ export class NewEventPage implements OnInit {
     this.CalendarName = this.loggeduser.Profile;
     this.selectedRecurringType = "-1";
     
+    if(!this.CalendarName) {
+      if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
+        this.CalendarName = 'Meu calendario';
+      } else {
+        this.CalendarName = this.eventService.calendarNamesAry[0]
+      }
+    }
     
 
     this.getRecurrenceTypes();
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 355a8c3f9..b4efdde6e 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -234,7 +234,7 @@
                 </div>
               </div>
   
-              <!-- <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDiplomasPage('validar'); selectedElement='DiplomasPorValidar'" [class.active]="selectedElement == 'DiplomasPorValidar'" class="box-hover exp-card d-flex flex-column justify-center">
+              <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDiplomasPage('validar'); selectedElement='DiplomasPorValidar'" [class.active]="selectedElement == 'DiplomasPorValidar'" class="box-hover exp-card d-flex flex-column justify-center">
                 <div class="d-flex justify-center">
                   <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
                   <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasPorValidar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
@@ -280,7 +280,7 @@
                 </div>
                 <p class="text-center exp-card-title">Diplomas para Assinar</p>
                 <p class="text-center exp-card-content">{{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
-              </div> -->
+              </div>
             </div>
 
             <div *ngIf="!loadCount" class="width-100">
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 71af3bee3..1a9cd14d9 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -570,7 +570,7 @@ export class GabineteDigitalPage implements OnInit {
   updateAllProcess() {
     this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
     .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list)
-    // .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList)
+    .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList)
   }
 
   get getAllProcessCount() {
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index 34b8207b2..0be3e0bc3 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -41,7 +41,7 @@
 
               <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars}}">
                 <div *ngIf="calendars != 'Meu calendario' "> Agenda de {{calendars}} </div>
-                    <div *ngIf="calendars == 'Meu calendario'"> Agenda de {{loggeduser.FullName}} </div>
+                <div *ngIf="calendars == 'Meu calendario'"> Agenda de {{loggeduser.FullName}} </div>
               </mat-option>
 
             </mat-select>
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index 5b5a67ed9..fbc5844a7 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -140,7 +140,7 @@ export class NewEventPage implements OnInit {
     if(!this.CalendarName) {
       if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
         this.CalendarName = 'Meu calendario';
-      } else if(this.eventService.calendarNamesAry.length == 1 ) {
+      } else {
         this.CalendarName = this.eventService.calendarNamesAry[0]
       }
     }
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 12c4d4d7c..4f57e977a 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
@@ -34,7 +34,8 @@ export class AllProcessesPage implements OnInit {
   totalDocumentStore = TotalDocumentStore
   deplomasStore = DeplomasStore
   
-  
+  AllProcess = []
+
   constructor(
     private router: Router,
     public ThemeService: ThemeService
@@ -45,11 +46,12 @@ export class AllProcessesPage implements OnInit {
   ngOnInit() {
 
     // this.loadAllProcesses();
-
+      this.updateAllProcess()
       this.router.events.forEach((event) => {
         if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) {
           if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
             this.refreshing();
+            this.updateAllProcess()
           } else {
             // this.loadAllProcesses();
           }
@@ -71,14 +73,10 @@ export class AllProcessesPage implements OnInit {
     }, 1000);
   }
 
-
-  get AllProcess() {
-    setTimeout(() => {
-      this.skeletonLoader = false;
-    }, 5000);
-    return this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
-    .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr)
-    .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
+  updateAllProcess() {
+    this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
+    .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list)
+    .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList)
   }
 
   get getAllProcessCount() {
diff --git a/version/git-version.ts b/version/git-version.ts
index 384e57962..062d7099b 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "21ec78023",
-  "SHA": "21ec78023f6ee2b53272b04c6802a10d5bdf834c",
+  "shortSHA": "252157df1",
+  "SHA": "252157df19a1afcedf7ed740291a1a63d1098dad",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Jan 17 15:43:54 2023 +0100'",
-  "lastCommitMessage": "invalid date",
-  "lastCommitNumber": "4643",
-  "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/agenda.page.html",
+  "lastCommitTime": "'Tue Jan 17 15:53:17 2023 +0100'",
+  "lastCommitMessage": "improve agenda",
+  "lastCommitNumber": "4644",
+  "change": "diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html\nindex 38d2679d0..f6323e183 100644\n--- a/src/app/pages/agenda/new-event/new-event.page.html\n+++ b/src/app/pages/agenda/new-event/new-event.page.html\n@@ -30,7 +30,7 @@\n               \n               <mat-option *ngFor=\"let calendars of eventService.calendarNamesAry\" value=\"{{calendars}}\">\n                 <div *ngIf=\"calendars != 'Meu calendario' \"> Agenda de {{calendars}} </div>\n-                    <div *ngIf=\"calendars == 'Meu calendario'\"> Agenda de {{loggeduser.FullName}} </div>\n+                <div *ngIf=\"calendars == 'Meu calendario'\"> Agenda de {{loggeduser.FullName}} </div>\n                   \n               </mat-option>\n \ndiff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts\nindex a1bf277c6..5eaaa4bbc 100644\n--- a/src/app/pages/agenda/new-event/new-event.page.ts\n+++ b/src/app/pages/agenda/new-event/new-event.page.ts\n@@ -103,15 +103,6 @@ export class NewEventPage implements OnInit {\n     this.selectedDate = this.navParams.get('eventSelectedDate');\n     this.taskParticipants = this.navParams.get('attendees');\n \n-\n-    if(!this.CalendarName) {\n-      if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n-        this.CalendarName = 'Meu calendario';\n-      } else if(this.eventService.calendarNamesAry.length == 1 ) {\n-        this.CalendarName = this.eventService.calendarNamesAry[0]\n-      }\n-    }\n-\n   }\n \n   ngOnInit() {\n@@ -119,6 +110,13 @@ export class NewEventPage implements OnInit {\n     this.CalendarName = this.loggeduser.Profile;\n     this.selectedRecurringType = \"-1\";\n     \n+    if(!this.CalendarName) {\n+      if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n+        this.CalendarName = 'Meu calendario';\n+      } else {\n+        this.CalendarName = this.eventService.calendarNamesAry[0]\n+      }\n+    }\n     \n \n     this.getRecurrenceTypes();\ndiff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html\nindex 34b8207b2..0be3e0bc3 100644\n--- a/src/app/shared/agenda/new-event/new-event.page.html\n+++ b/src/app/shared/agenda/new-event/new-event.page.html\n@@ -41,7 +41,7 @@\n \n               <mat-option *ngFor=\"let calendars of eventService.calendarNamesAry\" value=\"{{calendars}}\">\n                 <div *ngIf=\"calendars != 'Meu calendario' \"> Agenda de {{calendars}} </div>\n-                    <div *ngIf=\"calendars == 'Meu calendario'\"> Agenda de {{loggeduser.FullName}} </div>\n+                <div *ngIf=\"calendars == 'Meu calendario'\"> Agenda de {{loggeduser.FullName}} </div>\n               </mat-option>\n \n             </mat-select>\ndiff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts\nindex 5b5a67ed9..fbc5844a7 100644\n--- a/src/app/shared/agenda/new-event/new-event.page.ts\n+++ b/src/app/shared/agenda/new-event/new-event.page.ts\n@@ -140,7 +140,7 @@ export class NewEventPage implements OnInit {\n     if(!this.CalendarName) {\n       if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n         this.CalendarName = 'Meu calendario';\n-      } else if(this.eventService.calendarNamesAry.length == 1 ) {\n+      } else {\n         this.CalendarName = this.eventService.calendarNamesAry[0]\n       }\n     }",
+  "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\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/pages/agenda/new-event/new-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file