diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 2ad0aec95..512fb4bb4 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -671,7 +671,6 @@ export class AgendaPage implements OnInit { }) } - } } else { @@ -681,9 +680,6 @@ export class AgendaPage implements OnInit { if (this.loggeduser.Profile == 'MDGPR') { - - alert('MDGPR') - this.eventService.getAllMdEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => { this.addEventToDB(response, "md"); diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 4b521e372..5901b2415 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -206,8 +206,9 @@ export class ViewEventPage implements OnInit { const event = this.CalendarService.eventSource.find((ele) => ele.id == this.eventId) + // console.log('View event details', event) + if(event?.CalendarId) { - this.eventsService.genericGetEvent(this.eventId, event.CalendarId).subscribe(res => { this.loadedEvent = res; this.addEventToDb(res); @@ -260,25 +261,26 @@ export class ViewEventPage implements OnInit { }); } else { + + alert('generic delete') - this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, this.loadedEvent.CalendarId).subscribe(async () => { - const alert = await this.alertController.create({ - cssClass: 'my-custom-class', - header: 'Evento removido', - buttons: ['OK'] - }); + this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, this.loadedEvent.CalendarId).subscribe(async () => { + const alert = await this.alertController.create({ + cssClass: 'my-custom-class', + header: 'Evento removido', + buttons: ['OK'] + }); + + setTimeout(() => { + alert.dismiss(); + }, 1500); + this.goBack(); + this.toastService.successMessage('Evento apagado'); + }, () => { }, + () => { + loader.remove(); + }); - setTimeout(() => { - alert.dismiss(); - }, 1500); - this.goBack(); - this.toastService.successMessage('Evento apagado'); - }, () => { }, - () => { - loader.remove(); - }); - - } } diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 1f74f7174..b3348d24f 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -175,6 +175,10 @@ export class AuthService { SessionStore.user.RochetChatUserId = message.result.id SessionStore.save() + + // console.log('user session', SessionStore.user) + + this.WsChatService.setStatus('online') }).catch((message) => { diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index c3722c200..24284550b 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -486,7 +486,7 @@ export class EventsService { return this.http.get(`${geturl}`, options); } else { - alert('headr not found'+ calendarId) + } throw('error') @@ -814,6 +814,13 @@ export class EventsService { }) if (header) { + + + options = { + headers: header, + params: params + }; + return this.http.delete(`${puturl}`, options).pipe( catchError(err => { console.log('Event edit saved offline') @@ -821,6 +828,8 @@ export class EventsService { throw new Error(err); }) ) + } else { + } throw('header not found') diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index 911384d6f..e28b060bb 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -122,29 +122,29 @@ export class ViewEventPage implements OnInit { }); } else { + const event = this.CalendarService.eventSource.find((ele) => ele.id == this.eventId) - this.eventsService.genericGetEvent(this.eventId, this.loadedEvent.CalendarId).subscribe(res => { - this.loadedEvent = res; - this.today = new Date(res.StartDate); - this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); - }, (error)=> { - - this.viewEventDetailDismiss.emit({ - type: 'close' - }) - - if(error.status == 0) { - this.toastService.badRequest('Não é possível visualizar este evento no modo offline') - } else { - this.toastService.badRequest('Este evento já não existe na sua agenda') - } - - }); - - + if(event?.CalendarId) { + + this.eventsService.genericGetEvent(this.eventId, event.CalendarId).subscribe(res => { + this.loadedEvent = res; + this.today = new Date(res.StartDate); + this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); + }, (error)=> { + + this.viewEventDetailDismiss.emit({ + type: 'close' + }) + + if(error.status == 0) { + this.toastService.badRequest('Não é possível visualizar este evento no modo offline') + } else { + this.toastService.badRequest('Este evento já não existe na sua agenda') + } + }); + } } - }