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'); diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 78cc92b1a..d65c8aa73 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -44,7 +44,7 @@
-
@@ -72,8 +72,9 @@
{{dm.lastMessage.msg}} - - {{dm.lastMessage.file.name}} + + + {{dm.lastMessage.file.name || dm.lastMessage.file.subject }}
@@ -85,9 +86,24 @@
+ +
+
+
+
+
+
+
+
+ + +
+
+
+ - +
@@ -109,9 +125,10 @@
{{group.lastMessage.u.name}}: {{group.lastMessage.msg}}
-
- - {{group.lastMessage.file.name}} +
+ + + {{group.lastMessage.file.name || group.lastMessage.file.subject}}
@@ -123,9 +140,25 @@
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
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{ diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 7642823f8..089e1e658 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -133,7 +133,7 @@ export class ChatPage implements OnInit { this.modalController.dismiss(); } }; - + this.showLoader = true; } ngOnInit() { @@ -183,6 +183,10 @@ export class ChatPage implements OnInit { }); } + numSequence(n: number): Array { + return Array(n); + } + ngOnDestroy() { this.setStatus('offline'); this.dataService.set("newGroup", false); @@ -392,10 +396,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; } @@ -536,14 +542,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) { @@ -571,7 +573,6 @@ export class ChatPage implements OnInit { } else { //console.log('No timer!'); - } } } @@ -710,6 +711,7 @@ 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.transformGroups(res.groups); @@ -735,15 +737,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/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/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/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']); } 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 @@ + + + + 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