From 8970d4579dbe89c8f892f610049a362ad8f157b4 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 12 Apr 2022 15:48:32 +0100 Subject: [PATCH 1/3] fix --- src/app/pages/agenda/agenda.page.html | 8 +- src/app/pages/agenda/agenda.page.ts | 2 +- .../pages/chat/messages/messages.module.ts | 2 + .../pages/chat/messages/messages.page.html | 2 +- .../book-meeting-modal.page.html | 29 +++- .../book-meeting-modal.page.ts | 7 +- src/app/services/auth.service.ts | 3 + src/app/services/events.service.ts | 153 ++++++++++-------- src/environments/environment.ts | 4 +- 9 files changed, 129 insertions(+), 81 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 7a2f91fa7..5d7289ebb 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -104,7 +104,7 @@ -
+
{{ sessionStore.getInitials }}
@@ -116,11 +116,11 @@
- - @@ -294,7 +294,7 @@
-
+
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 91328044d..041202de9 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -208,7 +208,7 @@ export class AgendaPage implements OnInit { } else if (this.loggeduser.Profile == 'PR') { this.profile = "pr"; } else { - if(this.eventService.calendarOwnerIds.length >= 2) { + if(this.eventService.calendarIds.length >= 2) { this.profile = "mdgpr"; } else if (this.eventService.hasOwnCalendar) { this.profile = "mdgpr"; diff --git a/src/app/pages/chat/messages/messages.module.ts b/src/app/pages/chat/messages/messages.module.ts index ff08a70a5..83d0d168c 100644 --- a/src/app/pages/chat/messages/messages.module.ts +++ b/src/app/pages/chat/messages/messages.module.ts @@ -12,6 +12,7 @@ import { BtnModalDismissPage } from 'src/app/shared/btn-modal-dismiss/btn-modal- import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { MatMenuModule } from '@angular/material/menu'; import { LettersAvatarModule } from "ngx-letters-avatar"; +import { PipesModule } from 'src/app/pipes/pipes.module'; @NgModule({ imports: [ @@ -22,6 +23,7 @@ import { LettersAvatarModule } from "ngx-letters-avatar"; MessagesPageRoutingModule, MatMenuModule, LettersAvatarModule, + PipesModule, ], declarations: [MessagesPage] }) diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 205a59230..d34d99f9a 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -136,7 +136,7 @@
-
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 8c81e2375..e4e49e283 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -24,6 +24,8 @@
+ +
@@ -35,16 +37,29 @@
- + + Meu Calendário + + + Calendário de {{ sessionStore.user.ManagerName}} + + + + +
-
--> +
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 08d599ff8..93b130b0b 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -20,6 +20,7 @@ import * as _rollupMoment from 'moment'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; import { ThemeService } from 'src/app/services/theme.service' +import { SessionStore } from 'src/app/store/session.service'; const moment = _rollupMoment || _moment; @@ -117,6 +118,9 @@ export class BookMeetingModalPage implements OnInit { loggeduser: LoginUserRespose; emptyTextDescription = "Sem intervenientes selecionados"; + CalendarName: 'myCalendar' | 'sharedCalendar' = 'myCalendar' + sessionStore = SessionStore; + constructor( private modalController: ModalController, private router:Router, @@ -133,7 +137,6 @@ export class BookMeetingModalPage implements OnInit { this.loggeduser = authService.ValidatedUser; this.task = this.navParams.get('task'); - console.log(this.task) this.postData = new Event(); this.eventBody = { BodyType : "1", Text : ""}; this.postData.Body = this.eventBody; @@ -145,11 +148,11 @@ export class BookMeetingModalPage implements OnInit { this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000))); this.postData.Category = 'Reunião' + } ngOnInit() { this.adding = "intervenient"; - console.log(this.task); this.getAttachments(); this.setDefaultTime() this.getRecurrenceTypes(); diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 4a8ecd238..3cebb8fc3 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -126,6 +126,9 @@ export class AuthService { session.BasicAuthKey = user.BasicAuthKey + + console.log(session) + SessionStore.reset(session) this.ValidatedUser = SessionStore.user; this.storageService.store(AuthConnstants.USER, response); diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 24284550b..91c84a74b 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -41,7 +41,7 @@ export class EventsService { hasOwnCalendar = false - calendarOwnerIds = [] + calendarIds = [] constructor( private http: HttpClient, @@ -83,19 +83,13 @@ export class EventsService { this.hasSharedCalendar = false this.hasOwnCalendar = false - this.calendarOwnerIds = [] + this.calendarIds = [] if (this.loggeduser) { if (this.loggeduser.Profile == 'MDGPR') { this.loggeduser.OwnerCalendars.forEach(calendar => { - if(!this.calendarOwnerIds.includes(calendar.OwnerUserId)) { - this.calendarOwnerIds.push(calendar.OwnerUserId) - } - - this.hasOwnCalendar = true - if (calendar.CalendarName == 'Oficial') { this.headersMdOficial = this.headersMdOficial.set('Authorization', this.loggeduser.BasicAuthKey); this.headersMdOficial = this.headersMdOficial.set('CalendarId', calendar.CalendarId); @@ -111,12 +105,6 @@ export class EventsService { this.loggeduser.SharedCalendars.forEach(sharedCalendar => { - if(!this.calendarOwnerIds.includes(sharedCalendar.OwnerUserId)) { - this.calendarOwnerIds.push(sharedCalendar.OwnerUserId) - } - - this.hasSharedCalendar = true - if (sharedCalendar.CalendarName == 'Oficial') { this.headersSharedOficial = this.headersSharedOficial.set('Authorization', this.loggeduser.BasicAuthKey); this.headersSharedOficial = this.headersSharedOficial.set('CalendarId', sharedCalendar.CalendarId); @@ -129,16 +117,11 @@ export class EventsService { } }); } + else if (this.loggeduser.Profile == 'PR') { this.loggeduser.OwnerCalendars.forEach(calendar => { - if(!this.calendarOwnerIds.includes(calendar.OwnerUserId)) { - this.calendarOwnerIds.push(calendar.OwnerUserId) - } - - this.hasOwnCalendar = true - if (calendar.CalendarName == 'Oficial') { this.headersPrOficial = this.headersPrOficial.set('Authorization', this.loggeduser.BasicAuthKey); this.headersPrOficial = this.headersPrOficial.set('CalendarId', calendar.CalendarId); @@ -151,55 +134,54 @@ export class EventsService { } }); - } else { - - - this.loggeduser.OwnerCalendars.forEach(calendar => { - - if(!this.calendarOwnerIds.includes(calendar.OwnerUserId)) { - this.calendarOwnerIds.push(calendar.OwnerUserId) - } - this.hasOwnCalendar = true - - if (calendar.CalendarName == 'Oficial') { - this.headerOwnOficial = this.headerOwnOficial.set('Authorization', this.loggeduser.BasicAuthKey); - this.headerOwnOficial = this.headerOwnOficial.set('CalendarId', calendar.CalendarId); - this.headerOwnOficial = this.headerOwnOficial.set('CalendarRoleId', calendar.CalendarRoleId); - this.headerOwnOficial = this.headerOwnOficial.set('CalendarName', calendar.CalendarName); - } - else if (calendar.CalendarName == 'Pessoal') { - this.headerOwnPessoal = this.headerOwnPessoal.set('Authorization', this.loggeduser.BasicAuthKey); - this.headerOwnPessoal =this.headerOwnPessoal.set('CalendarId', calendar.CalendarId); - this.headerOwnPessoal =this.headerOwnPessoal.set('CalendarRoleId', calendar.CalendarRoleId); - this.headerOwnPessoal = this.headerOwnPessoal.set('CalendarName', calendar.CalendarName); - } - }); + } - for (let sharedCalendar of this.loggeduser.SharedCalendars) { + this.loggeduser.OwnerCalendars.forEach(calendar => { - if(!this.calendarOwnerIds.includes(sharedCalendar.OwnerUserId)) { - this.calendarOwnerIds.push(sharedCalendar.OwnerUserId) - } - - this.hasSharedCalendar = true - - if (sharedCalendar.CalendarName == 'Oficial') { - sharedCalendar.CalendarName - this.headerSharedOficial = this.headerSharedOficial.set('Authorization', 'Basic '+sharedCalendar.CalendarToken); - this.headerSharedOficial = this.headerSharedOficial.set('CalendarId', sharedCalendar.CalendarId); - this.headerSharedOficial = this.headerSharedOficial.set('CalendarRoleId', sharedCalendar.CalendarRoleId); - this.headerSharedOficial = this.headerSharedOficial.set('CalendarName', sharedCalendar.CalendarName); - } - else if (sharedCalendar.CalendarName == 'Pessoal') { - this.headerSharedPessoal = this.headerSharedPessoal.set('Authorization', 'Basic '+sharedCalendar.CalendarToken); - this.headerSharedPessoal = this.headerSharedPessoal.set('CalendarId', sharedCalendar.CalendarId); - this.headerSharedPessoal = this.headerSharedPessoal.set('CalendarRoleId', sharedCalendar.CalendarRoleId); - this.headerSharedPessoal = this.headerSharedPessoal.set('CalendarName', sharedCalendar.CalendarName); - } + if(!this.calendarIds.includes(calendar.OwnerUserId)) { + this.calendarIds.push(calendar.OwnerUserId) + } + this.hasOwnCalendar = true + + if (calendar.CalendarName == 'Oficial') { + this.headerOwnOficial = this.headerOwnOficial.set('Authorization', this.loggeduser.BasicAuthKey); + this.headerOwnOficial = this.headerOwnOficial.set('CalendarId', calendar.CalendarId); + this.headerOwnOficial = this.headerOwnOficial.set('CalendarRoleId', calendar.CalendarRoleId); + this.headerOwnOficial = this.headerOwnOficial.set('CalendarName', calendar.CalendarName); + } + else if (calendar.CalendarName == 'Pessoal') { + this.headerOwnPessoal = this.headerOwnPessoal.set('Authorization', this.loggeduser.BasicAuthKey); + this.headerOwnPessoal =this.headerOwnPessoal.set('CalendarId', calendar.CalendarId); + this.headerOwnPessoal =this.headerOwnPessoal.set('CalendarRoleId', calendar.CalendarRoleId); + this.headerOwnPessoal = this.headerOwnPessoal.set('CalendarName', calendar.CalendarName); + } + }); + + + for (let sharedCalendar of this.loggeduser.SharedCalendars) { + + + if(!this.calendarIds.includes(sharedCalendar.OwnerUserId)) { + this.calendarIds.push(sharedCalendar.OwnerUserId) + } + + this.hasSharedCalendar = true + + if (sharedCalendar.CalendarName == 'Oficial') { + sharedCalendar.CalendarName + this.headerSharedOficial = this.headerSharedOficial.set('Authorization', 'Basic '+sharedCalendar.CalendarToken); + this.headerSharedOficial = this.headerSharedOficial.set('CalendarId', sharedCalendar.CalendarId); + this.headerSharedOficial = this.headerSharedOficial.set('CalendarRoleId', sharedCalendar.CalendarRoleId); + this.headerSharedOficial = this.headerSharedOficial.set('CalendarName', sharedCalendar.CalendarName); + } + else if (sharedCalendar.CalendarName == 'Pessoal') { + this.headerSharedPessoal = this.headerSharedPessoal.set('Authorization', 'Basic '+sharedCalendar.CalendarToken); + this.headerSharedPessoal = this.headerSharedPessoal.set('CalendarId', sharedCalendar.CalendarId); + this.headerSharedPessoal = this.headerSharedPessoal.set('CalendarRoleId', sharedCalendar.CalendarRoleId); + this.headerSharedPessoal = this.headerSharedPessoal.set('CalendarName', sharedCalendar.CalendarName); } - } this.headers = new HttpHeaders(); @@ -881,6 +863,49 @@ export class EventsService { } return this.http.post(`${geturl}`, body, options) } + + + genericPostExpedientEvent(docId: any, body: any, sharedagenda: string, serialNumber: any, applicationID: any, calendar: 'myCalendar' | 'sharedCalendar') { + const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente') + '/event'; + let params = new HttpParams(); + let options; + + params = params.set("DocId", docId); + params = params.set("SerialNumber", serialNumber); + params = params.set("applicationID", applicationID); + + if(calendar == 'myCalendar') { + if (body.CalendarName == 'Pessoal') { + options = { + headers: this.headerOwnPessoal, + params: params + } + } + else if (body.CalendarName == 'Oficial') { + options = { + headers: this.headerOwnOficial, + params: params + } + } + } else if (calendar == 'sharedCalendar') { + if (body.CalendarName == 'Pessoal') { + options = { + headers: this.headerSharedPessoal, + params: params + }; + } + else if (body.CalendarName == 'Oficial') { + options = { + headers: this.headerSharedOficial, + params: params + }; + } + } + + + return this.http.post(`${geturl}`, body, options) + } + createTaskEvent(folderId: any, body: any, sharedagenda: string, serialNumber: any, applicationID: any) { const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente') + '/dispatch'; let params = new HttpParams(); diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 5f8a0d1c3..ccd075da6 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -21,8 +21,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://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', + // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/', apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', //apiChatUrl: 'https://www.tabularium.pt/api/v1/', From b9031c71dd61cf8d25bef2698efabefd2f7b7005 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 13 Apr 2022 15:55:50 +0100 Subject: [PATCH 2/3] improve --- src/app/pages/chat/chat.page.html | 4 +- .../book-meeting-modal.page.html | 2 +- .../book-meeting-modal.page.ts | 40 ++++++++-------- src/app/services/events.service.ts | 47 ++++++++++++++++++- src/environments/environment.ts | 12 ++--- 5 files changed, 75 insertions(+), 30 deletions(-) diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 9e6a51349..4f0fd4379 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -94,7 +94,7 @@
- +
@@ -150,7 +150,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index e4e49e283..31baa1b62 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -37,7 +37,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 93b130b0b..8dbd73aa7 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -127,11 +127,12 @@ export class BookMeetingModalPage implements OnInit { private navParams: NavParams, private processes:ProcessesService, private attachmentsService: AttachmentsService, - private calendarService: EventsService, + public calendarService: EventsService, authService: AuthService, private toastService: ToastService, private activatedRoute: ActivatedRoute, - public ThemeService: ThemeService + public ThemeService: ThemeService, + ) { this.taskParticipants = []; this.loggeduser = authService.ValidatedUser; @@ -149,6 +150,18 @@ export class BookMeetingModalPage implements OnInit { this.postData.Category = 'Reunião' + + + if(this.calendarService.hasOwnCalendar == false || !this.calendarService.hasSharedCalendar == false) { + + if(this.calendarService.hasOwnCalendar == false && this.calendarService.hasSharedCalendar == true) { + this.CalendarName = 'sharedCalendar' + } else if (this.calendarService.hasOwnCalendar == true && this.calendarService.hasSharedCalendar == false) { + this.CalendarName = 'myCalendar' + } + + } + } ngOnInit() { @@ -265,19 +278,12 @@ export class BookMeetingModalPage implements OnInit { if(this.task.FsId == '8') { const loader = this.toastService.loading() + try { - switch (this.loggeduser.Profile) { - case 'MDGPR': - await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise(); - break; - - case 'PR': - await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise() - break; - } + await this.calendarService.genericPostExpedientEvent(this.task.DocId, this.postData, "",this.task.SerialNumber, this.task.FsId, this.CalendarName).toPromise(); + this.modalController.dismiss(); - // this.distartExpedientModal(); this.toastService._successMessage('Reunião criada'); } catch (error) { @@ -293,15 +299,9 @@ export class BookMeetingModalPage implements OnInit { const loader = this.toastService.loading() try { - switch (this.loggeduser.Profile) { - case 'MDGPR': - await this.calendarService.createTaskEvent(this.task.FolderID | this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise(); - break; - case 'PR': - await this.calendarService.createTaskEvent(this.task.FolderID | this.task.FolderId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise(); - break; - } + await this.calendarService.genericCreateTaskEvent(this.task.FolderID | this.task.FolderId, this.postData, "",this.task.SerialNumber, this.task.FsId, this.CalendarName).toPromise(); + this.close(); this.toastService._successMessage('Reunião criada'); diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 91c84a74b..9033d6981 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -866,7 +866,7 @@ export class EventsService { genericPostExpedientEvent(docId: any, body: any, sharedagenda: string, serialNumber: any, applicationID: any, calendar: 'myCalendar' | 'sharedCalendar') { - const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente') + '/event'; + const geturl = environment.apiURL + 'calendar/expediente'; let params = new HttpParams(); let options; @@ -948,6 +948,51 @@ export class EventsService { return this.http.post(`${geturl}`, body, options) } + + + genericCreateTaskEvent(folderId: any, body: any, sharedagenda: string, serialNumber: any, applicationID: any, calendar: 'myCalendar' | 'sharedCalendar') { + const geturl = environment.apiURL + 'calendar/dispatch'; + let params = new HttpParams(); + let options; + + params = params.set("FolderId", folderId); + params = params.set("SerialNumber", serialNumber); + params = params.set("applicationID", applicationID); + + if(calendar == 'myCalendar') { + if (body.CalendarName == 'Pessoal') { + options = { + headers: this.headerOwnPessoal, + params: params + } + } + else if (body.CalendarName == 'Oficial') { + options = { + headers: this.headerOwnOficial, + params: params + } + } + } else if (calendar == 'sharedCalendar') { + if (body.CalendarName == 'Pessoal') { + options = { + headers: this.headerSharedPessoal, + params: params + }; + } + else if (body.CalendarName == 'Oficial') { + options = { + headers: this.headerSharedOficial, + params: params + }; + } + } + + + return this.http.post(`${geturl}`, body, options) + } + + + postEventToApproveEdit(body: EventToApproveEdit) { const geturl = environment.apiURL + 'Tasks/EditEventTask'; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index ccd075da6..e1c6e905b 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -21,12 +21,12 @@ 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://gabinetedigitalchat.dyndns.info/api/v1/', - apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', - //apiChatUrl: 'https://www.tabularium.pt/api/v1/', - //apiWsChatUrl: 'wss://www.tabularium.pt/websocket', + //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', + apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', + //apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/', + //apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', + apiChatUrl: 'https://www.tabularium.pt/api/v1/', + apiWsChatUrl: 'wss://www.tabularium.pt/websocket', /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */ domain: 'gabinetedigital.local', //gabinetedigital.local defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local From 89a64436b99ae68907e7154bc18cefc1768631f4 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 13 Apr 2022 16:10:19 +0100 Subject: [PATCH 3/3] FIX --- src/environments/environment.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/environments/environment.ts b/src/environments/environment.ts index ccd075da6..e1c6e905b 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -21,12 +21,12 @@ 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://gabinetedigitalchat.dyndns.info/api/v1/', - apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', - //apiChatUrl: 'https://www.tabularium.pt/api/v1/', - //apiWsChatUrl: 'wss://www.tabularium.pt/websocket', + //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', + apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', + //apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/', + //apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', + apiChatUrl: 'https://www.tabularium.pt/api/v1/', + apiWsChatUrl: 'wss://www.tabularium.pt/websocket', /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */ domain: 'gabinetedigital.local', //gabinetedigital.local defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local