Pull made

.gitignore

@@ -83,3 +83,6 @@ migrat/
 
 cypress/videos
 *.rar
+
+src/app/domain
+src/app/controller

src/app/home/home.page.ts

@@ -122,10 +122,8 @@ export class HomePage implements OnInit {
         SessionStore.setUrlBeforeInactivity(pathname)
 
         if (this.platform.is('mobileweb')) {
-          // this.router.navigate(['/inactivity']);
           window.location.pathname = '/inactivity'
         } else {
-          // this.router.navigate(['/']);
           window.location.pathname = '/'
         }
       }
@@ -135,7 +133,6 @@ export class HomePage implements OnInit {
   }
 
   goto(url) {
-    // this.router.navigateByUrl('/home/events', { replaceUrl: true });
     this.router.navigate([url], { replaceUrl: true })
   }
 

src/app/modals/create-process/create-process.page.ts

@@ -186,7 +186,6 @@ export class CreateProcessPage implements OnInit {
   }
 
   close() {
-    //this.router.navigate(['/home/gabinete-digital/expediente']);
     this.modalController.dismiss(null);
   }
 

src/app/models/beast-orm.ts

@@ -47,7 +47,7 @@ models.register({
   models: [MessageModel, DeleteMessageModel, attachments]
 })
 
