From f3c2d638a18b113619b413bf682e9309552bbec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Mon, 26 Sep 2022 09:10:55 +0100 Subject: [PATCH 1/4] Remove text from login page --- src/app/pages/login/login.page.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index 55ac044ef..c2809e856 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -37,7 +37,8 @@
-

Uma iniciativa do Gabinete do Calendário Partilhado

+ +

From ea3002e8c785d2c3179726f0938fe01b9fe56547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Mon, 26 Sep 2022 11:26:35 +0100 Subject: [PATCH 2/4] Text add to icon on header for bigger view --- src/app/shared/header/header.page.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index c014be5d8..a7a821596 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -60,11 +60,10 @@
- +
+

Calendário Partilhado

From 2384692c1b94d0e96a7d827c36612c7845ecd0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Mon, 26 Sep 2022 15:55:15 +0100 Subject: [PATCH 3/4] Start chat from expedientes --- .../expediente/expediente-detail/expediente-detail.page.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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..ca2f1b71f 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,13 +660,14 @@ 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(); } } 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 4/4] 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(); } }