From 55b1f488cb62ceb0829ed4ecb6ed29447ccd5f97 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 12 Jun 2023 10:05:59 +0100
Subject: [PATCH] change word

---
 .../eliminate-event/eliminate-event.page.html |  2 +-
 src/app/pages/agenda/agenda.page.html         | 79 -------------------
 .../agenda/view-event/view-event.page.ts      | 11 +--
 .../discart-expedient-modal.page.html         |  2 +-
 .../gabinete-digital/gabinete-digital.page.ts |  9 ++-
 .../edit-event-to-approve.page.ts             |  1 -
 .../agenda/edit-event/edit-event.page.ts      |  2 -
 .../shared/agenda/new-event/new-event.page.ts |  2 -
 .../all-processes/all-processes.page.ts       | 10 +++
 version/git-version.ts                        | 12 +--
 10 files changed, 28 insertions(+), 102 deletions(-)

diff --git a/src/app/modals/eliminate-event/eliminate-event.page.html b/src/app/modals/eliminate-event/eliminate-event.page.html
index 2287a45d5..81acec883 100644
--- a/src/app/modals/eliminate-event/eliminate-event.page.html
+++ b/src/app/modals/eliminate-event/eliminate-event.page.html
@@ -4,7 +4,7 @@
 <ion-content>
   <div class="header-content width-100">
     <div class="header-title d-flex width-100">
-      <h3>Deseja retirar este expediente da sua caixa de correspondência?</h3>
+      <h3>Deseja arquivar este expediente?</h3>
     </div>
   </div>
   <div class="header-body width-100">
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index add641971..bb7c0e12c 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -33,63 +33,11 @@
                     </button>
 
                   </div>
-
-                  <!-- Move forward one screen of the slides -->
                   <h2 class="capitaliseText d-flex align-center">
                     {{ viewTitle }}
 
-                    <!-- <div (click)="dropdownScrollWeal = true; onDropDownScrollWeal()" class="cursor-pointer">
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " style="font-size: 19pt;" src="assets/images/icons-arrow-arrow-down.svg" ></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " style="font-size: 19pt;" src="assets/images/theme/gov/icons-arrow-arrow-down.svg" ></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "  slot="icon-only"  src="assets/images/theme/{{ThemeService.currentTheme}}/icons-arrow-arrow-down.svg"></ion-icon>
-                    </div> -->
-
                   </h2>
 
