From 9823e58938466ebd90190eff7e2a64aa65d68262 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 22 Apr 2022 16:42:37 +0100 Subject: [PATCH] fix --- .../pages/publications/new-action/new-action.page.ts | 3 --- src/app/services/auth.service.ts | 2 ++ .../shared/publication/new-action/new-action.page.ts | 7 ++----- src/environments/environment.ts | 11 +++++------ 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts index 86c03aae3..32ef3d82d 100644 --- a/src/app/pages/publications/new-action/new-action.page.ts +++ b/src/app/pages/publications/new-action/new-action.page.ts @@ -106,9 +106,6 @@ export class NewActionPage implements OnInit { if(new Date(this.folder.DateBegin).toISOString() > new Date(this.folder.DateEnd).toISOString()){ this.toastService.badRequest("A data de início não pode ser superior a data de fim"); } - else if(this.folder.DateBegin > new Date().toISOString()){ - this.toastService.badRequest("A data de início não pode ser superior a data actual"); - } } injectValidation() { diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 32200beff..7a8a6196d 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -198,9 +198,11 @@ export class AuthService { this.WsChatService.setStatus('online') + // alert('wsLogin') }).catch((message) => { console.log('rocket chat login failed', message) + // alert('ws login failed') }) diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts index a91343064..a4b60fb0a 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -79,12 +79,9 @@ export class NewActionPage implements OnInit { runValidation() { this.validateFrom = true; - if((new Date(this.folder.DateBegin).getTime()) > (new Date(this.folder.DateEnd).getTime())){ + if((new Date(this.folder.DateBegin).getTime()) > (new Date(this.folder.DateEnd).getTime())) { this.toastService._badRequest("A data de início não pode ser superior a data de fim"); } - else if(new Date(this.folder.DateBegin).getTime() > new Date().getTime()){ - this.toastService._badRequest("A data de início não pode ser superior a data actual"); - } } injectValidation() { @@ -142,7 +139,7 @@ export class NewActionPage implements OnInit { } - close(){ + close() { this.closeDesktopComponent.emit(); } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 66aadc18b..7e7f4b472 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -21,13 +21,12 @@ 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://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/', */ + 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', domain: 'gabinetedigital.local', //gabinetedigital.local defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local defaultuserpwd: 'tabteste@006', //tabteste@006,