diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 3836671d4..ec0339a1d 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -97,6 +97,7 @@ export class HomePage implements OnInit { this.router.events.subscribe((val) => { document.querySelectorAll('ion-modal').forEach((e: any) => e.remove()) document.querySelectorAll('popover-viewport').forEach((e: any) => e.remove()) + document.querySelectorAll('.notification').forEach((e: any) => e.remove()) }); window['platform'] = platform diff --git a/src/app/models/permission/agenda-permission.ts b/src/app/models/permission/agenda-permission.ts index bd1e8d5c3..e95b29c53 100644 --- a/src/app/models/permission/agenda-permission.ts +++ b/src/app/models/permission/agenda-permission.ts @@ -16,7 +16,8 @@ export class AgendaPermission{ } } get access () { - + return 530 + if(this.hasOwnCalendar || this.hasSharedCalendar) { return 530 } else { diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 0adbba57c..c1db662a4 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -104,9 +104,11 @@ export class NewEventPage implements OnInit { this.taskParticipants = this.navParams.get('attendees'); - if(this.eventService.calendarNamesAry['Meu calendario']) { + if(this.eventService.calendarNamesAry.includes('Meu calendario')) { this.CalendarName = 'Meu calendario' - } else {} + } else { + this.CalendarName = this.eventService.calendarNamesAry[0] + } } @@ -178,15 +180,10 @@ export class NewEventPage implements OnInit { roundTimeQuarterHour() { var timeToReturn = new Date(); - // var minutes = timeToReturn.getMinutes(); var minutes = timeToReturn.getMinutes(); var hours = timeToReturn.getHours(); - // console.log("MINUTOS: " +minutes); - // console.log("BEFORE MINUTES: " +(Math.round(minutes/15) * 15)); - var m = (Math.round(minutes/15) * 15) % 60; - // console.log("AFTER MINUTES: " +m); var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours; if (m == 0) { diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index b05e9340f..210219df5 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -80,54 +80,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(); + }); } @@ -149,6 +149,7 @@ export class EventsPage implements OnInit { async RefreshEvents() { + this.currentEvent = ""; this.showLoader = true; @@ -157,7 +158,7 @@ export class EventsPage implements OnInit { let start = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); let end = date.getFullYear() + "-" + month + "-" + date.getDate() + " 23:59:59"; if(SessionStore.user) { - + console.log('im here') let onwEvent:any = await this.eventService.getAllOwnEvents(start, end).catch((error) => { console.error(error) }) diff --git a/src/app/pages/inactivity/inactivity.page.ts b/src/app/pages/inactivity/inactivity.page.ts index 63dc58b8a..2743fd25c 100644 --- a/src/app/pages/inactivity/inactivity.page.ts +++ b/src/app/pages/inactivity/inactivity.page.ts @@ -117,9 +117,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) { diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 9a1538c88..aac4b27aa 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -98,9 +98,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() { @@ -149,11 +149,10 @@ export class LoginPage implements OnInit { this.ChatSystemService.clearChat(); SessionStore.delete(); window.localStorage.clear(); - await MessageModel.deleteAll() - await DeleteMessageModel.deleteAll() + await MessageModel.deleteAll(); + await DeleteMessageModel.deleteAll(); await this.authService.SetSession(attempt, this.userattempt); - this.changeProfileService.run(); diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index f01eca89c..cbae58091 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -48,9 +48,6 @@ 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() } @@ -127,7 +124,6 @@ export class AuthService { this.ChatSystemService.getAllRooms(); }, 200); - // alert('wsLogin') }).catch((error) => { console.error(error) diff --git a/src/app/services/fcm.service.ts b/src/app/services/fcm.service.ts index 3ed97ee0a..c5521200f 100644 --- a/src/app/services/fcm.service.ts +++ b/src/app/services/fcm.service.ts @@ -17,48 +17,7 @@ export class FcmService { constructor(private router: Router) { } - /* initPush() { - if (Capacitor.platform !== 'web') { - this.registerPush(); - } - } - private registerPush() { - PushNotifications.requestPermission().then((permission) => { - if (permission.granted) { - // Register with Apple / Google to receive push via APNS/FCM - PushNotifications.register(); - } else { - // No permission for push granted - } - }); - PushNotifications.addListener( - 'registration', - (token: PushNotificationToken) => { - - } - ); - - PushNotifications.addListener('registrationError', (error: any) => { - - }); - - PushNotifications.addListener( - 'pushNotificationReceived', - async (notification: PushNotification) => { - - } - ); - PushNotifications.addListener( - 'pushNotificationActionPerformed', - async (notification: PushNotificationActionPerformed) => { - const data = notification.notification.data; - - if (data.detailsId) { - this.router.navigateByUrl(`/home/notifications/notification-detail${data.detaisId}`); - } - } - ); - } */ + } diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts index 2300a42a7..6184e6692 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts @@ -118,8 +118,8 @@ export class AttendeePage implements OnInit { filterSearchList(itm: EventPerson): boolean { const result = this.LtaskParticipants.concat(this.LtaskParticipantsCc).find((contact, index)=>{ - - if(contact.Name.toLowerCase() == itm.Name.toLowerCase() && contact.EmailAddress.toLowerCase() == itm.EmailAddress.toLowerCase()){ + + if(this.checkStringNull(contact.Name) == this.checkStringNull(itm.Name) && this.checkStringNull(contact.EmailAddress) == this.checkStringNull(itm.EmailAddress)){ index = index; return contact; } @@ -133,7 +133,7 @@ export class AttendeePage implements OnInit { const result2 = this.LtaskParticipantsCc.find((contact, index)=>{ - if(contact.Name.toLowerCase() == itm.Name && contact.EmailAddress.toLowerCase() == itm.EmailAddress.toLowerCase()){ + if(this.checkStringNull(contact.Name) == itm.Name && this.checkStringNull(contact.EmailAddress) == this.checkStringNull(itm.EmailAddress)){ index = index; return contact; } @@ -199,7 +199,7 @@ export class AttendeePage implements OnInit { { this.eventPersons.forEach(attendee => { const index: number = result.findIndex((cont) => { - return cont.EmailAddress.toLowerCase() == attendee.EmailAddress.toLowerCase() + return this.checkStringNull(cont.EmailAddress) == this.checkStringNull(attendee.EmailAddress) }); result.splice(index, 1); @@ -212,4 +212,12 @@ export class AttendeePage implements OnInit { ); } + checkStringNull(value: string) { + if(value) { + return value.toLowerCase(); + } else { + return value + } + } + } \ No newline at end of file