-                  <!-- <div class="dropdown-scroll-weel cursor-pointer" *ngIf="dropdownScrollWeal" >
-                    <div class="flex-grow-1 height-100 overflow-y-auto">
-                      <ul>
-                        <li (click)="changeMonth(0)" [class.active]="monthNum==0" ><span>Jan</span></li>
-                        <li (click)="changeMonth(1)" [class.active]="monthNum==1"><span>Fev</span></li>
-                        <li (click)="changeMonth(2)" [class.active]="monthNum==2"><span>Mar</span></li>
-                        <li (click)="changeMonth(3)" [class.active]="monthNum==3"><span>Abr</span></li>
-                        <li (click)="changeMonth(4)" [class.active]="monthNum==4"><span>Maio</span></li>
-                        <li (click)="changeMonth(5)" [class.active]="monthNum==5"><span>Jun</span></li>
-                        <li (click)="changeMonth(6)" [class.active]="monthNum==6"><span>Jul</span></li>
-                        <li (click)="changeMonth(7)" [class.active]="monthNum==7"><span>Ago</span></li>
-                        <li (click)="changeMonth(8)" [class.active]="monthNum==8"><span>Set</span></li>
-                        <li (click)="changeMonth(9)" [class.active]="monthNum==9"><span>Out</span></li>
-                        <li (click)="changeMonth(10)" [class.active]="monthNum==10"><span>Nov</span></li>
-                        <li (click)="changeMonth(11)" [class.active]="monthNum==11"><span>Dez</span></li>
-                      </ul>
-                    </div>
-                    <div class="flex-grow-1 height-100 overflow-y-auto">
-                      <ul>
-                        <li (click)="changeYear(2010)" [class.active]="yearNum==2010"><span>2010</span></li>
-                        <li (click)="changeYear(2011)" [class.active]="yearNum==2011"><span>2011</span></li>
-                        <li (click)="changeYear(2012)" [class.active]="yearNum==2012"><span>2012</span></li>
-                        <li (click)="changeYear(2013)" [class.active]="yearNum==2013"><span>2013</span></li>
-                        <li (click)="changeYear(2014)" [class.active]="yearNum==2014"><span>2014</span></li>
-                        <li (click)="changeYear(2015)" [class.active]="yearNum==2015"><span>2015</span></li>
-                        <li (click)="changeYear(2016)" [class.active]="yearNum==2016"><span>2016</span></li>
-                        <li (click)="changeYear(2017)" [class.active]="yearNum==2017"><span>2017</span></li>
-                        <li (click)="changeYear(2018)" [class.active]="yearNum==2018"><span>2018</span></li>
-                        <li (click)="changeYear(2019)" [class.active]="yearNum==2019"><span>2019</span></li>
-                        <li (click)="changeYear(2020)" [class.active]="yearNum==2020"><span>2020</span></li>
-                        <li (click)="changeYear(2021)" [class.active]="yearNum==2021"><span>2021</span></li>
-                        <li (click)="changeYear(2022)" [class.active]="yearNum==2022"><span>2022</span></li>
-                        <li (click)="changeYear(2023)" [class.active]="yearNum==2023"><span>2023</span></li>
-                        <li (click)="changeYear(2024)" [class.active]="yearNum==2024"><span>2024</span></li>
-                        <li (click)="changeYear(2025)" [class.active]="yearNum==2025"><span>2025</span></li>
-                        <li (click)="changeYear(2026)" [class.active]="yearNum==2026"><span>2026</span></li>
-                      </ul>
-                    </div>
-                  </div>
-
-                  <div *ngIf="dropdownScrollWeal" class="dropdown-scroll-weel-background" (click)="dropdownScrollWeal = false">
-
-                  </div> -->
-
                   <div (click)="next()" class="arrow cursor-pointer resize">
                     <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " slot="icon-only" src="assets/images/icons-calendar-arrow-right.svg"></ion-icon>
                     <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " slot="icon-only" src="assets/images/theme/gov/icons-calendar-arrow-right.svg"></ion-icon>
@@ -108,12 +56,6 @@
                     <mat-form-field class="select-calendar" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
                       <mat-select [(value)]="CalendarName" (selectionChange)="reloadCalendar()">
           
-                        <!-- <mat-option *ngFor="let calendars of _eventService.calendarNamesAry; let i = index" value="{{calendars}}">
-                          <div *ngIf="calendars != 'Meu calendario' && calendars == 'Presidente da República'"> {{ environment.agendaPR}} </div>
-                          <div *ngIf="calendars != 'Meu calendario' && calendars == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
-                          <div *ngIf="calendars != 'Meu calendario' && calendars != 'Ministro e Director do Gabinete do PR' && calendars != 'Presidente da República'"> Agenda do {{calendars}} </div>
-                          
-                          <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div> -->
                           <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars.Fullname || calendars}}">
                            
                             <div *ngIf="environment.presidential">
@@ -162,27 +104,6 @@
                 </ion-row>
                 <ion-row class="ion-align-items-center calendar-options">
 
