diff --git a/src/app/app.component.ts b/src/app/app.component.ts index f925c66fc..a40acec20 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -15,6 +15,7 @@ import { StorageService } from 'src/app/services/storage.service'; import { MessageModel } from './models/beast-orm'; import { InativityService } from "src/app/services/inativity.service"; import { ThemeService } from 'src/app/services/theme.service'; +import { environment } from 'src/environments/environment'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -51,6 +52,7 @@ export class AppComponent { ) { // this.createCacheFolder() this.initializeApp(); + console.log('version:'+ environment.version) } // async createCacheFolder(){ diff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts index 9beca8a4b..f179930b2 100644 --- a/src/app/guards/auth.guard.ts +++ b/src/app/guards/auth.guard.ts @@ -32,14 +32,10 @@ export class AuthGuard implements CanActivate { this.router.navigate(['/']); return false } else { - if(this.p.userPermission(this.p.permissionList.Chat.access) == true) { - // this.authService.loginChat(); - } const pathname = state.url if(pathname.startsWith('/home/agenda')) { - if(this.p.userPermission(this.p.permissionList.Agenda.access)) { return true; } else { @@ -48,6 +44,7 @@ export class AuthGuard implements CanActivate { } } else if ( pathname.startsWith('/home/gabinete-digital')) { + if(this.p.userPermission(this.p.permissionList.Gabinete.access)) { return true; @@ -86,6 +83,9 @@ export class AuthGuard implements CanActivate { } } + + + return true } } diff --git a/src/app/guards/inactivity.guard.ts b/src/app/guards/inactivity.guard.ts index e4cd3f7a8..224c5e7ba 100644 --- a/src/app/guards/inactivity.guard.ts +++ b/src/app/guards/inactivity.guard.ts @@ -21,6 +21,7 @@ export class InactivityGuard implements CanActivate { route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree { + console.log('hire inactinity!', state.url) if (this.platform.is('desktop') || this.platform.is('mobileweb')) { if(this.p.userPermission(this.p.permissionList.Agenda.access) || this.p.userPermission(this.p.permissionList.Gabinete.access)){ diff --git a/src/app/guards/login.guard.ts b/src/app/guards/login.guard.ts index 1cdddb1ea..4d8724808 100644 --- a/src/app/guards/login.guard.ts +++ b/src/app/guards/login.guard.ts @@ -19,9 +19,13 @@ export class LoginGuard implements CanActivate { route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree { + if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) { this.router.navigate(['/home/events']); return false + } else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && SessionStore.forceToLoginWithForceToLogInWithPassword && !this.platform.is('desktop') && !this.platform.is('mobileweb')) { + SessionStore.forceToLoginWithForceToLogInWithPassword = false + return true } else if(SessionStore.exist && !SessionStore.hasPin && !this.platform.is('desktop') && !this.platform.is('mobileweb') ) { this.router.navigate(['/pin']); return false diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 6e9fb303b..3836671d4 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -123,7 +123,8 @@ export class HomePage implements OnInit { } goto(url) { - this.router.navigate([url]) + // this.router.navigateByUrl('/home/events', { replaceUrl: true }); + this.router.navigate([url], { replaceUrl: true }) } refreshing() { } @@ -132,8 +133,8 @@ export class HomePage implements OnInit { this.logDeviceInfo(); - this.notificationsService.onReciveForeground(); - this.notificationsService.onReciveBackground(); + // this.notificationsService.onReciveForeground(); + // this.notificationsService.onReciveBackground(); window.addEventListener('online', () => { // console.log('Became online') diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index 939a7b98e..0de056f9f 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -178,7 +178,7 @@ export class ProfilePage implements OnInit { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital'])); } - this.notificationservice.tempClearArray(); + // this.notificationservice.tempClearArray(); this.deleteNotification(index); this.eventtrigger.publishSomeData({ notification: "deleted" diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 4e2c33a10..9814a6372 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -797,8 +797,8 @@ export class AgendaPage implements OnInit { this.listToPresent = this.CalendarStore.eventSource this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) - console.log(this.CalendarStore.eventSource) - console.log('this.TimelineMDList', this.TimelineMDList) + // console.log(this.CalendarStore.eventSource) + // console.log('this.TimelineMDList', this.TimelineMDList) this.myCal.update(); @@ -847,7 +847,7 @@ export class AgendaPage implements OnInit { this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) - console.log('this.TimelinePRList', this.TimelinePRList) + // console.log('this.TimelinePRList', this.TimelinePRList) // this.myCal.update(); diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 78c8864e2..d2fa65e96 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -79,54 +79,54 @@ export class EventsPage implements OnInit { private changeProfileService: ChangeProfileService, ) { - this.loggeduser = SessionStore.user; + // this.loggeduser = SessionStore.user; - this.platform.resize.subscribe(async () => { - // - // + // this.platform.resize.subscribe(async () => { + // // + // // - }); + // }); - window['zipPhoneCallback'] = function (zipphone) { - var frame = document.getElementById('home-iframe'); - if(frame) { - frame['contentWindow']['postMessage']({call:'cookies', value: { cookies: {} }}); - } - } + // window['zipPhoneCallback'] = function (zipphone) { + // var frame = document.getElementById('home-iframe'); + // if(frame) { + // frame['contentWindow']['postMessage']({call:'cookies', value: { cookies: {} }}); + // } + // } - this.changeProfileService.registerCallback(() => { + // this.changeProfileService.registerCallback(() => { - this.listToPresent = []; - this.listToPresentexpediente = [] - }) + // this.listToPresent = []; + // this.listToPresentexpediente = [] + // }) } ngOnInit() { - this.segment = "Combinada"; - this.profile = "mdgpr"; + // this.segment = "Combinada"; + // this.profile = "mdgpr"; - this.showGreeting(); + // this.showGreeting(); - this.router.events.forEach((event) => { - if (event instanceof NavigationEnd && event.url == '/home/events') { - this.RefreshEvents(); - setTimeout(() => { - this.LoadList(); - }, 1500) - } - }); - this.hideSearch(); + // this.router.events.forEach((event) => { + // if (event instanceof NavigationEnd && event.url == '/home/events') { + // this.RefreshEvents(); + // setTimeout(() => { + // this.LoadList(); + // }, 1500) + // } + // }); + // this.hideSearch(); - this.backgroundservice.registerBackService('Online', () => { - this.showGreeting(); - this.RefreshEvents(); - this.LoadList(); - this.hideSearch(); - }); + // this.backgroundservice.registerBackService('Online', () => { + // this.showGreeting(); + // this.RefreshEvents(); + // this.LoadList(); + // this.hideSearch(); + // }); } diff --git a/src/app/pages/inactivity/inactivity.page.html b/src/app/pages/inactivity/inactivity.page.html index 1b16c7224..4ffe27433 100644 --- a/src/app/pages/inactivity/inactivity.page.html +++ b/src/app/pages/inactivity/inactivity.page.html @@ -17,7 +17,7 @@
Digite o novo PIN
-
+
@@ -25,19 +25,19 @@
-
+
1
2
3
-
+
4
5
6
-
+
7
8
9
-
+
0
diff --git a/src/app/pages/inactivity/inactivity.page.scss b/src/app/pages/inactivity/inactivity.page.scss index 3cd90e111..bf2897b74 100644 --- a/src/app/pages/inactivity/inactivity.page.scss +++ b/src/app/pages/inactivity/inactivity.page.scss @@ -348,3 +348,8 @@ ion-item{ } + + +.hide { + opacity: 0 !important; +} \ No newline at end of file diff --git a/src/app/pages/inactivity/inactivity.page.ts b/src/app/pages/inactivity/inactivity.page.ts index 09a7d114c..954cc101e 100644 --- a/src/app/pages/inactivity/inactivity.page.ts +++ b/src/app/pages/inactivity/inactivity.page.ts @@ -38,7 +38,7 @@ export class InactivityPage implements OnInit { loop = false ngOnInit() { - + alert('pin') } runloop() { @@ -101,6 +101,8 @@ export class InactivityPage implements OnInit { } else { SessionStore.delete() window.localStorage.clear(); + + SessionStore.setInativity(true) await this.authService.SetSession(attempt, this.userattempt); } @@ -117,9 +119,9 @@ export class InactivityPage implements OnInit { } getToken() { - this.notificatinsservice.requestPermissions(); - this.notificatinsservice.registrationError(); - this.notificatinsservice.getAndpostToken(this.username); + // this.notificatinsservice.requestPermissions(); + // this.notificatinsservice.registrationError(); + // this.notificatinsservice.getAndpostToken(this.username); } setCode(code: string) { @@ -205,6 +207,8 @@ export class InactivityPage implements OnInit { enterWithPasswordButton() { this.enterWithPassword = true + SessionStore.forceToLoginWithForceToLogInWithPassword = true + this.router.navigate(['/']); } diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index b502ba9cd..4e418ba70 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -15,6 +15,8 @@ import { MessageModel, DeleteMessageModel } from '../../models/beast-orm'; import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-connector.service'; import { ChatSystemService } from 'src/app/services/chat/chat-system.service'; import { ChatService } from 'src/app/services/chat.service'; +import { Platform } from '@ionic/angular'; + @Component({ @@ -49,7 +51,8 @@ export class LoginPage implements OnInit { public p: PermissionService, private RochetChatConnectorService: RochetChatConnectorService, public ChatSystemService: ChatSystemService, - private ChatService: ChatService + private ChatService: ChatService, + private platform: Platform, ) {} ngOnInit() { @@ -93,9 +96,9 @@ export class LoginPage implements OnInit { } getToken() { - this.notificatinsservice.requestPermissions(); - this.notificatinsservice.registrationError(); - this.notificatinsservice.getAndpostToken(this.username); + // this.notificatinsservice.requestPermissions(); + // this.notificatinsservice.registrationError(); + // this.notificatinsservice.getAndpostToken(this.username); } async Login() { @@ -158,7 +161,13 @@ export class LoginPage implements OnInit { this.getToken(); - this.router.navigateByUrl('/home/events', { replaceUrl: true }); + if(!this.platform.is('desktop') && !this.platform.is('mobileweb')) { + this.router.navigateByUrl('/pin', { replaceUrl: true }); + } else { + this.router.navigateByUrl('/home/events'); + } + + } } else{ diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 8b8ede159..4b5cf4e4d 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -50,10 +50,13 @@ export class AuthService { this.headers = new HttpHeaders(); if (SessionStore.exist) { + + SessionStore.setInativity(true) if(this.p.userPermission(this.p.permissionList.Chat.access) == true ) { this.loginToChatWs() } + } diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index bff0e12e0..a9528172c 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -392,9 +392,13 @@ export class ChatService { } - } else { + } else if (!this.headers) { this.setheader() - await this.refreshtoken(); + this.refreshtoken() + } else { + setTimeout(async ()=>{ + await this.refreshtoken(); + }, 4000) } } diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index 56e5606d3..0dbce8010 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -136,9 +136,14 @@ export class MessageService { private usernameToDisplayName(username) { - const firstName = capitalizeTxt(username.split('.')[0]) - const lastName = capitalizeTxt(username.split('.')[1]) - return firstName + ' ' + lastName + try { + const firstName = capitalizeTxt(username.split('.')[0]) + const lastName = capitalizeTxt(username.split('.')[1]) + return firstName + ' ' + lastName + } catch (error) { + return username + } + } async send(): Promise { diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 826b29e0a..b424fa03b 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -992,9 +992,14 @@ export class RoomService { usernameToDisplayName(username) { - const firstName = capitalizeTxt(username.split('.')[0]) - const lastName = capitalizeTxt(username.split('.')[1]) - return firstName + ' ' + lastName + try { + const firstName = capitalizeTxt(username.split('.')[0]) + const lastName = capitalizeTxt(username.split('.')[1]) + return firstName + ' ' + lastName + } catch(error) { + return username + } + } sendReadMessage() { diff --git a/src/app/services/functions/time.service.ts b/src/app/services/functions/time.service.ts index 747ab7343..ce2ae0fb0 100644 --- a/src/app/services/functions/time.service.ts +++ b/src/app/services/functions/time.service.ts @@ -17,7 +17,7 @@ export class TimeService { end = new Date(); start = new Date(start); - const totalSeconds = Math.floor((end - (start))/1000);; + const totalSeconds = Math.floor((end - (start))/1000); const totalMinutes = Math.floor(totalSeconds/60); const totalHours = Math.floor(totalMinutes/60); const totalDays = Math.floor(totalHours/24); @@ -75,37 +75,37 @@ export class TimeService { } countDownDateTimer(date:any, roomId:string){ - let timer = setInterval(() =>{ - let difference = new Date(date).getTime() - new Date().getTime(); - let c_day = Math.floor(difference/(1000*60*60*24)); - let c_hours = Math.floor((difference % (1000*60*60*24)) / (1000*60*60)); - let c_minutes = Math.floor((difference % (1000*60*60)) / (1000*60)); - let c_seconds = Math.floor((difference % (1000*60)) / 1000); + // let timer = setInterval(() =>{ + // let difference = new Date(date).getTime() - new Date().getTime(); + // let c_day = Math.floor(difference/(1000*60*60*24)); + // let c_hours = Math.floor((difference % (1000*60*60*24)) / (1000*60*60)); + // let c_minutes = Math.floor((difference % (1000*60*60)) / (1000*60)); + // let c_seconds = Math.floor((difference % (1000*60)) / 1000); - this.countDownTime = this.addZero(c_day) + " : " + this.addZero(c_hours) + " : " + this.addZero(c_minutes) + " : " + this.addZero(c_seconds) ; + // this.countDownTime = this.addZero(c_day) + " : " + this.addZero(c_hours) + " : " + this.addZero(c_minutes) + " : " + this.addZero(c_seconds) ; - if(difference < 0) { - clearInterval(timer); - this.countDownTime = "Expired"; - let body = { "roomId":roomId, } - this.chatService.getRoomInfo(roomId).subscribe(room=>{ - this.room = room['room']; + // if(difference < 0) { + // clearInterval(timer); + // this.countDownTime = "Expired"; + // let body = { "roomId":roomId, } + // this.chatService.getRoomInfo(roomId).subscribe(room=>{ + // this.room = room['room']; - if(this.room.t === 'p'){ - this.chatService.deleteGroup(body).subscribe(res=>{ - this.ChatSystemService.deleteRoom(roomId) - }); - } - else{ + // if(this.room.t === 'p'){ + // this.chatService.deleteGroup(body).subscribe(res=>{ + // this.ChatSystemService.deleteRoom(roomId) + // }); + // } + // else{ - this.chatService.deleteChannel(body).subscribe(res=>{ - this.ChatSystemService.deleteRoom(roomId) - }); - } - }); - } - }) - return this.countDownTime; + // this.chatService.deleteChannel(body).subscribe(res=>{ + // this.ChatSystemService.deleteRoom(roomId) + // }); + // } + // }); + // } + // }) + // return this.countDownTime; } addZero(i) { diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index 7a74deb91..4c119b0b9 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -118,9 +118,9 @@ export class NotificationsService { }; this.http.post(`${geturl}`, body, { headers }).subscribe(data => { - console.log(data) + //console.log(data) }, (error) => { - console.log(error) + //console.log(error) }) }); diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index 9a28255fb..f18153a26 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -84,7 +84,7 @@ export class RequestOptionsPage implements OnInit { this.toastService._successMessage() this.close(); loader.remove() - },()=>{ + }, ()=> { loader.remove() this.toastService._badRequest('Processo não encontrado') diff --git a/src/app/store/session.service.ts b/src/app/store/session.service.ts index 955428411..493a2b39b 100644 --- a/src/app/store/session.service.ts +++ b/src/app/store/session.service.ts @@ -14,6 +14,8 @@ class SessionService { // local storage keyName private keyName: string; + forceToLoginWithForceToLogInWithPassword = false + constructor() { this.keyName = (SHA1(this.constructor.name)).toString() diff --git a/src/assets/MFPPushServiceWorker.js b/src/assets/MFPPushServiceWorker.js index a3e05af69..bb9b5ccde 100644 --- a/src/assets/MFPPushServiceWorker.js +++ b/src/assets/MFPPushServiceWorker.js @@ -2,116 +2,116 @@ /* eslint-disable no-undef */ /* eslint-disable no-restricted-globals */ -const regex = /{{\s*([^}]+)\s*}}/g; -var _pushVaribales = ""; +// const regex = /{{\s*([^}]+)\s*}}/g; +// var _pushVaribales = ""; -function interpolate(messageData) { - return function interpolate(o) { - return messageData.replace(regex, function (a, b) { - var r = o[b]; - return typeof r === 'string' || typeof r === 'number' ? r : a; - }); - } -} +// function interpolate(messageData) { +// return function interpolate(o) { +// return messageData.replace(regex, function (a, b) { +// var r = o[b]; +// return typeof r === 'string' || typeof r === 'number' ? r : a; +// }); +// } +// } -function createTemplateMessage(messageData) { - if (Object.keys(_pushVaribales).length > 0 ) { - var message = interpolate(messageData)(_pushVaribales); - return message; - } else { - return messageData; - } -} +// function createTemplateMessage(messageData) { +// if (Object.keys(_pushVaribales).length > 0 ) { +// var message = interpolate(messageData)(_pushVaribales); +// return message; +// } else { +// return messageData; +// } +// } -function displayNotification(event) { - var messageJson = event.data.text(); - messageJson = JSON.parse(messageJson); - var title = messageJson.title ? messageJson.title : "New message"; - var imageUrl = messageJson.iconUrl ? messageJson.iconUrl : "images/icon.png"; -// var tagJson = messageJson.payload; -// var tag = tagJson.tag ? tagJson.tag : ""; - var bodyAlert = messageJson.alert ? messageJson.alert : "Example message" - var payloadData = messageJson.payload ? messageJson.payload : "Example message" - let messageTemp; - if ((messageTemp = regex.exec(bodyAlert)) !== null) { - bodyAlert = createTemplateMessage(bodyAlert); - } - self.registration.showNotification(title, { - body: bodyAlert, - icon: imageUrl, - data: payloadData, -// tag: tag - }); - return Promise.resolve(); -} +// function displayNotification(event) { +// var messageJson = event.data.text(); +// messageJson = JSON.parse(messageJson); +// var title = messageJson.title ? messageJson.title : "New message"; +// var imageUrl = messageJson.iconUrl ? messageJson.iconUrl : "images/icon.png"; +// // var tagJson = messageJson.payload; +// // var tag = tagJson.tag ? tagJson.tag : ""; +// var bodyAlert = messageJson.alert ? messageJson.alert : "Example message" +// var payloadData = messageJson.payload ? messageJson.payload : "Example message" +// let messageTemp; +// if ((messageTemp = regex.exec(bodyAlert)) !== null) { +// bodyAlert = createTemplateMessage(bodyAlert); +// } +// self.registration.showNotification(title, { +// body: bodyAlert, +// icon: imageUrl, +// data: payloadData, +// // tag: tag +// }); +// return Promise.resolve(); +// } -function triggerSeenEvent(strMsg) { - send_message_to_all_clients("msgEventSeen:" + strMsg); -} +// function triggerSeenEvent(strMsg) { +// send_message_to_all_clients("msgEventSeen:" + strMsg); +// } -function triggerOpenEvent(strMsg) { - send_message_to_all_clients("msgEventOpen:" + strMsg); -} +// function triggerOpenEvent(strMsg) { +// send_message_to_all_clients("msgEventOpen:" + strMsg); +// } -function onPushNotificationReceived(event) { +// function onPushNotificationReceived(event) { - if (event.data) { +// if (event.data) { - } - event.waitUntil(displayNotification(event).then(() => triggerSeenEvent(event.data.text()))); -}; +// } +// event.waitUntil(displayNotification(event).then(() => triggerSeenEvent(event.data.text()))); +// }; -self.addEventListener('push', onPushNotificationReceived); +// self.addEventListener('push', onPushNotificationReceived); -function send_message_to_client(client, msg) { - return new Promise(function (resolve, reject) { - var msg_chan = new MessageChannel(); +// function send_message_to_client(client, msg) { +// return new Promise(function (resolve, reject) { +// var msg_chan = new MessageChannel(); - msg_chan.port1.onmessage = function (event) { - if (event.data.error) { - reject(event.data.error); - } else { - resolve(event.data); - } - }; +// msg_chan.port1.onmessage = function (event) { +// if (event.data.error) { +// reject(event.data.error); +// } else { +// resolve(event.data); +// } +// }; - client.postMessage(msg, [msg_chan.port2]); - }); -} +// client.postMessage(msg, [msg_chan.port2]); +// }); +// } -function send_message_to_all_clients(msg) { - clients.matchAll().then(clients => { - clients.forEach(client => { - send_message_to_client(client, msg); - }) - }); -} +// function send_message_to_all_clients(msg) { +// clients.matchAll().then(clients => { +// clients.forEach(client => { +// send_message_to_client(client, msg); +// }) +// }); +// } -self.addEventListener('install', function (event) { - self.skipWaiting(); +// self.addEventListener('install', function (event) { +// self.skipWaiting(); - //event.postMessage("SW Says 'Hello back!'"); -}); +// //event.postMessage("SW Says 'Hello back!'"); +// }); -self.addEventListener('message', function (event) { - replyPort = event.ports[0]; - _pushVaribales = event.data; -}); +// self.addEventListener('message', function (event) { +// replyPort = event.ports[0]; +// _pushVaribales = event.data; +// }); -self.addEventListener('activate', function (event) { +// self.addEventListener('activate', function (event) { - event.waitUntil(self.clients.claim()); -}); +// event.waitUntil(self.clients.claim()); +// }); -self.addEventListener('notificationclick', function (event) { +// self.addEventListener('notificationclick', function (event) { - let nidjson = event.notification.data; - event.notification.close(); - event.waitUntil(triggerOpenEvent(nidjson)); -}); +// let nidjson = event.notification.data; +// event.notification.close(); +// event.waitUntil(triggerOpenEvent(nidjson)); +// }); -self.addEventListener('pushsubscriptionchange', function () { +// self.addEventListener('pushsubscriptionchange', function () { - send_message_to_all_clients("updateRegistration:"); -}); \ No newline at end of file +// send_message_to_all_clients("updateRegistration:"); +// }); \ No newline at end of file diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 2627ac54c..b14e21e0a 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -11,10 +11,10 @@ export const environment = { // apiChatUrl: 'https://www.tabularium.pt/api/v1/', production: true, domain: 'gabinetedigital.local', - defaultuser: '',//paulo.pinto paulo.pinto@gabinetedigital.local - defaultuserpwd: '', //tabteste@006, + defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto paulo.pinto@gabinetedigital.local + defaultuserpwd: 'M@p2022', //tabteste@006, chatOffline: true, presidencia: false, version: '1.0.1', sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712' -}; +}; \ No newline at end of file diff --git a/src/index.html b/src/index.html index 63e7662dc..78ba7271c 100644 --- a/src/index.html +++ b/src/index.html @@ -9,12 +9,12 @@ - + - + @@ -65,7 +65,7 @@ - +