From 8c5ffb657d9cde19082a94f62585ddb87af72f5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Mon, 26 Sep 2022 22:09:08 +0100 Subject: [PATCH] start chat from expedient bug solved --- ...bucket-pipelines.yml => bitbucket-pipelines.yml | 0 src/app/pages/chat/chat.page.ts | 14 +++++++++++--- .../expediente-detail/expediente-detail.page.ts | 5 ++--- 3 files changed, 13 insertions(+), 6 deletions(-) rename __bitbucket-pipelines.yml => bitbucket-pipelines.yml (100%) diff --git a/__bitbucket-pipelines.yml b/bitbucket-pipelines.yml similarity index 100% rename from __bitbucket-pipelines.yml rename to bitbucket-pipelines.yml diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 4a1831bd7..a48aa13ca 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -145,8 +145,16 @@ export class ChatPage implements OnInit { let t = this.showDateDuration(new Date()); - this.router.events.forEach((event) => { - if (event instanceof NavigationStart && event.url.startsWith('/home/chat')) { + if (this.dataService.get("newGroup")) { + this.openNewGroupPage(); + } + 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(); } @@ -158,7 +166,7 @@ export class ChatPage implements OnInit { else{ this.dataService.set("newGroup", false); } - }); + }); */ } numSequence(n: number): Array { 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 ca2f1b71f..00ad27dc3 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 @@ -660,14 +660,13 @@ export class ExpedienteDetailPage implements OnInit { this.newGroup(); } else { - console.log(this.task) - console.log(this.fulltask) + // console.log(this.task) + // console.log(this.fulltask) this.dataService.set("newGroup", true); 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']); - this.newGroup(); } }