diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 883574522..27dff02fb 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -57,7 +57,7 @@ -
PR
+
PR
Minha agenda
@@ -76,9 +76,9 @@ - +
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 6f869d8d0..dd8660aa6 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -282,6 +282,18 @@ export class AgendaPage implements OnInit { this.weekToShow() } + + hasPrCalendar(data: TableSharedCalendar[]) { + for(const e of data) { + if(e.roleId == this.RoleIdService.PRES) { + return true + } + } + + return false + } + + segmentChanged() { this.showCalendarField = true } @@ -299,7 +311,6 @@ export class AgendaPage implements OnInit { } - ngOnInit() { this.setCalendarByDefault(false) @@ -680,6 +691,9 @@ export class AgendaPage implements OnInit { this.myCal.loadEvents(); } catch (error) {} + + console.log('selectedCalendarIds', selectedCalendarIds) + let load = 0; for (const selectedCalendar of selectedCalendarIds) { @@ -748,11 +762,9 @@ export class AgendaPage implements OnInit { const data = await this.AgendaDataRepositoryService.geCalendars() const prObject = data.find(e => e?.roleId == 100000014) + const myCalendar = data.find(e => e?.wxUserId == SessionStore.user.UserId) - return[{ - ...this.eventService.calendarNamesType['Meu calendario'], - wxUserId: this.SessionStore.user.UserId - }, { + return[{...myCalendar}, { ...prObject }] diff --git a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts index 2b80f1c8b..fad4173cf 100644 --- a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts +++ b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts @@ -197,6 +197,7 @@ export class AgendaDataRepositoryService { await this.createOwnCalendar() return await this.agendaLocalDataSourceService.bulkCreate(result.value.data) } else { + await this.createOwnCalendar() return result } } else { diff --git a/src/app/store/calendar.service.ts b/src/app/store/calendar.service.ts index f7a226335..5689921ad 100644 --- a/src/app/store/calendar.service.ts +++ b/src/app/store/calendar.service.ts @@ -51,28 +51,16 @@ export class CalendarService { } - - removeRange(rangeStartDate, rangeEndDate, profile) { - this._eventSource = this._eventSource.filter((e)=> { - if(new Date(rangeStartDate).getTime() <= new Date(e.startTime).getTime() && - new Date(rangeEndDate).getTime() >= new Date(e.endTime).getTime() && e.profile == profile) { - return false - } - return true - }) - } - removeRangeForCalendar(rangeStartDate, rangeEndDate, profile, calendarId) { this._eventSource = this._eventSource.filter((e)=> { if(new Date(rangeStartDate).getTime() <= new Date(e.startTime).getTime() && - new Date(rangeEndDate).getTime() >= new Date(e.endTime).getTime() && e.CalendarId != calendarId) { + new Date(rangeEndDate).getTime() >= new Date(e.endTime).getTime() && e.CalendarId == calendarId) { return false } return true }) - } pushEvent(eventsList: EventList, profile: 'pr' | 'md', CalendarId: string) {