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(){