From f2b4128836128f1155abdf08b3cea56cb5defd56 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 28 Sep 2022 16:33:13 +0100
Subject: [PATCH] improve

---
 src/app/pages/chat/chat.page.html             |  5 +--
 src/app/pages/chat/chat.page.ts               | 36 +++++++++----------
 .../expediente-detail.page.ts                 |  7 ++--
 src/app/services/chat/room.service.ts         |  2 +-
 .../services/chat/ws-chat-methods.service.ts  |  8 -----
 src/app/services/data.service.ts              |  2 +-
 .../shared/chat/new-group/new-group.page.ts   | 23 ++++--------
 7 files changed, 33 insertions(+), 50 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 4c473fd14..aeeafaa66 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -18,9 +18,9 @@
             </div>
             <div class="div-icon">
 
-              <button (click)="openChatDebuggingPageModal()" title="Nova Conversa Individual" class="btn-no-color font-12">
+              <!-- <button (click)="openChatDebuggingPageModal()" title="Nova Conversa Individual" class="btn-no-color font-12">
                 Dev
-              </button>
+              </button> -->
               <button title="Nova Conversa Individual" class="btn-no-color" (click)="openContactsPage()">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-conversation.svg"></ion-icon>
@@ -213,6 +213,7 @@
           (addGroupMessage)="openGroupContactsPage($event)"
           (closeAllDesktopComponents)="closeAllDesktopComponents()"
           [style.display]="showNewGroup ? 'flex' : 'none'"
+          *ngIf="showNewGroup"
            class=" height-100 flex-column">
         </app-new-group>
 
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 141a6baab..9ef86da3c 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -16,7 +16,7 @@ import { MessagesPage } from './messages/messages.page';
 import { NewGroupPage } from './new-group/new-group.page';
 import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page';
 import { Subject } from "rxjs/Rx";
-import { NavigationStart, Router } from '@angular/router';
+import { NavigationStart, Router, NavigationEnd } from '@angular/router';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { environment } from 'src/environments/environment';
@@ -142,30 +142,29 @@ export class ChatPage implements OnInit {
     this.hideRefreshButton();
     this.getChatMembers();
 
-    let t = this.showDateDuration(new Date());
 
+    this.checkCreateGroup();
+
+    this.router.events.forEach((event) => {
+
+      if (event instanceof NavigationEnd && event.url == '/home/chat' || 
+      event instanceof NavigationEnd && event.url == "/home/chat?gbCreateGroup=true") {
+        this.checkCreateGroup();
+      }
+
+    });
+
+  }
+
+  checkCreateGroup() {
     if (this.dataService.get("newGroup")) {
       this.openNewGroupPage();
     }
-    else{
+    else {
       this.closeAllDesktopComponents();
       this.showEmptyComponent = true;
     }
-
-   /*  this.router.events.forEach((event) => {
-      if (event instanceof NavigationStart || event.url.endsWith('/home/chat')) {
-        if (this.dataService.get("newGroup")) {
-          this.openNewGroupPage();
-        }
-        else{
-          this.closeAllDesktopComponents();
-          this.showEmptyComponent = true;
-        }
-      }
-      else{
-        this.dataService.set("newGroup", false);
-      }
-    }); */
+  
   }
 
   numSequence(n: number): Array<number> {
@@ -174,7 +173,6 @@ export class ChatPage implements OnInit {
 
   ngOnDestroy() {
     this.setStatus('offline');
-    this.dataService.set("newGroup", false);
     
   }
 
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index 00ad27dc3..8aef7653a 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -3,7 +3,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { Event } from '../../../../models/event.model';
 import { ModalController, PopoverController } from '@ionic/angular';
 import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page';
@@ -656,7 +656,6 @@ export class ExpedienteDetailPage implements OnInit {
 
   openNewGroupPage() {
     if (window.innerWidth < 701) {
-      this.router.navigate(['/home/chat']);
       this.newGroup();
     }
     else {
@@ -666,7 +665,9 @@ export class ExpedienteDetailPage implements OnInit {
       this.dataService.set("task", this.task);
       this.dataService.set("newGroupName", this.task.Folio);
       this.dataService.set("documents", this.fulltask.Documents);
-      this.router.navigate(['/home/chat']);
+      setTimeout(()=> {
+        this.router.navigate(['/home/chat']);
+      }, 100)
     }
   }
 
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 91f55dd47..8f4ab1ea6 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -232,7 +232,7 @@ export class RoomService {
     this.countDownTime = "Expired";
     let body = { "roomId": this.id }
 
-    this.chatService.getRoomInfo(this.id).subscribe(room=>{
+    this.chatService.getRoomInfo(this.id).subscribe( room =>{
 
 
       if(this.t === 'p') {
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 87cb4b3b9..65f39bace 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -218,8 +218,6 @@ export class WsChatMethodsService {
 
 
     await this.storage.set('Rooms', rooms);
-    console.log("Done")
-
 
     setTimeout(() => {
       this.sortRoomList()
@@ -247,7 +245,6 @@ export class WsChatMethodsService {
    */
   subscribeToRoom() {
 
-    console.log('subcribe/////////////////////////////////')
     for (const id in this.dm) {
       this.defaultSubtribe(id)
     }
@@ -297,15 +294,11 @@ export class WsChatMethodsService {
     this.WsChatService.subStreamNotifyRoom(id, 'readMessage', false).then((subscription) => {
       const room =  this.getRoomById(id);
       room.status.receive.readMessage = true;
-      // console.log(subscription, "subStreamNotifyRoom");
-      //
     })
 
     this.WsChatService.streamNotifyRoomDeleteMessage(id).then((subscription) => {
       const room =  this.getRoomById(id);
       room.status.receive.deleteMessage = true;
-      // console.log(subscription);
-      //
     })
   }
 
@@ -362,7 +355,6 @@ export class WsChatMethodsService {
 
           this.dm[roomId] = room
           this._dm.push(room)
-          // console.log(this._dm)
           this.dmCount++
 
         } else {
diff --git a/src/app/services/data.service.ts b/src/app/services/data.service.ts
index cfc40e5dd..4b715eb73 100644
--- a/src/app/services/data.service.ts
+++ b/src/app/services/data.service.ts
@@ -6,7 +6,7 @@ import { Injectable } from '@angular/core';
 export class DataService {
 
 
-  private data = {}
+  data = {}
   constructor() { }
 
   set(name: string, value: any) {
diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts
index 309b88ef1..dbcc56ad8 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -48,23 +48,14 @@ export class NewGroupPage implements OnInit{
   }
 
   ngOnInit() {
-    this.router.events.forEach((event) => {
-      if (event instanceof NavigationStart && event.url.startsWith('/home/chat')) {
-        if (this.dataService.get("newGroup")) {
-          this.task =   this.dataService.get("task");
-          this.groupName = this.task.Folio;
-          this.documents = this.dataService.get("documents");
-        }
-      }
-      else{
-        this.dataService.set("newGroup", false);
-      }
-    });
-
+    this.task =   this.dataService.get("task");
+    this.groupName = this.task.Folio;
+    this.documents = this.dataService.get("documents");
+    console.log(this.dataService.data);
+    this.dataService.set("newGroup", false);
   }
 
-  _ionChange(event){
-    
+  _ionChange(event) {
     
     this.showDuration = event.detail.checked;
 
@@ -77,7 +68,7 @@ export class NewGroupPage implements OnInit{
   }
 
   close() {
-
+    this.dataService.set("newGroup", false);
     this.addGroupMessage.emit();
   }