diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0d2e5eca1..29a6ee156 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -28,6 +28,8 @@ import { CalendarModule, DateAdapter } from 'angular-calendar'; import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { MessagesPage } from './pages/chat/messages/messages.page'; +import { WebsocketService } from './services/websocket.service' +import { ChatService } from './services/chat.service' // import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx'; @@ -57,7 +59,9 @@ import { MessagesPage } from './pages/chat/messages/messages.page'; //File, WebView, FilePath, - //FCM + //FCM, + WebsocketService, + ChatService, ], bootstrap: [AppComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index d67ffc9d0..49ace9468 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -90,6 +90,7 @@ + diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 16b1c3649..b71e1fa79 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -101,9 +101,7 @@ export class ChatPage implements OnInit { private resolver: ComponentFactoryResolver, ){ this.headers = new HttpHeaders(); - chatService.messages.subscribe(msg => { - console.log("Response from websocket: " + msg); - }); + this.loadMessage(); } ngOnInit() { @@ -120,6 +118,11 @@ export class ChatPage implements OnInit { /* Fim websocket functions */ } +loadMessage(){ + this.chatService.messages.subscribe(msg => { + console.log("Response from websocket: " + msg); + }); +} sendMsg() { console.log("new message from client to websocket: ", this.message); this.chatService.messages.next(this.message); diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts index 23f4d198b..c2992d885 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts @@ -77,11 +77,11 @@ openExpedientDetailPage(data){ let result = await this.processes.GetTasksList("Despacho", false).toPromise(); - let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); + //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); console.log(result); - await despachos.forEach( (element, index) => { + await result.forEach( (element, index) => { let task = { "SerialNumber": element.serialNumber, diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 424695294..12768df68 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -158,8 +158,7 @@ export class GabineteDigitalPage implements OnInit { let expedientes = await this.processesbackend.GetTasksList("Expediente", false).toPromise(); this.count_exp_dailywork = Object.keys(expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; - let result = await this.processesbackend.GetTasksList("Despacho", false).toPromise(); - let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); + let despachos = await this.processesbackend.GetTasksList("Despacho", false).toPromise(); this.count_desp_dailywork = Object.keys(despachos).length; let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise(); diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index 27ab95e42..c73767b2a 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -45,11 +45,7 @@ export class ChatService { this.messages = >this.wsService.connect(this.SERVER_URL).map((response: MessageEvent): any => { let data = JSON.parse(response.data); console.log(data); - - return { - id: data.id, - msg: data.msg - }; + return (JSON.stringify(data)); }); } diff --git a/src/app/services/websocket.service.ts b/src/app/services/websocket.service.ts index 7f94f614b..a4a9d8471 100644 --- a/src/app/services/websocket.service.ts +++ b/src/app/services/websocket.service.ts @@ -24,6 +24,9 @@ export class WebsocketService { private create(url): Rx.Subject { let ws = new WebSocket(url); + console.log(ws); + + let observable = Rx.Observable.create((obs: Rx.Observer) => { ws.onmessage = obs.next.bind(obs); ws.onerror = obs.error.bind(obs); diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index 267b5c005..1647fa141 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -77,11 +77,11 @@ export class DespachosPage implements OnInit { this.despachoList = new Array(); let result = await this.processes.GetTasksList("Despacho", false).toPromise(); - let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); + //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); console.log(result); - await despachos.forEach( (element, index) => { + await result.forEach( (element, index) => { let task = { "SerialNumber": element.serialNumber, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index d66d0a6fe..dc744cf22 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,8 +4,8 @@ export const environment = { production: false, - apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/', - /* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */ + /* apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/', */ + apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/', apiChatUrl: 'https://www.tabularium.pt/api/v1/', /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */ domain: 'gabinetedigital.local',