-                  <!-- <div class="calendar-letters cal-reverse" *ngIf="SessionStore.user.Profile != 'PR' && SessionStore.user.Profile != 'MDGPR' && eventService.hasSharedCalendar && eventService.hasOwnCalendar" class="calendar-letters" [class.cal-reverse]="profile == 'mdgpr' " (click)="changeProfile()">
-                    <div class="text" *ngIf="profile == 'mdgpr'">
-                      MC
-                    </div>
-
-                    <div class="text" *ngIf="profile == 'pr'">
-                      CP  
-                    </div>
-
-                  </div>
-                  
-                  
-                  <button *ngIf="profile == 'mdgpr'  && ( SessionStore.user.Profile == 'PR' || SessionStore.user.Profile == 'MDGPR') && 21ujeventService.hasSharedCalendar  " (click)="changeProfile()" class="d-md-none btn-no-color resize">
-                    <ion-icon class="right-icons" src="assets/images/icons-profile-calendar-md.svg"></ion-icon>
-                  </button>
-
-                  <button title="Mudar de Agenda" *ngIf="profile == 'pr'&&  ( SessionStore.user.Profile == 'PR' || SessionStore.user.Profile == 'MDGPR') && eventService.hasSharedCalendar" (click)="changeProfile()" class="btn-no-color resize">
-                    <ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg"></ion-icon>
-                  </button>
-                   -->
-
                   <button title="Visualizar a lista de Eventos para aprovação" class="cursor-pointer resize pr-10" (click)="viewEventsToApprove()" *ngIf="p.userPermission([p.permissionList.Gabinete.aprove_event])">
                     <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " class="right-icons" src="assets/images/icons-received-event.svg"></ion-icon>
                     <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && !mobileComponent.showEventList" class="right-icons" src="assets/images/theme/gov/icons-received-event.svg"></ion-icon>
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index f404285d0..221db70d4 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -4,10 +4,9 @@ import { EventBody } from 'src/app/models/eventbody.model';
 import { EventsService } from 'src/app/services/events.service';
 import { Event } from '../../../models/event.model';
 import { EditEventPage } from '../edit-event/edit-event.page';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { ToastService } from 'src/app/services/toast.service';
 import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page';
-import { SqliteService } from 'src/app/services/sqlite.service';
 import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage';
 import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page';
 import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
@@ -16,9 +15,7 @@ import { BackgroundService } from 'src/app/services/background.service';
 import { StorageService } from 'src/app/services/storage.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { RouteService } from 'src/app/services/route.service';
-import { Storage } from '@ionic/storage';
 import { SessionStore } from 'src/app/store/session.service';
-import { CalendarService } from 'src/app/store/calendar.service';
 import { HttpErrorHandle} from 'src/app/services/http-error-handle.service'
 import { AttachmentsService } from 'src/app/services/attachments.service';
 