-
+// acçoes
 export class ActionModel  extends models.Model{
 	ProcessId = models.IntegerField({unique: true})
 	Description = models.CharField()
@@ -76,3 +76,25 @@ models.register({
 	version: 14,
 	models: [PublicationModel, ActionModel]
 })
+
+// gabinete
+
+export class DispatchModal  extends models.Model{
+	DateIndex = models.CharField()
+    DocumentId = models.IntegerField({unique: true})
+    ProcessId = models.CharField()
+    Title = models.CharField()
+    Message = models.CharField()
+    DatePublication = models.CharField()
+    OriginalFileName = models.CharField()
+    FileBase64 = models.CharField()
+    FileExtension = models.CharField()
+    OrganicEntityId = models.IntegerField()
+}
+
+models.register({
+	databaseName: 'cabinet'+environment.version.lastCommitNumber + environment.id,
+	type: 'indexedDB',
+	version: 14,
+	models: [DispatchModal]
+})

src/app/pages/agenda/agenda.page.html

@@ -270,7 +270,7 @@
             </ion-row>
 
             <div style="padding-right: 50px" class=" text-black align-center cursor-pointer" (click)="changeSegment('Combinado')" [class.active]="segment == 'Combinado' ">
-              Todos
+              Todas
             </div>
             <div style="padding-right: 50px" class=" text-black align-center cursor-pointer"  (click)="changeSegment('Pessoal')" [class.active]="segment == 'Pessoal' ">
               Pessoais

src/app/pages/agenda/view-event/view-event.page.html

@@ -5,8 +5,6 @@
     </ion-refresher-content>
   </ion-refresher>
 
-  {{ loadedEvent.HasAttachments | json}}
-
   <div class="main-content d-flex height-100" [className]="isModal ? '_main-content d-flex height-100 ma-0 px-20 pt-30 pb-20 background-white' : 'main-content d-flex height-100'">
     <div class="content d-flex flex-column width-100">
       <div class="main-header  d-flex">

src/app/pages/events/events.page.html

@@ -64,7 +64,7 @@
               <div class="schedule-header">
                 <div class="title">
                   <ion-icon class="icon" slot="end" src="assets/images/icons-default-agenda.svg" ></ion-icon>
-                  <div class="text">A sua Agenda</div>
+                  <div class="text">A sua agenda do dia</div>
                 </div>
                 <button title="Ir para a sua Agenda" class="btn-no-color" [routerLink]="['/home/agenda']">
                   <ion-icon
@@ -96,7 +96,7 @@
                   <ion-item class="item-hover cursor-pointer" lines="none" *ngFor="let event of listToPresent"
                     (click)="goToEvent(event)"
                   >
-                  <div class="d-flex  content-{{sessoStore.user.Profile}}-{{event.CalendarName}}">
+                  <div class="d-flex event-box-content content-{{sessoStore.user.Profile}}-{{event.CalendarName}}">
         
                     <div class="schedule-time">
                       <div *ngIf="!event.IsAllDayEvent" class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
@@ -109,7 +109,7 @@
                     <div class="schedule-details">
                       <div class="description">{{event.Subject}}</div>
                       <div class="location">
-                        <p>{{event.Location}}</p>
+                        {{event.Location}}
                       </div>
                     </div>
                   </div>
@@ -155,16 +155,18 @@
               </div>
               <div class="content overflow-y-auto flex-grow-1 height-100">
                 <ion-list>
-                  <ion-item class="item-hover cursor-pointer" lines="none" *ngFor = "let task of listToPresentexpediente"
+                  <ion-item class="item-hover cursor-pointer" lines="none" *ngFor = "let task of AllProcess"
-                  (click)="goToExpediente(task.SerialNumber)">
+                  (click)="TaskService.goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)">
                   <div class="item-exp d-flex">
                     <div class="schedule-date">
                       <div class="time-end">{{task.TaskStartDate | date: 'dd-MM-yy'}}</div>
                       <div class="time-start">{{task.TaskStartDate | date: 'HH:mm'}}</div>
                     </div>
                     <div class="schedule-details pointer">
-                      <div class="description">{{ task.Subject }}</div>
+                      <div class="description">{{task.Folio || task.Subject || task.workflowInstanceDataFields.Subject }}</div>
-                      <div class="location">{{ task.Senders }}</div>
+                      <div class="location" *ngIf="task.Senders">{{ task.Senders }}</div>
+                      <div class="location" *ngIf="task.workflowInstanceDataFields">{{task.workflowInstanceDataFields.Sender }}</div>
+                      <!-- <div class="location" *ngIf="!task.Senders && !task.workflowInstanceDataFields">{{task.workflowInstanceDataFields.Sender }}</div> -->
                     </div>
                   </div>
                   </ion-item>
@@ -275,7 +277,7 @@
         </div>
         <div class="content overflow-y-auto flex-grow-1 height-100">
           <ion-list>
-            <ion-item class="item-hover cursor-pointer" lines="none" *ngFor = "let task of listToPresentexpediente"
+            <ion-item class="item-hover cursor-pointer" lines="none" *ngFor = "let task of AllProcess"
             (click)="goToExpediente(task.SerialNumber)">
             <div class="item-exp d-flex">
               <div class="schedule-date">

src/app/pages/events/events.page.scss

@@ -201,6 +201,7 @@ ion-toolbar{
       color: var(--subtitle-text-color);
       font-size: 16px;
       margin: 0 auto;
+      min-height: 19px;
     }
     .div-botton-middle{
       width: 75%;
@@ -437,7 +438,6 @@ ion-toolbar{
         }
         .schedule-date{
           margin-right: 10px;
-          width: 22%;
           color: #797979 !important;
           font-size: 13px;
         }
@@ -446,11 +446,13 @@ ion-toolbar{
           flex-wrap: wrap;
           align-items: center;
           width: 78%;
+          min-height: 39px;
+          align-items: baseline;
           .location{
             font-family: Roboto;
             font-size: 15px;
-            font-weight: bold;
             color: black;
+            min-height: 19px;
             width: 100%;
 
           }
@@ -458,6 +460,7 @@ ion-toolbar{
             width: 100%;
             font-family: Roboto;
             font-size: 13px;
+            font-weight: bold;
             //color: #0d89d1;
             color: var(--title-text-color)
           }
@@ -642,3 +645,13 @@ ion-title{
     margin-right: 0px !important;
   }
 }
+
+
+
+.item-exp {
+  justify-content: flex-start !important;
+}
+
+.event-box-content {
+  justify-content: flex-start !important;
+}

src/app/pages/events/events.page.ts

@@ -68,6 +68,13 @@ export class EventsPage implements OnInit {
   showCorrespondenciasLoader = false
   loadingAllTask = false
 
+
+  filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'|  'OverdueTasks' | 'Todos' = 'Não lidos'
+  showSearch = true;
+  searchSubject: string = '';
+  AllProcess = []
+  ordinance: string =  'old'
+
   constructor(
     private eventService: EventsService,
     private router: Router,
@@ -102,6 +109,13 @@ export class EventsPage implements OnInit {
       this.listToPresentexpediente = []
     })
 
+    this.TaskService.registerCallback({
+      id: import.meta.url,
+      funx:() => {
+        this.dynamicSearch()
+      }
+    })
+
   }
 
   ngOnInit() {
@@ -128,6 +142,34 @@ export class EventsPage implements OnInit {
 
   }
 
+
+  async dynamicSearch() {
+
+    const ordinance = this.ordinance
+    if(this.showSearch && this.searchSubject) {
+      
+      const AllProcess = this.TaskService.AllProcess.filter((task) => {
+        let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
+        subject = subject.toLowerCase();
+        return subject.includes(this.searchSubject.toLowerCase())
+      }).filter( task => this.TaskService.filter(task, this.filterName))
+
+      
+      if(ordinance == this.ordinance) {
+        this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess) 
+      }
+    } else {
+      const AllProcess = this.TaskService.AllProcess
+      
+      if(ordinance == this.ordinance) {
+        this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess)
+        .filter( task => this.TaskService.filter(task, this.filterName))
+      }
+    }
+  }
+
+
+
   async loadAllTask() {
     this.loadingAllTask = true
     await this.TaskService.LoadTask()

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

@@ -22,6 +22,7 @@ import { SessionStore } from 'src/app/store/session.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { environment } from 'src/environments/environment';
 import { TaskService } from 'src/app/services/task.service'
+import { RouteService } from 'src/app/services/route.service';
 
 @Component({
   selector: 'app-despachos-pr',
@@ -75,7 +76,8 @@ export class DespachosPrPage implements OnInit {
     private backgroundservice: BackgroundService,
     private sortService: SortService,
     public ThemeService: ThemeService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) {
 
     this.profile = 'mdgpr';
@@ -289,7 +291,7 @@ export class DespachosPrPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    this.RouteService.goBack();
   }
 
 }

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

@@ -220,7 +220,7 @@ export class DespachoPage implements OnInit {
       await this.despachoService.executado(note, documents, this.serialnumber).toPromise();
       this.httpErrorHandle.httpsSucessMessagge('Executado')
       this.TaskService.loadDespachos();
-      this.close();
+      // this.close();
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error)
     }
@@ -237,7 +237,7 @@ export class DespachoPage implements OnInit {
       await this.despachoService.arquivar(note, documents, this.serialnumber).toPromise()
       this.httpErrorHandle.httpsSucessMessagge('Arquivar')
       this.TaskService.loadDespachos();
-      this.close();
+      // this.close();
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error)
     }
@@ -264,7 +264,7 @@ export class DespachoPage implements OnInit {
       await this.processes.CompleteTask(body).toPromise()
       this.httpErrorHandle.httpsSucessMessagge('Reexecução')
       this.TaskService.loadDespachos();
-      this.close();
+       //this.close();
 
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error)
@@ -292,7 +292,7 @@ export class DespachoPage implements OnInit {
       await this.processes.CompleteTask(body).toPromise()
       this.httpErrorHandle.httpsSucessMessagge('Gerar Diploma')
       this.TaskService.loadDespachos();
-      this.close();
+      // this.close();
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error);
     }   finally {
@@ -496,9 +496,16 @@ export class DespachoPage implements OnInit {
       },
       translucent: true
     });
