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/events/events.page.html b/src/app/pages/events/events.page.html index d8f7fe964..0833ce257 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -64,7 +64,7 @@ -
+
{{event.StartDate | date: 'HH:mm'}}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 7d14ebe26..210219df5 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -63,6 +63,7 @@ export class EventsPage implements OnInit { @Output() openExpedientListPage: EventEmitter = new EventEmitter(); loggeduser: LoginUserRespose; + sessoStore = SessionStore; constructor( private eventService: EventsService, @@ -148,6 +149,7 @@ export class EventsPage implements OnInit { async RefreshEvents() { + this.currentEvent = ""; this.showLoader = true; @@ -155,60 +157,16 @@ export class EventsPage implements OnInit { let month = date.getMonth() + 1; let start = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); let end = date.getFullYear() + "-" + month + "-" + date.getDate() + " 23:59:59"; - - if (this.loggeduser.Profile == 'MDGPR') { - - let mdOficialEvents = await this.eventService.getAllMdOficialEvents(start, end).toPromise(); - let mdPessoalEvents = await this.eventService.getAllMdPessoalEvents(start, end).toPromise(); - - const list = mdOficialEvents.concat(mdPessoalEvents); - - - - this.addEventToDb(list); - this.listToPresent = list - - if (list.length > 0) { - this.currentEvent = list[0].Subject; - this.currentHoursMinutes = list[0].StartDate; - } - - this.totalEvent = list.length; + if(SessionStore.user) { + console.log('im here') + let onwEvent:any = await this.eventService.getAllOwnEvents(start, end).catch((error) => { + console.error(error) + }) + this.listToPresent = onwEvent; + this.totalEvent = onwEvent.length; this.showLoader = false; - - } - else if (this.loggeduser.Profile == 'PR') { - - let prOficialEvents = await this.eventService.getAllPrOficialEvents(start, end).toPromise(); - let prPessoalEvents = await this.eventService.getAllPrPessoalEvents(start, end).toPromise(); - - - const list = prOficialEvents.concat(prPessoalEvents); - - this.addEventToDb(list); - if (list.length > 0) { - this.currentEvent = list[0].Subject; - this.currentHoursMinutes = list[0].StartDate; - } - - this.listToPresent = list; - this.totalEvent = list.length; - this.showLoader = false; - } else { - - if(this.loggeduser.OwnerCalendars.length >= 1) { - - let onwEvent:any = await this.eventService.getAllOwnEvents(start, end).catch((error) => { - console.error(error) - }) - this.listToPresent = onwEvent; - this.totalEvent = onwEvent.length; - this.showLoader = false; - } else { - - } - + } } diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 220eb163e..aac4b27aa 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -143,7 +143,7 @@ export class LoginPage implements OnInit { } else { - this.sqliteservice.deleteAllTables(); + this.RochetChatConnectorService.logout(); this.clearStoreService.clear(); this.ChatSystemService.clearChat(); 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