From 9a8be67bd170bad94ac77a310f1c9d8fbd988c6d Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 17 Dec 2021 16:54:18 +0100 Subject: [PATCH 1/9] add skeleton to chat list --- src/app/pages/chat/chat.page.html | 35 +++++++++++++++++++++-- src/app/pages/chat/chat.page.ts | 32 ++++++--------------- src/assets/icon/icons-chat-grey.svg | 3 ++ src/assets/icon/icons-group-chat-grey.svg | 4 +++ 4 files changed, 49 insertions(+), 25 deletions(-) create mode 100644 src/assets/icon/icons-chat-grey.svg create mode 100644 src/assets/icon/icons-group-chat-grey.svg diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 31a2b15a3..ecbfa38e8 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -44,7 +44,7 @@
-
@@ -85,9 +85,24 @@
+ +
+
+
+
+
+
+
+
+ + +
+
+
+ - +
@@ -123,9 +138,25 @@
+ +
+
+
+
+
+
+
+
+ + +
+
+
+ + diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 074c036e7..f5c856890 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -131,7 +131,7 @@ export class ChatPage implements OnInit { this.modalController.dismiss(); } }; - + this.showLoader = true; } ngOnInit() { @@ -178,6 +178,10 @@ export class ChatPage implements OnInit { }); } + numSequence(n: number): Array { + return Array(n); + } + ngOnDestroy() { this.setStatus('offline'); this.dataService.set("newGroup", false); @@ -386,10 +390,12 @@ export class ChatPage implements OnInit { load() { switch (this.segment) { case "Contactos": + this.showLoader = true; this.getDirectMessages(); break; case "Grupos": + this.showLoader = true; this.getGroups(); break; } @@ -483,14 +489,10 @@ export class ChatPage implements OnInit { } async getDirectMessages(event?) { - this.chatService.getAllDirectMessages().subscribe(async (res: any) => { - - + this.showLoader = false; this.transformDataRoomList(res.ims) - this.getDirectMessagesDB() - console.log('Chat list', res); if (res != 200) { @@ -501,13 +503,6 @@ export class ChatPage implements OnInit { return dateB - dateA; }); } - //console.log(res.ims); - /* this.userDirectMessages = res.ims.sort((a, b) => { - var dateA = new Date(a._updatedAt).getTime(); - var dateB = new Date(b._updatedAt).getTime(); - return dateB - dateA; - }); */ - //console.log(this.userDirectMessages); if (this.route.url != "/home/chat") { //console.log("Timer message stop") @@ -522,7 +517,6 @@ export class ChatPage implements OnInit { } else { //console.log('No timer!'); - } } } @@ -555,19 +549,14 @@ export class ChatPage implements OnInit { async getGroups(event?) { this.result = this.chatService.getAllPrivateGroups().subscribe(async (res: any) => { //console.log(res); + this.showLoader = false; if (res.groups != 200) { - this.privateGroups = res.groups; - /* this.result = this.chatService.getAllUserChannels().subscribe((res:any)=>{ - this.publicGroups = res.channels; */ - //let all = this.privateGroups.concat(this.publicGroups); this.allGroups = this.privateGroups.sort((a, b) => { var dateA = new Date(a._updatedAt).getTime(); var dateB = new Date(b._updatedAt).getTime(); return dateB - dateA; }); - //console.log(this.allGroups); - /* }); */ if (this.route.url != "/home/chat") { console.log("Timer message stop") } @@ -576,15 +565,12 @@ export class ChatPage implements OnInit { if (this.segment == "Grupos" && this.showGroupMessages != true) { await new Promise(resolve => setTimeout(resolve, 1000)); await this.getGroups(); - //console.log('Timer groups list running') } } - } else { await this.getGroups(); } - }); } diff --git a/src/assets/icon/icons-chat-grey.svg b/src/assets/icon/icons-chat-grey.svg new file mode 100644 index 000000000..fd48a0b5e --- /dev/null +++ b/src/assets/icon/icons-chat-grey.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/icons-group-chat-grey.svg b/src/assets/icon/icons-group-chat-grey.svg new file mode 100644 index 000000000..dd9a839fa --- /dev/null +++ b/src/assets/icon/icons-group-chat-grey.svg @@ -0,0 +1,4 @@ + + + + From 13273a88e0ad149d51fa0f2e1e036d27acda875d Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 23 Dec 2021 08:17:44 +0100 Subject: [PATCH 2/9] change api route to equilibrium --- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index a8ccf00ce..1effa3995 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,6 +1,6 @@ export const environment = { production: true, - apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', + apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V5/api/', apiChatUrl: 'https://www.tabularium.pt/api/v1/', domain: 'gabinetedigital.local', defaultuser: '', diff --git a/src/environments/environment.ts b/src/environments/environment.ts index d49e7715f..038fc3365 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,8 +4,8 @@ export const environment = { production: false, - //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', - apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', + apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V5/api/', + //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', apiChatUrl: 'https://www.tabularium.pt/api/v1/', /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */ domain: 'gabinetedigital.local', //gabinetedigital.local From 3f126377a634726b2a6b882f42f529c7e73b7b6e Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 23 Dec 2021 09:09:54 +0100 Subject: [PATCH 3/9] change API to gabinetedigital --- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 1effa3995..a8ccf00ce 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,6 +1,6 @@ export const environment = { production: true, - apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V5/api/', + apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', apiChatUrl: 'https://www.tabularium.pt/api/v1/', domain: 'gabinetedigital.local', defaultuser: '', diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 038fc3365..f87cd0d28 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V5/api/', + apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', apiChatUrl: 'https://www.tabularium.pt/api/v1/', /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */ From 8c8efeae9468782b9fae89cea7be2a2cb25f5474 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 27 Dec 2021 15:00:55 +0100 Subject: [PATCH 4/9] save --- src/app/pages/chat/chat.page.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 78cc92b1a..42ad111ad 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -72,8 +72,9 @@
{{dm.lastMessage.msg}} - - {{dm.lastMessage.file.name}} + + + {{dm.lastMessage.file.name || dm.lastMessage.file.subject }}
@@ -110,8 +111,9 @@
{{group.lastMessage.u.name}}: {{group.lastMessage.msg}}
- - {{group.lastMessage.file.name}} + + + {{group.lastMessage.file.name || group.lastMessage.file.subject}}
From f8498a7a52203c61745a0a357cea8d05ca08a3c6 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 27 Dec 2021 16:00:20 +0100 Subject: [PATCH 5/9] add ellipsis in groups --- src/app/pages/chat/chat.page.html | 4 ++-- src/app/pages/chat/chat.page.scss | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 42ad111ad..72a87cf89 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -110,10 +110,10 @@
{{group.lastMessage.u.name}}: {{group.lastMessage.msg}}
-
+
- {{group.lastMessage.file.name || group.lastMessage.file.subject}} + {{group.lastMessage.file.name || group.lastMessage.file.subject}}
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss index 2fc786346..e192f166b 100644 --- a/src/app/pages/chat/chat.page.scss +++ b/src/app/pages/chat/chat.page.scss @@ -126,6 +126,11 @@ ion-content{ } .item-files{ float: left; + overflow: auto; + + .item-files-title{ + width: 100%; + } } } .item-description-active{ From b33e7227893819d8914dd64729006806c6dfaa54 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 27 Dec 2021 16:04:05 +0100 Subject: [PATCH 6/9] save --- src/app/pages/chat/chat.page.html | 12 +++++++----- src/app/pages/chat/chat.page.scss | 5 +++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 78cc92b1a..72a87cf89 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -72,8 +72,9 @@
{{dm.lastMessage.msg}} - - {{dm.lastMessage.file.name}} + + + {{dm.lastMessage.file.name || dm.lastMessage.file.subject }}
@@ -109,9 +110,10 @@
{{group.lastMessage.u.name}}: {{group.lastMessage.msg}}
-
- - {{group.lastMessage.file.name}} +
+ + + {{group.lastMessage.file.name || group.lastMessage.file.subject}}
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss index 2fc786346..e192f166b 100644 --- a/src/app/pages/chat/chat.page.scss +++ b/src/app/pages/chat/chat.page.scss @@ -126,6 +126,11 @@ ion-content{ } .item-files{ float: left; + overflow: auto; + + .item-files-title{ + width: 100%; + } } } .item-description-active{ From 4d0975968c69062d050b6d74449071a0d3a4d5b9 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 28 Dec 2021 11:14:16 +0100 Subject: [PATCH 7/9] save --- src/app/pages/gabinete-digital/pendentes/pendentes.page.ts | 3 +++ src/app/shared/gabinete-digital/pendentes/pendentes.page.ts | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index c06053412..06fb79049 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -164,6 +164,9 @@ export class PendentesPage implements OnInit { if (WorkflowName == 'Despacho') { this.router.navigate(['/home/gabinete-digital/despachos', SerialNumber, 'gabinete-digital']); } + else if (WorkflowName == 'Despacho do Presidente da República') { + this.router.navigate(['/home/gabinete-digital/despachos', SerialNumber, 'gabinete-digital']); + } else if (WorkflowName == 'Pedido de Parecer' || WorkflowName == 'Pedido de Deferimento' || WorkflowName == 'Pedido de Parecer do Presidente') { this.router.navigate(['/home/gabinete-digital/pedidos', SerialNumber, 'gabinete-digital']); } diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index c74f98171..6ee44b91a 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -82,6 +82,9 @@ export class PendentesPage implements OnInit { if(WorkflowName == 'Despacho') { this.router.navigate(['/home/gabinete-digital/despachos',SerialNumber,'gabinete-digital']); } + else if (WorkflowName == 'Despacho do Presidente da República') { + this.router.navigate(['/home/gabinete-digital/despachos', SerialNumber, 'gabinete-digital']); + } else if(WorkflowName == 'Pedido de Parecer' || WorkflowName == 'Pedido de Deferimento' || WorkflowName == 'Pedido de Parecer do Presidente') { this.router.navigate(['/home/gabinete-digital/pedidos',SerialNumber,'gabinete-digital']); } From a2de189d9e1a2ea9499e4a054892b7839b7316e0 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 28 Dec 2021 11:30:16 +0100 Subject: [PATCH 8/9] add success message when creating despacho in MD profile --- src/app/modals/create-process/create-process.page.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 9e65782ad..6417a56ce 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -290,6 +290,7 @@ export class CreateProcessPage implements OnInit { await this.despachoService.EfectuarDespacho({serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise(); this.modalController.dismiss(); + this.toastService._successMessage('Despacho criado'); } catch (error) { this.toastService._badRequest('Processo não efectuado'); From 2e05e9410c956bf5a5ed601c124dfc8776fd6761 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 29 Dec 2021 15:48:35 +0100 Subject: [PATCH 9/9] change chat API to gabinetedigitalchatx.dyndns,info --- src/app/pages/login/login.page.ts | 8 ++++---- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index c99117ce5..2197ab7ae 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -90,13 +90,13 @@ export class LoginPage implements OnInit { domainName: environment.domain, BasicAuthKey: "" } - + const loader = this.toastService.loading() let attempt = await this.authService.login(this.userattempt, {saveSession: false}) loader.remove() - + if (attempt) { if (attempt.UserId == SessionStore.user.UserId) { @@ -104,7 +104,7 @@ export class LoginPage implements OnInit { await this.authService.loginChat(this.userattempt); this.getToken(); SessionStore.setInativity(true); - + this.goback() } else { @@ -113,7 +113,7 @@ export class LoginPage implements OnInit { window.localStorage.clear(); await this.authService.SetSession(attempt, this.userattempt); - + this.changeProfileService.run() await this.authService.loginChat(this.userattempt); this.getToken(); diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index a8ccf00ce..39a448aa0 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,7 +1,7 @@ export const environment = { production: true, apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', - apiChatUrl: 'https://www.tabularium.pt/api/v1/', + apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/', domain: 'gabinetedigital.local', defaultuser: '', defaultuserpwd: '' diff --git a/src/environments/environment.ts b/src/environments/environment.ts index f87cd0d28..6b3c2fb1d 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -6,7 +6,8 @@ export const environment = { production: false, apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', - apiChatUrl: 'https://www.tabularium.pt/api/v1/', + apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/', + //apiChatUrl: 'https://www.tabularium.pt/api/v1/', /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */ domain: 'gabinetedigital.local', //gabinetedigital.local defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local