-    return await popover.present().then(()=> {
+    await popover.present();
-      this.TaskService.loadDespachos();
+    
+    popover.onDidDismiss().then((res)=> {
+      console.log('res', res.data)
+      if(res.data == 'back') {
+        this.goBack();
+      }
+      
     })
+
   }
 
 

src/app/pages/gabinete-digital/despachos/despachos.page.html

@@ -29,15 +29,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
             <mat-option value="OverdueTasks">
@@ -45,7 +45,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
           </mat-select>

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

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { NavigationStart, Router } from '@angular/router';
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { DespachoStore } from 'src/app/store/despacho-store.service';
-
+import { RouteService } from 'src/app/services/route.service';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { Platform } from '@ionic/angular';
 import { BackgroundService } from 'src/app/services/background.service';
@@ -32,7 +32,8 @@ export class DespachosPage implements OnInit {
     private platform: Platform,
     private backgroundservice: BackgroundService,
     public ThemeService: ThemeService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) {}
 
   ngOnInit() {
@@ -139,11 +140,7 @@ export class DespachosPage implements OnInit {
 
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    this.RouteService.goBack();
-  }
-
-  goToList() {
-    this.router.navigate(['/home/gabinete-digital/despachos']);
   }
 
 }

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

@@ -23,15 +23,15 @@
           </mat-option>
 
           <mat-option value="Novos" >
-            Novos
+            Novas
           </mat-option>
 
           <mat-option value="Lidos" >
-            Lidos
+            Lidas
           </mat-option>
 
           <mat-option value="Não lidos" >
-            Não lidos
+            Não lidas
           </mat-option>
 
           <mat-option value="OverdueTasks">
@@ -39,7 +39,7 @@
           </mat-option>
 
           <mat-option value="Todos" >
-            Todos
+            Todas
           </mat-option>
 
         </mat-select>

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

@@ -9,6 +9,7 @@ import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { TaskService } from 'src/app/services/task.service'
+import { RouteService } from 'src/app/services/route.service';
 
 @Component({
   selector: 'app-diplomas-assinar',
@@ -41,7 +42,8 @@ export class DiplomasAssinarPage implements OnInit {
    private router: Router,
    private sortService: SortService,
   public ThemeService: ThemeService,
-  public TaskService: TaskService) {
+  public TaskService: TaskService,
+  private RouteService: RouteService,) {
    }
 
   ngOnInit() {
@@ -126,8 +128,9 @@ export class DiplomasAssinarPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    // this.router.navigate(['/home/gabinete-digital']);
     // window.history.back()
+    this.RouteService.goBack();
   }
 
 }

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

@@ -9,7 +9,7 @@ import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { TaskService } from 'src/app/services/task.service'
-
+import { RouteService } from 'src/app/services/route.service';
 @Component({
   selector: 'app-diplomas-gerars',
   templateUrl: './diplomas-gerar.page.html',
@@ -42,7 +42,8 @@ export class DiplomasGerarPage implements OnInit {
     private router: Router,
     private sortService: SortService,
    public ThemeService: ThemeService,
-   public TaskService: TaskService) {
+   public TaskService: TaskService,
+   private RouteService: RouteService,) {
     }
  
    ngOnInit() {
@@ -139,7 +140,7 @@ export class DiplomasGerarPage implements OnInit {
    }
  
    goBack() {
-     this.router.navigate(['/home/gabinete-digital']);
+     this.RouteService.goBack();
      // window.history.back()
    }
 }

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

@@ -85,31 +85,7 @@ export class DiplomaPage implements OnInit {
 
   goBack() {
     this.RouteService.goBack();
-    /* if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
+
-      if (window.innerWidth < 801) {
-        this.router.navigate(['/home/gabinete-digital/pendentes']);
-      }
-      else {
-        let navigationExtras: NavigationExtras = {
-          queryParams: {
-              "pendentes": true,
-            }
-        }
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      }
-    }
-    else{
-      if (window.innerWidth < 801) {
-        this.router.navigate(['/home/gabinete-digital/diplomas']);
-      } else {
-        let navigationExtras: NavigationExtras = {
-          queryParams: {
-            'diplomas': true
-          }
-        }
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      }
-    } */
   }
 
   async openOptions(taskAction?: any) {

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

@@ -11,6 +11,7 @@ import { PermissionService } from 'src/app/services/permission.service';
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { TaskService } from 'src/app/services/task.service'
+import { RouteService } from 'src/app/services/route.service';
 
 @Component({
   selector: 'app-diplomas',
@@ -46,7 +47,8 @@ export class DiplomasPage implements OnInit, OnDestroy {
     private sortService: SortService,
     public ThemeService: ThemeService,
     public p: PermissionService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) {
     //Inicializar segment
 
@@ -223,8 +225,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    this.RouteService.goBack();
-    // window.history.back()
   }
 
 }

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

@@ -71,7 +71,6 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   close(){
-    /* this.router.navigate(['/home/gabinete-digital/event-list']); */
     this.modalController.dismiss(null);
   }
 

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

@@ -95,16 +95,6 @@ export class ApproveEventPage implements OnInit {
 
   goBack() {
     this.RouteService.goBack();
-    /* let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "eventos": true,
-      }
-    };
-    if( window.innerWidth < 801) {
-      this.router.navigate(['/home',this.caller, 'event-list']);
-    } else {
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    } */
 
   }
 
@@ -121,7 +111,6 @@ export class ApproveEventPage implements OnInit {
     this.processes.GetTask(this.serialNumber).subscribe(async res => {
 
       this.loadedEvent = res
-      console.log('1111=1=1=1=')
       this.addProcessToDB(this.loadedEvent)
       
       try {

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

@@ -31,15 +31,15 @@
           </mat-option>
 
           <mat-option value="Novos" >
-            Novos
+            Novas
           </mat-option>
 
           <mat-option value="Lidos" >
-            Lidos
+            Lidas
           </mat-option>
 
           <mat-option value="Não Lidos" >
-            Não lidos
+            Não lidas
           </mat-option>
 
 
@@ -49,7 +49,7 @@
           </mat-option>
 
           <mat-option value="Todos" >
-            Todos
+            Todas
           </mat-option>
 
         </mat-select>

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -25,6 +25,8 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { SessionStore } from 'src/app/store/session.service';
 import { PermissionService } from 'src/app/services/permission.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { RouteService } from 'src/app/services/route.service';
+
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -113,6 +115,7 @@ export class ExpedientTaskModalPage implements OnInit {
     public ThemeService: ThemeService,
     public p: PermissionService,
     private httpErroHandle: HttpErrorHandle,
+    private RouteService: RouteService,
     ) {
 
       this.loggeduser = SessionStore.user;
@@ -178,7 +181,7 @@ export class ExpedientTaskModalPage implements OnInit {
   }
 
   close() {
-    this.router.navigate(['/home/gabinete-digital/expediente']);
+    this.RouteService.goBack();
     this.modalController.dismiss(null);
   }
 

src/app/pages/gabinete-digital/expediente/expediente.page.html

@@ -32,15 +32,15 @@
           </mat-option>
 
           <mat-option value="Novos" >
-            Novos
+            Novas
           </mat-option>
 
           <mat-option value="Lidos" >
-            Lidos
+            Lidas
           </mat-option>
 
           <mat-option value="Não lidos" >
-            Não lidos
+            Não lidas
           </mat-option>
 
 
@@ -49,7 +49,7 @@
           </mat-option>
 
           <mat-option value="Todos" >
-            Todos
+            Todas
           </mat-option>
 
           

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

@@ -13,7 +13,7 @@ import { Storage } from '@ionic/storage';
 import { EventTrigger } from 'src/app/services/eventTrigger.service';
 import { TaskDeadlineService } from 'src/app/services/task-deadline.service'
 import { TaskService } from 'src/app/services/task.service'
-
+import { RouteService } from 'src/app/services/route.service';
 @Component({
   selector: 'app-expediente',
   templateUrl: './expediente.page.html',
@@ -51,7 +51,8 @@ export class ExpedientePage implements OnInit {
     private storage: Storage,
     private eventTriger: EventTrigger,
     public TaskDeadlineService: TaskDeadlineService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) { 
 
     this.eventTriger.getObservable().subscribe((event) => {
@@ -158,7 +159,7 @@ export class ExpedientePage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    this.RouteService.goBack();
   }
 
   goToExpediente(serialNumber: any) {

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts

@@ -101,41 +101,6 @@ export class ExpedientePrPage implements OnInit {
   goBack() {
     this.TaskService.loadExpedientes()
     this.RouteService.goBack();
-    /* if(this.task.Status == "Pending" && this.caller != 'events'){
-      if (window.innerWidth <= 800) {
-        this.router.navigate(['/home/gabinete-digital/pendentes']);
-      }
-      else {
-        let navigationExtras: NavigationExtras = {
-          queryParams: {
-              "pendentes": true,
-            }
-        }
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      }
-    }
-    else{
-      this.activatedRoute.paramMap.subscribe(params => {
-        switch (params["params"].caller) {
-          case 'events':
-            this.router.navigate(['/home',params["params"].caller]);
-            break;
-
-          case 'gabinete-digital':
-            let navigationExtras: NavigationExtras = {
-              queryParams: {
-                "expedientes-pr": true,
-              }
-            }
-            if( window.innerWidth < 801) {
-              this.router.navigate(['/home/gabinete-digital/expedientes-pr']);
-            } else {
-              this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-            }
-            break;
-        }
-      });
-    } */
   }
 
   sendExpedienteToPending() {

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

@@ -143,7 +143,6 @@ export class ExpedientesPrPage implements OnInit {
   }
 
   goToExpediente({SerialNumber}){
-    //this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
     this.router.navigate(['/home/gabinete-digital/expediente', SerialNumber, 'gabinete-digital']);
   }
 

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

@@ -22,15 +22,15 @@
                   </mat-option>
         
                   <mat-option value="Novos" >
-                    Novos
+                    Novas
                   </mat-option>
         
                   <mat-option value="Lidos" >
-                    Lidos
+                    Lidas
                   </mat-option>
         
                   <mat-option value="Não lidos" >
-                    Não lidos
+                    Não lidas
                   </mat-option>
         
                   <mat-option value="OverdueTasks">
@@ -38,7 +38,7 @@
                   </mat-option>
       
                   <mat-option value="Todos" >
-                    Todos
+                    Todas
                   </mat-option>
         
                 </mat-select>
@@ -114,22 +114,22 @@
 
           <div *ngIf="hideSearchBtn">
             <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
-              <mat-select [(value)]="filterName">
+              <mat-select [(value)]="filterName" (change)="dynamicSearch()">
       
                 <mat-option value="Para hoje" >
                   Para hoje
                 </mat-option>
       
                 <mat-option value="Novos" >
-                  Novos
+                  Novas
                 </mat-option>
       
                 <mat-option value="Lidos" >
-                  Lidos
+                  Lidas
                 </mat-option>
       
                 <mat-option value="Não lidos" >
-                  Não lidos
+                  Não lidas
                 </mat-option>
       
                 <mat-option value="OverdueTasks">
@@ -137,7 +137,7 @@
                 </mat-option>
     
                 <mat-option value="Todos" >
-                  Todos
+                  Todas
                 </mat-option>
       
               </mat-select>
@@ -159,7 +159,7 @@
                     class=" box-hover ion-no-padding cursor-pointer"
                     *ngFor = "let task of AllProcess"
                     (click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)">
-                    <div class="item-wrapper" *ngIf="TaskService.filter(task, filterName)">
+                    <div class="item-wrapper">
                       <div class="item width-100">
                         <div class="item-top-detail">
                           <div class="item-subject">

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

@@ -217,12 +217,14 @@ export class GabineteDigitalPage implements OnInit {
       
       if(ordinance == this.ordinance) {
         this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess)
+          .filter( task => this.TaskService.filter(task, this.filterName))
       }
     } else {
-      const AllProcess = this.TaskService.AllProcess
+      const AllProcess = this.TaskService.AllProcess.filter( task => this.TaskService.filter(task, this.filterName))
       
       if(ordinance == this.ordinance) {
         this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess)
+          .filter( task => this.TaskService.filter(task, this.filterName))
       }
     }
 
@@ -260,6 +262,7 @@ export class GabineteDigitalPage implements OnInit {
       }
     });
 
+    this.checkRoutes()
     this.hideRefreshButton();
 
     // console.log(' this.scroll',  this.scroll)
@@ -388,9 +391,12 @@ export class GabineteDigitalPage implements OnInit {
 
   checkRoutes() {
     this.closeAllDesktopComponents();
-    if (this.router.url == 'processes=true') {
+    
+    // console.log(this.router.url, this.router.url.includes('processes=true'))
+    // alert('hello')
+    if (this.router.url.includes('processes=true')) {
       this.openAllProcessesPage();
-      this.selectedElement = 'allProcessesTag';
+      this.checkUser()
     }
     if (this.router.url == '/home/gabinete-digital?eventos=true') {
       this.openEventsToApprovePage();
@@ -512,7 +518,7 @@ export class GabineteDigitalPage implements OnInit {
       this.router.navigate(['/home/gabinete-digital']);
     }
     else {
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+      // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showAllProcesses = true;
       this.selectedElement = "allProcessesTag";
     }

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

@@ -608,40 +608,6 @@ export class PedidoPage implements OnInit {
 
   goBack() {
     this.RouteService.goBack();
-    // if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
-    //   if (window.innerWidth <= 700) {
-    //     this.router.navigate(['/home/gabinete-digital/pendentes']);
-    //   }
-    //   else {
-
-    //     let navigationExtras: NavigationExtras;
-
-    //     if (this.task.activityInstanceName == 'Concluir Deferimento') {
-    //       navigationExtras= { queryParams: {"deferimento": true,}};
-    //     } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
-    //       navigationExtras = { queryParams: {"parecer": true,}};
-    //     }
-
-    //     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    //   }
-    // }
-    // else {
-    //   if (window.innerWidth <= 700) {
-    //     this.router.navigate(['/home/gabinete-digital/pedidos']);
-    //   }
-    //   else {
-
-    //     let navigationExtras: NavigationExtras;
-
-    //     if (this.task.activityInstanceName == 'Concluir Deferimento') {
-    //       navigationExtras= { queryParams: {"deferimento": true,}};
-    //     } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
-
-    //       navigationExtras = { queryParams: {"parecer": true,}};
-    //     }
-    //     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    //   }
-    // }
   }
 
 }

src/app/pages/gabinete-digital/pedidos/pedidos.page.html

@@ -34,15 +34,15 @@
           </mat-option>
 
           <mat-option value="Novos" >
-            Novos
+            Novas
           </mat-option>
 
           <mat-option value="Lidos" >
-            Lidos
+            Lidas
           </mat-option>
 
           <mat-option value="Não lidos" >
-            Não lidos
+            Não lidas
           </mat-option>
 
           <mat-option value="OverdueTasks">
@@ -51,7 +51,7 @@
 
           
           <mat-option value="Todos" >
-            Todos
+            Todas
           </mat-option>
 
 

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

@@ -14,6 +14,9 @@ import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { TaskService } from 'src/app/services/task.service'
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
+import { RouteService } from 'src/app/services/route.service';
+
+
 @Component({
   selector: 'app-pedidos',
   templateUrl: './pedidos.page.html',
@@ -62,7 +65,8 @@ export class PedidosPage implements OnInit {
     private backgroundservice: BackgroundService,
     private platform: Platform,
     public ThemeService: ThemeService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) {
     this.segment = 'parecer';
 
@@ -138,23 +142,9 @@ export class PedidosPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    this.RouteService.goBack();
   }
 
-  /* segmentChanged(ev: any) {
-
-    let navigationExtras: NavigationExtras;
-
-    if (this.segment == 'deferimento') {
-      navigationExtras= { queryParams: {"deferimento": true,}};
-    } else if (this.segment == 'parecer') {
-      navigationExtras = { queryParams: {"parecer": true,}};
-    }
-
-    this.router.navigate(['/home/gabinete-digital/pedidos'], navigationExtras);
-
-    // this.LoadList();
-  } */
 
   goToPedido(serialNumber: any) {
     this.router.navigate(['/home/gabinete-digital/pedidos', serialNumber, 'gabinete-digital']);

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

@@ -19,7 +19,7 @@ import { SessionStore } from 'src/app/store/session.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 import { TaskService } from 'src/app/services/task.service'
 import { ThemeService } from 'src/app/services/theme.service'
-
+import { RouteService } from 'src/app/services/route.service';
 @Component({
   selector: 'app-pendentes',
   templateUrl: './pendentes.page.html',
@@ -62,6 +62,7 @@ export class PendentesPage implements OnInit {
     private httpErroHandle: HttpErrorHandle,
     public TaskService: TaskService,
     public ThemeService: ThemeService,
+    private RouteService: RouteService,
   ) {
     this.loggeduser = SessionStore.user;
     this.profile = 'mdgpr';
@@ -128,7 +129,7 @@ export class PendentesPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    this.RouteService.goBack();
   }
 
   notImplemented() {

src/app/services/events.service.ts

@@ -305,6 +305,28 @@ export class EventsService {
       } else {
         this.hasAnyCalendar = true
       }
+
+
+      (() => {
+        const keys = {}
+
+        for (let e of SessionStore.user.OwnerCalendars) {
+          if(!keys[e.CalendarId]) {
+            keys[e.CalendarId] = e.CalendarId
+          } else {
+            throw(`Calendar ${e.CalendarId} is repeated for user `+ SessionStore.user.FullName);
+          }
+        }
+
+        for (let e of SessionStore.user.SharedCalendars) {
+          if(!keys[e.CalendarId]) {
+            keys[e.CalendarId] = e.CalendarId
+          } else {
+            throw(`Calendar ${e.CalendarId} is repeated for user `+ SessionStore.user.FullName);
+          }
+        }
+      })();
+      
     }
   }
 

src/app/services/processes.service.ts

@@ -60,6 +60,9 @@ export class ProcessesService {
 
     params = params.set("ProcessName", processname);
     params = params.set("OnlyCount", onlycount.toString());
+    params = params.set("OnlyCount", onlycount.toString());
+    params = params.set("pageNum", "1");
+    params = params.set("pageSize", "500");
 
     let options = {
       headers: this.headers,

src/app/services/task.service.ts

@@ -16,6 +16,7 @@ import { SessionStore } from 'src/app/store/session.service';
 import { EventsService } from './events.service';
 import { SortService } from './functions/sort.service';
 import { customTask } from '../models/dailyworktask.model';
+import { Router } from '@angular/router';
 
 @Injectable({
   providedIn: 'root'
@@ -61,6 +62,7 @@ export class TaskService {
     private despachoRule: DespachoService,
     public eventService: EventsService,
     private sortService: SortService,
+    private router: Router,
   ) {
 
     window['all-process-gabinete'] = () => {
@@ -364,4 +366,53 @@ export class TaskService {
     }
     
   }
+
+
+
+  goToProcess(serialNumber: string, workflowName: string, activityName: string) {
+
+
+
+    if (workflowName == 'Despacho') {
+      if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
+        this.router.navigate(['/home/gabinete-digital/despachos', serialNumber, 'gabinete-digital']);
+      }
+    }
+    else if (workflowName == 'Despacho do Presidente da República') {
+      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') {
+        this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']);
+      }
+      else if (activityName == 'Diploma Assinado') {
+        this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
+      } else {
+
+      }
+    }
+    else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
+      this.router.navigate(['/home/gabinete-digital/pedidos', serialNumber, 'gabinete-digital']);
+    }
+    else if (workflowName == 'Expediente') {
+      this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']);
+    }
+    else if (workflowName == 'Expediente' && SessionStore.user.Profile == 'PR') {
+      this.router.navigate(['/home/gabinete-digital/expedientes-pr', serialNumber, 'gabinete-digital']);
+    }
+    else if (workflowName == "Pedido de Parecer do Presidente") {
+      this.router.navigate(['/home/gabinete-digital/pedidos', serialNumber, 'gabinete-digital']);
+    }
+    /* 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" || workflowName == "Agendar Evento") {
+      this.router.navigate(['/home/gabinete-digital/event-list/approve-event', serialNumber, 'gabinete-digital']);
+    }
+    else {
+      throw(`${workflowName} && ${activityName} no route`)
+    }
+
+  }
+
 }

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

@@ -55,6 +55,10 @@ export class ApproveEventPage implements OnInit {
   ) {
     // Event to approve list
 
+
+    window['edit-approve-event-desktop'] = ()=> {
+      this.getTask()
+    }
   }
 
   toDateString(e) {
@@ -168,6 +172,7 @@ export class ApproveEventPage implements OnInit {
     });
     return await popover.present().then(() =>{
       this.TaskService.loadEventosParaAprovacao()
+      this.getTask()
     })
   }
 

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts

@@ -375,14 +375,14 @@ export class EditEventToApprovePage implements OnInit {
       if(document['action'] == 'add') {
         delete document.action
         this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{
-
+          window['edit-approve-event-desktop']()
         }, error =>{
           this.toastService.badRequest();
         });
       } else if(document['action'] == 'delete') {
         delete document.action
         this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{
-
+          window['edit-approve-event-desktop']()
         }, error =>{
           this.toastService.badRequest()
         })

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

@@ -61,15 +61,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
             <mat-option value="OverdueTasks">
@@ -77,7 +77,7 @@
             </mat-option>
 
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
           </mat-select>

src/app/shared/gabinete-digital/despachos/despachos.page.html

@@ -58,15 +58,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
   
@@ -75,7 +75,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
   

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html

@@ -54,15 +54,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
   
@@ -71,7 +71,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
   

src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html

@@ -23,15 +23,15 @@
           </mat-option>
 
           <mat-option value="Novos" >
-            Novos
+            Novas
           </mat-option>
 
           <mat-option value="Lidos" >
-            Lidos
+            Lidas
           </mat-option>
 
           <mat-option value="Não lidos" >
-            Não lidos
+            Não lidas
           </mat-option>
 
 
@@ -41,7 +41,7 @@
 
 
           <mat-option value="Todos" >
-            Todos
+            Todas
           </mat-option>
 
         </mat-select>

src/app/shared/gabinete-digital/diplomas/diplomas.page.html

@@ -52,15 +52,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
   
@@ -69,7 +69,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
   

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

@@ -57,15 +57,15 @@
               </mat-option>
     
               <mat-option value="Novos" >
-                Novos
+                Novas
               </mat-option>
     
               <mat-option value="Lidos" >
-                Lidos
+                Lidas
               </mat-option>
     
               <mat-option value="Não lidos" >
-                Não lidos
+                Não lidas
               </mat-option>
     
     
@@ -74,7 +74,7 @@
               </mat-option>
     
               <mat-option value="Todos" >
-                Todos
+                Todas
               </mat-option>
     
     

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html

@@ -55,15 +55,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
   
@@ -72,7 +72,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
   

src/app/shared/gabinete-digital/expedients/expedients.page.html

@@ -56,15 +56,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
             <mat-option value="OverdueTasks">
@@ -72,7 +72,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
   

src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.html

@@ -60,15 +60,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
             <mat-option value="OverdueTasks">
@@ -76,7 +76,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
           </mat-select>

src/app/shared/gabinete-digital/pedidos/pedidos.page.html

@@ -56,15 +56,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
   
@@ -73,7 +73,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
   

src/app/shared/gabinete-digital/pendentes/pendentes.page.html

@@ -55,15 +55,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
   
@@ -72,7 +72,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
   

src/app/shared/popover/despachos-options/despachos-options.page.ts

@@ -47,12 +47,9 @@ export class DespachosOptionsPage implements OnInit {
   ngOnInit() {
   }
 
-  close () {
-    this.goBack()
-  }
 
   async openTaskProcessModal(taskAction: any, task: any) {
-    this.popoverController.dismiss();
+
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -70,18 +67,17 @@ export class DespachosOptionsPage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss().then( res => {
-      this.goBack();
+      // this.goBack();
     });
   }
 
   sendExpedienteToPending() {
     const loader = this.toastService.loading()
-    this.popoverController.dismiss();
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
       this.httpErrorHandle.httpsSucessMessagge('Enviar para Pendentes')
       loader.remove()
       
-      this.close();
+      this.goBack('back');
     },(error)=>{
       loader.remove()
       this.httpErrorHandle.httpStatusHandle(error)
@@ -89,7 +85,7 @@ export class DespachosOptionsPage implements OnInit {
   }
 
   async distartExpedientModal(){
-    this.popoverController.dismiss();
+
     
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
@@ -105,14 +101,14 @@ export class DespachosOptionsPage implements OnInit {
     await modal.present();
     modal.onDidDismiss().then(res=>{
       if(res['data']=='close'){
-        this.close();
+        this.goBack('back');
       }
     });
   }
 
 
   async openBookMeetingModal(task: any) {
-    this.popoverController.dismiss();
+  
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -128,11 +124,13 @@ export class DespachosOptionsPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then(() => {
+      this.goBack('no');
+    })
   }
 
   async openDelegarModal(task: any) {
-    this.popoverController.dismiss();
+  
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -152,7 +150,7 @@ export class DespachosOptionsPage implements OnInit {
       if(res){
         const data = res.data;
         if(data == 'close') {
-          this.goBack();
+          this.goBack('back');
         }
       }
 
@@ -175,7 +173,7 @@ export class DespachosOptionsPage implements OnInit {
     try {
       await this.processes.CompleteTask(body).toPromise()
       this.toastService._successMessage()
-      this.close();
+      this.goBack('back');
     } catch (error) {
       if(error.status == 0) {
         this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
@@ -191,7 +189,7 @@ export class DespachosOptionsPage implements OnInit {
 
   async openAddNoteModal(actionName:string) {
 
-    this.popoverController.dismiss();
+
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -229,7 +227,7 @@ export class DespachosOptionsPage implements OnInit {
         if(actionName == 'Executado') {
           await this.executado(res.data.note, docs);
         }
-        else if(actionName == 'Arquivar'){
+        else if(actionName == 'Arquivar') {
          await this.arquivar(res.data.note, docs);
         }
         else if(actionName == 'Gerar Diploma') {
@@ -241,7 +239,7 @@ export class DespachosOptionsPage implements OnInit {
         else if(actionName == 'Reexecução') {
           await this.reexecutar(res.data.note, docs);
         }
-        this.goBack();
+
       }
     });
   }
@@ -262,7 +260,7 @@ export class DespachosOptionsPage implements OnInit {
     try {
       await this.processes.CompleteTask(body).toPromise()
       this.toastService._successMessage('Processo arquivado')
-      this.close();
+      this.goBack('back');
     } catch (error) {
       if(error.status == 0) {
         this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
@@ -293,7 +291,7 @@ export class DespachosOptionsPage implements OnInit {
 
     try {
       await this.processes.CompleteTask(body).toPromise()
-      this.close();
+      this.goBack('back');
       this.toastService._successMessage()
     } catch(error) {
       if(error.status == 0) {
@@ -326,7 +324,7 @@ export class DespachosOptionsPage implements OnInit {
     try {
       await this.processes.CompleteTask(body).toPromise()
       this.toastService._successMessage()
-      this.close();
+      this.goBack('back');
     } catch (error) {
       if(error.status == 0) {
         this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
@@ -340,8 +338,8 @@ export class DespachosOptionsPage implements OnInit {
 
   }
 
-  goBack() {
+  goBack(params) {
-    this.RouteService.goBack();
+    this.popoverController.dismiss()
   }
 
 }

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts

@@ -303,7 +303,7 @@ export class DespachosPrOptionsPage implements OnInit {
 
     try {
       await this.processes.CompleteTask(body).toPromise()
-      this.httpErroHandle.httpsSucessMessagge('Concluir')
+      this.httpErroHandle.httpsSucessMessagge('Concluir Despacho')
       this.close();
     } catch (error) {
     if(error.status == 0) {

src/app/shared/popover/opts-expediente/opts-expediente.page.ts

@@ -87,54 +87,7 @@ export class OptsExpedientePage implements OnInit {
   }
 
   goBack() {
-    if(this.task.Status == "Pending" && this.caller != 'events') {
-      if (window.innerWidth <= 800) {
-        this.router.navigate(['/home/gabinete-digital/pendentes']);
-      }
-      else {
-        let navigationExtras: NavigationExtras = {
-          queryParams: {
-            "pendentes": true,
-          }
-        }
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      }
-    }
-    else {
     this.RouteService.goBack()
-
-
-      /* this.activatedRoute.paramMap.subscribe(params => {
-        
-        
-
-
-        switch (params["params"].caller) {
-          case 'events':
-            
-
-            this.router.navigate(['/home',params["params"].caller]);
-            break;
-
-          case 'gabinete-digital':
-            
-            let navigationExtras: NavigationExtras = {
-              queryParams: {
-                "expedientes": true,
-              }
-            }
-            if( window.innerWidth < 801) {
-              this.router.navigate(['/home/gabinete-digital/expediente']);
-              
-
-            } else {
-              this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-            }
-            break;
-
-        }
-      }); */
-    }
   }
 
   attachDocument(){

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "6b8e4a600",
+  "shortSHA": "ac575c600",
-  "SHA": "6b8e4a600bb9d03d98cde3b611a4698dd2be69c7",
+  "SHA": "ac575c6001c8ce61b3097ad45c1e83158ae56eb5",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Sat Jun 10 10:55:30 2023 +0100'",
+  "lastCommitTime": "'Sat Jun 10 17:04:09 2023 +0100'",
-  "lastCommitMessage": "Pesquisa avançada fixed",
+  "lastCommitMessage": "Multiples messages when evento to aprove where editedd",
-  "lastCommitNumber": "4972",
+  "lastCommitNumber": "4974",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 13 and 6 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/models/beast-orm.ts\n\tmodified:   src/app/pages/events/events.page.html\n\tmodified:   src/app/pages/search/search.page.scss\n\tmodified:   src/app/pages/search/search.page.ts\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts",
+  "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 14 and 5 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   .gitignore\n\tmodified:   src/app/home/home.page.ts\n\tmodified:   src/app/modals/create-process/create-process.page.ts\n\tmodified:   src/app/models/beast-orm.ts\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/view-event/view-event.page.html\n\tmodified:   src/app/pages/events/events.page.html\n\tmodified:   src/app/pages/events/events.page.scss\n\tmodified:   src/app/pages/events/events.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\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/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified:   src/app/services/events.service.ts\n\tmodified:   src/app/services/processes.service.ts\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified:   src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified:   src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified:   src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified:   src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.html\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified:   src/app/shared/popover/despachos-options/despachos-options.page.ts\n\tmodified:   src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts\n\tmodified:   src/app/shared/popover/opts-expediente/opts-expediente.page.ts",
   "changeAuthor": "eudes.inacio"
 }