@@ -63,16 +60,12 @@ export class ViewEventPage implements OnInit {
     public alertController: AlertController,
     public popoverController: PopoverController,
     private activatedRoute: ActivatedRoute,
-    private router: Router,
     private toastService: ToastService,
     public platform: Platform,
-    private sqliteservice: SqliteService,
     private backgroundservice: BackgroundService,
     private storage: StorageService,
     public ThemeService: ThemeService,
     private RouteService: RouteService,
-    private ionicStorage: Storage,
-    private CalendarService: CalendarService,
     private httpErrorHandle: HttpErrorHandle,
     private attachmentsService: AttachmentsService,
   ) {
@@ -249,7 +242,7 @@ export class ViewEventPage implements OnInit {
         {
           text: 'Não',
           handler: () => {
-            console.log('Let me think');
+            // sconsole.log('Let me think');
           }
         },
         {
diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
index 2d8bf0b1a..d54a09f91 100644
--- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
+++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
@@ -4,7 +4,7 @@
 <ion-content>
   <div class="header-content width-100">
     <div class="header-title d-flex width-100">
-      <h3>Deseja retirar este expediente da sua caixa de correspondência?</h3>
+      <h3>Deseja arquivar este expediente?</h3>
     </div>
   </div>
   <div class="header-body 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 a555bcbe6..f75c3d8bd 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -268,7 +268,8 @@ export class GabineteDigitalPage implements OnInit {
 
 
   checkFilter() {
-    
+    const  currentFilter  = this.filterName
+
     if(this.router.url.includes('ForToDay')) {
       this.filterName = 'Para hoje'
     } else if (this.router.url.includes('OverdueTasks')) {
@@ -279,6 +280,10 @@ export class GabineteDigitalPage implements OnInit {
       this.filterName = 'Não lidos'
     }
 
+    if(currentFilter != this.filterName) {
+      this.dynamicSearch()
+    }
+    console.log('this.filterName', this.filterName)
   } 
 
 
@@ -359,6 +364,8 @@ export class GabineteDigitalPage implements OnInit {
       this.hideInMobile = false;
       this.segmentVista = "listview";
     }
+
+    this.checkFilter();
   }
 
   checkRoutes() {
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
index 064ae293d..396c11d80 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
@@ -14,7 +14,6 @@ import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { EventToApproveEdit } from 'src/app/models/event.model';
 import { ThemeService } from 'src/app/services/theme.service'
-import { Router } from '@angular/router';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 
 
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index 2972b70ea..1c1f2ded0 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -9,7 +9,6 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { Attachment } from 'src/app/models/attachment.model';
-import { ToastService } from 'src/app/services/toast.service';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ParticipantsPipe } from 'src/app/pipes/participants.pipe';
 import { ThemeService } from 'src/app/services/theme.service'
@@ -92,7 +91,6 @@ export class EditEventPage implements OnInit {
     private eventsService: EventsService,
     public alertController: AlertController,
     private attachmentsService: AttachmentsService,
-    private toastService: ToastService,
     public ThemeService: ThemeService,
     private httpErrorHandle: HttpErrorHandle
   ) {}
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 449286ae6..0ec19f8cc 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -133,8 +133,6 @@ export class NewEventPage implements OnInit {
     private dateAdapter: DateAdapter<any>,
     public ThemeService: ThemeService,
     private chatMethodService: ChatMethodsService,
-    private ServerConnectionService: ServerConnectionService,
-    // private translate: TranslateService
     private hhtpErrorHandle: HttpErrorHandle
   ) {
     this.dateAdapter.setLocale('pt');
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 736f23b49..88945dc96 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
@@ -32,6 +32,8 @@ export class AllProcessesPage implements OnInit {
   listSubscription : {
     delete(): void;
   }
+  routerSubscription;
+
 
 
   constructor(
@@ -58,10 +60,18 @@ export class AllProcessesPage implements OnInit {
 
     this.dynamicSearch();
 
+    this.routerSubscription = this.router.events.subscribe((event) => {
+      if (event instanceof NavigationEnd && event.url.includes('/home/gabinete-digital')) {
+        // this.refreshing();
+        this.checkFilter();
+      }
+    });
+
   }
 
   ngOnDestroy() {
     this.listSubscription.delete()
+    this.routerSubscription?.unsubscribe();
   }
 
 
diff --git a/version/git-version.ts b/version/git-version.ts
index 700c26374..0afa9d10b 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "fd7a9fee9",
-  "SHA": "fd7a9fee94d128cce8877c93abb8ca56596fc74f",
+  "shortSHA": "e2cd5d0d8",
+  "SHA": "e2cd5d0d8b59ad873723496679cddc4f3944c28a",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Sun Jun 11 22:51:21 2023 +0100'",
-  "lastCommitMessage": "fix",
-  "lastCommitNumber": "5004",
+  "lastCommitTime": "'Sun Jun 11 23:00:12 2023 +0100'",
+  "lastCommitMessage": "remove console.log",
+  "lastCommitNumber": "5005",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/guards/inactivity.guard.ts\n\tmodified:   src/app/pages/chat/chat.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified:   src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/pages/search/search.page.ts\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts",
+  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/eliminate-event/eliminate-event.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified:   version/git-version.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file