From 54ee7701c81533e0e98f74c41bca0b48b8a7e4db Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 25 Aug 2021 09:38:13 +0100
Subject: [PATCH] Fix go back

---
 .../event-actions-popover.page.ts             | 19 ++++++-------------
 .../approve-event/approve-event.page.html     | 16 ++++++++--------
 src/app/store/chat/chat-user.service.ts       | 11 ++++++-----
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
index 9ec489bbb..6294005fd 100644
--- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
@@ -7,6 +7,7 @@ import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edi
 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 { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page';
+import { Location } from '@angular/common';
 
 @Component({
   selector: 'app-event-actions-popover',
@@ -24,7 +25,8 @@ export class EventActionsPopoverPage implements OnInit {
     private modalController: ModalController,
     private popoverController: PopoverController,
     private animationController: AnimationController,
-    private toastService: ToastService,) {
+    private toastService: ToastService,
+    private location: Location) {
       this.serialNumber = this.navParams.get('serialNumber');
       this.instanceId = this.navParams.get('InstanceId');
      }
@@ -37,22 +39,13 @@ export class EventActionsPopoverPage implements OnInit {
     };
   }
 
-  goBack(){
+  goBack() {
     this.closePopover();
 
-    if (window.innerWidth <= 801) {
-      this.router.navigate(['/home/gabinete-digital/event-list']);
-    } else {
-      let navigationExtras: NavigationExtras = {
-        queryParams: {
-          'eventos': true
-        }
-      }
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
+    this.location.back()
   }
 
-  closePopover(){
+  closePopover() {
     this.popoverController.dismiss();
   }
 
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
index 71f3bd2f2..977fe6f70 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
@@ -104,13 +104,13 @@
 </ion-content>
 
 <ion-footer class="display-none-true">
-    <div class="buttons">
-      <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Rever</button>
-      <ion-menu-button  (click)="openMenu()" autoHide="false">
-        <ion-icon  name="ellipsis-vertical-outline"></ion-icon>
-      </ion-menu-button>
-      <button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
-      <button hidden class="btn-delete" shape="round" (click)="rejeitar(loadedEvent.serialNumber)">Rejeitar</button>
+  <div class="buttons">
+    <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Rever</button>
+    <ion-menu-button  (click)="openMenu()" autoHide="false">
+      <ion-icon  name="ellipsis-vertical-outline"></ion-icon>
+    </ion-menu-button>
+    <button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
+    <button hidden class="btn-delete" shape="round" (click)="rejeitar(loadedEvent.serialNumber)">Rejeitar</button>
 
-    </div>
+  </div>
 </ion-footer>
diff --git a/src/app/store/chat/chat-user.service.ts b/src/app/store/chat/chat-user.service.ts
index 1fa1166b2..eb60b2941 100644
--- a/src/app/store/chat/chat-user.service.ts
+++ b/src/app/store/chat/chat-user.service.ts
@@ -8,7 +8,7 @@ import { SHA1 }  from  'crypto-js'
 export class ChatUserService {
 
   // main data
-  private _userList = []
+  private _userList = {}
   // local storage keyName
   private keyName: string;
 
@@ -17,8 +17,8 @@ export class ChatUserService {
     this.keyName = ('chat'+SHA1(this.constructor.name)).toString()
 
     setTimeout(()=>{
-      let restore = localstoreService.get(this.keyName, [])
-      this._userList = restore.userList
+      let restore = localstoreService.get(this.keyName, {})
+      this._userList = restore.userList || {}
     }, 10)
 
   }
@@ -27,8 +27,9 @@ export class ChatUserService {
     return this._userList
   }
 
-  reset(userList: any[]) {
-    this._userList = userList
+  add(roomId:string, userList: any[] = []) {
+    
+    this._userList[roomId] = userList
 
     this.save()
   }