Fixe go back

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

@@ -425,7 +425,7 @@
         [InstanceId] = "eventToaprove.InstanceId"
         [saveData] = "eventToaprove.saveData"
         (cloneAllmobileComponent)="viewEventDetailDismiss($event)"
-        (closeEventToApprove)="closeEventToApprove()"
+        (closeEventToApprove)="closeEventToApproveGoBack()"
         (AproveEventEditEvent)="AproveEventEditEvent($event)"
         (EditApproveEventDismiss)="EditApproveEventDismiss()"
         [eventAttendees]="contacts"
@@ -442,7 +442,7 @@
         (setContact)="setContact($event)"
         (clearContact)="clearContact()"
         (openAttendeesComponent)="openAttendeesComponent($event)"
-        (closeComponent)="closeComponentEditEventOrAdd()"
+        (closeComponent)="approveEventDismissGoBack()"
         (setIntervenient)="setIntervenient($event)"
         (setIntervenientCC)="setIntervenientCC($event)"
       ></app-edit-event-to-approve>

src/app/pages/agenda/agenda.page.ts

@@ -1209,7 +1209,9 @@ export class AgendaPage implements OnInit {
     this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
   }
 
-  async viewEventsToApprove(){
+
+  // called from this template and child event
+  async viewEventsToApprove() {
     await this.cloneAllmobileComponent();
 
     if( window.innerWidth <= 801){
@@ -1217,13 +1219,26 @@ export class AgendaPage implements OnInit {
     } else {
       // hide all components
       this.cloneAllmobileComponent();
+      this.mobileComponent.transparentEventList = false;
       this.mobileComponent.showEventList = true;
     }
+  }
+
+
+  approveEventDismissGoBack() {
+
+    window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {}
+    // this.mobileComponent.showEventList = false;
+    this.mobileComponent.transparentEventList = true;
+    this.mobileComponent.showEventToApprove = true;
 
   }
 
+
   approveEventDismiss({saveData, serialNumber, action}){
 
+    window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {}
+    
     if(action == 'Aprovar'){
       this.eventToaprove = {
         back: true,
@@ -1239,17 +1254,22 @@ export class AgendaPage implements OnInit {
 
   }
 
-  closeEventToApprove(){
-    if (this.eventToaprove.back ==true && this.mobileComponent.showEventList ==true){
-      this.mobileComponent.transparentEventList = false;
-      this.mobileComponent.showEventToApprove = false;
-      this.eventToaprove.back = false;
-    }
-    else {
-      this.mobileComponent.showEventToApprove = false;
-      this.mobileComponent.showEventList = false;
-    }
+  closeEventToApprove() {
     
+    this.mobileComponent.showEventToApprove = false;
+    this.mobileComponent.showEventList = true;
+
+  }
+
+  closeEventToApproveGoBack() {
+    if( window.innerWidth <= 801){
+      this.router.navigate(['/home/agenda/event-list']);
+    } else {
+      // hide all components
+      this.cloneAllmobileComponent();
+      this.mobileComponent.transparentEventList = false;
+      this.mobileComponent.showEventList = true;
+    }
   }
 
   EditApproveEventDismiss(){

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

@@ -2,14 +2,14 @@
   <app-header></app-header>
 </ion-header>
 
-<ion-content id="main-content">
-  <div class="main-content d-flex height-100">
-    <div  *ngIf="loadedEvent" class="content d-flex flex-column width-100">
+<ion-content id="main-content" >
+  <div class="main-content d-flex height-100" *ngIf="loadedEvent" >
+    <div class="content d-flex flex-column width-100" *ngIf="loadedEvent.workflowInstanceDataFields">
       <div class="header-content width-100 d-flex justify-space-between">
         <div (click)="goBack()" class="header-icon-left cursor-pointer">
           <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
         </div>
-        <div class="header-title flex-grow-1 cursor-pointer">
+        <div class="header-title flex-grow-1 cursor-pointer" *ngIf="loadedEvent.workflowInstanceDataFields.Subject">
           <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
         </div>
         <div  (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-true">

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

@@ -1,6 +1,6 @@
 import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
 import { AlertService } from 'src/app/services/alert.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -9,8 +9,6 @@ import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/
 import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
@@ -20,8 +18,7 @@ import { ToastService } from 'src/app/services/toast.service';
 })
 export class ApproveEventPage implements OnInit {
   event: Event;
-  loadedEvent:any;
-  loadedEvent1:any;
+  loadedEvent:any = false
   loadedAttachments:any;
   customDate:any;
   today:any;
@@ -51,7 +48,6 @@ export class ApproveEventPage implements OnInit {
     private animationController: AnimationController,
     private toastService: ToastService,
   ) { 
-
     this.activatedRoute.paramMap.subscribe(params => {
       console.log(params["params"]);
       
@@ -260,9 +256,7 @@ export class ApproveEventPage implements OnInit {
     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
   }
 
-
   async editar(serialNumber: string) {
-    
 
     const modal = await this.modalController.create({
       component: EditEventToApproveComponent,
@@ -282,7 +276,4 @@ export class ApproveEventPage implements OnInit {
 
   } 
 
-
-  
-
 }

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

@@ -1,11 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import { EventBody } from 'src/app/models/eventbody.model';
 import { EventPerson } from 'src/app/models/eventperson.model';
-import { Event } from 'src/app/models/event.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController } from '@ionic/angular';
 import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
-import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
+import { NavigationEnd, Router } from '@angular/router';
 
 @Component({
   selector: 'app-event-list',
@@ -13,11 +12,13 @@ import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angula
   styleUrls: ['./event-list.page.scss'],
 })
 export class EventListPage implements OnInit {
+  // [desktop] event list to approve
+
   profile:string;
   segment:string;
   showLoader: boolean;
-  eventsPRList: any;
-  eventsMDGPRList: any;
+  eventsPRList: any = []
+  eventsMDGPRList: any = []
   eventPerson: EventPerson;
   eventBody: EventBody;
   categories: string[];
@@ -27,8 +28,7 @@ export class EventListPage implements OnInit {
   constructor(
     private processes:ProcessesService,
     private modalController: ModalController,
-    private router: Router,
-    private activatedRoute: ActivatedRoute,
+    private router: Router
   ) { }
 
   ngOnInit() {

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

@@ -13,7 +13,7 @@
 </ion-header> -->
 
 <ion-content id="main-content">
-  <div class="main-content d-flex height-100">
+  <div class="main-content d-flex height-100" *ngIf="loadedEvent">
     <div class="content d-flex flex-column">
       <div class="header-content width-100 d-flex justify-space-between">
         <div (click)="close()" class="header-icon-left cursor-pointer">

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

@@ -10,10 +10,8 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
-import { Event } from '../../../models/event.model';
 import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
 
-
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
     dateInput: "YYYY-MMMM-DD HH:mm"
@@ -163,19 +161,23 @@ export class EditEventToApprovePage implements OnInit {
       else {
         this.isRecurring = "Repete";
       }
-  
-      this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
-        if(e.IsRequired) {
-          this.taskParticipants.push(e);
-        } else {
-          this.taskParticipantsCc.push(e);
-        }
-      })
+      
+      if(this.eventProcess.workflowInstanceDataFields.ParticipantsList) {
+        this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
+          if(e.IsRequired) {
+            this.taskParticipants.push(e);
+          } else {
+            this.taskParticipantsCc.push(e);
+          }
+        })
+      }
+
     })
   }
   
   close() {
-    console.log('CLOSE');
+
+    window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {}
     
     this.closeComponent.emit();
     /* this.setIntervenient.emit([]);
@@ -316,7 +318,6 @@ export class EditEventToApprovePage implements OnInit {
 
   restoreTemporaryData(): boolean {
 
-
     const restoredData =  window['temp.path:/shared/agenda/edit-event-to-approve.ts']
 
     if(JSON.stringify(restoredData) != "{}" && undefined != restoredData) {

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

@@ -12,7 +12,7 @@ import { NavigationEnd, Router } from '@angular/router';
   styleUrls: ['./event-list.page.scss'],
 })
 export class EventListPage implements OnInit {
-
+  // [desktop] event list to approve
 
   showLoader: boolean;
   eventsPRList: any;
@@ -38,7 +38,7 @@ export class EventListPage implements OnInit {
 
       /* console.log(this.profile); */
 
-      if(this.profile == "mdgpr"){
+      if(this.profile == "mdgpr") {
         this.profile = 'MDGPR'
       } else {
         this.profile = 'PR'
@@ -53,7 +53,7 @@ export class EventListPage implements OnInit {
       });
     }
 
-    LoadToApproveEvents(){
+    LoadToApproveEvents() {
       this.showLoader = true;
       
       this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
@@ -65,22 +65,20 @@ export class EventListPage implements OnInit {
         this.eventsMDGPRList = res;
       });
     }
-    async openApproveModal(eventSerialNumber, data){
+    async openApproveModal(eventSerialNumber, data) {
 
       let a =this.eventsMDGPRList.filter((elem)=>{
         console.log(eventSerialNumber," ",elem.serialNumber)
         return eventSerialNumber == elem.serialNumber
       });
 
-      console.log(a);
-
       this.approveEventDismiss.emit({ 
         "serialNumber": eventSerialNumber,
         "action": "Aprovar", 
         "saveData": data
       });
-
     }
+
     doRefresh(event) {
       this.LoadToApproveEvents();
       console.log('refresh');