fix issues

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html

@@ -77,7 +77,6 @@
         </ion-list>
       </div>
     </div>
-
     <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons" *ngIf="task.activityInstanceName == 'Revisar Diploma'">
         <button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>

src/app/pages/gabinete-digital/event-list/event-list.page.html

@@ -56,7 +56,7 @@
       </mat-form-field>
     </div>
   <ion-toolbar>
-    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
+    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)" class="row-reverse">
       <!-- <ion-segment-button value="MDGPR">
         Minha agenda
       </ion-segment-button> -->

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -69,6 +69,12 @@ export class EventListPage implements OnInit {
       } else {
         this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
       }
+
+      // select pr by default
+      // const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')
+      // if(pr) {
+      //   this.segment = pr.OwnerUserId
+      // }
     }
 
     const location = window.location

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -305,10 +305,10 @@ export class GabineteDigitalPage implements OnInit {
       if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
         this.router.navigate(['/home/gabinete-digital/despachos-pr', serialNumber, 'gabinete-digital']);
       }
-      else if (activityName == 'Revisar Diploma' || activityName == 'Assinar Diploma') {
+      else if (activityName == 'Revisar Diploma' ) {
         this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']);
       }
-      else if (activityName == 'Diploma Assinado') {
+      else if (activityName == 'Diploma Assinado' || activityName == 'Assinar Diploma') {
         this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
       } else {
 

src/app/shared/agenda/event-list/event-list.page.html

@@ -8,8 +8,8 @@
         </button>
       </div>
     </div>
-  <ion-toolbar>
+  <ion-toolbar >
-    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
+    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)" class="row-reverse">
       <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryReverse; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
         <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>

src/app/shared/agenda/event-list/event-list.page.ts

@@ -45,13 +45,22 @@ export class EventListPage implements OnInit {
     ) {
       this.loggeduser = SessionStore.user;
 
-      if(!this.segment) {
+
-        if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
+  }
-          this.segment = 'Meu calendario';
+
-        } else {
+  ngAfterViewInit(): void {
-          this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
+    if(!this.segment) {
-        }
+      if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
+        this.segment = 'Meu calendario';
+      } else {
+        this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
       }
+
+      // const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')
+      // if(pr) {
+      //   this.segment = pr.OwnerUserId
+      // }
+    }
   }
 
   ngOnInit() {

src/app/shared/gabinete-digital/all-processes/all-processes.page.ts

@@ -1,8 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
+import { NavigationEnd, Router } from '@angular/router';
 import { LoginUserRespose } from 'src/app/models/user.model';
 import { ThemeService } from 'src/app/services/theme.service'
-import { SessionStore } from 'src/app/store/session.service';
 import { TaskService } from 'src/app/services/task.service'
 /* import MiniSearch from 'minisearch' */
 

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html

@@ -86,7 +86,7 @@
 
     </div>
     <ion-toolbar>
-      <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
+      <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)" class="row-reverse">
         <!-- <ion-segment-button value="MDGPR">
           Minha agenda
         </ion-segment-button> -->

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts

@@ -68,6 +68,11 @@ export class EventsToApprovePage implements OnInit {
       } else {
         this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
       }
+
+      // const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')
+      // if(pr) {
+      //   this.segment = pr.OwnerUserId
+      // }
     }
     this.LoadToApproveEvents()
 

src/global.scss

@@ -1537,3 +1537,6 @@ ion-textarea.heigh-200  textarea {
     width: 20px;
   }
 }
+
+
+.row-reverse { display: flex; flex-direction: row-reverse; }

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "fced941d5",
+  "shortSHA": "f8f0d39be",
-  "SHA": "fced941d550100f40b22f6c461431509f396afeb",
+  "SHA": "f8f0d39be994d847b5406eee2cf3aba5fe9b2c19",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Jun 13 12:27:27 2023 +0100'",
+  "lastCommitTime": "'Tue Jun 13 14:34:22 2023 +0100'",
-  "lastCommitMessage": "fix",
+  "lastCommitMessage": "rollback",
-  "lastCommitNumber": "5011",
+  "lastCommitNumber": "5012",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html",
+  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.html\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified:   src/global.scss",
   "changeAuthor": "peter.maquiran"
 }