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 6b2fa3ca7..ffbbfa668 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -130,12 +130,12 @@ export class ViewEventPage implements OnInit { this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); */ loader.remove() }, (error)=>{ - + if(error.status == 0) { this.toastService.badRequest('Não é possível vizualizar este evento no modo offline') } else { this.toastService.badRequest('Este evento já não existe na sua agenda') - } + } loader.remove() this.modalController.dismiss('Eevent not Foud'); @@ -144,7 +144,7 @@ export class ViewEventPage implements OnInit { } deleteEvent(){ - this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () => + this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', @@ -162,7 +162,7 @@ export class ViewEventPage implements OnInit { async OpenDeleteEventModal() { - + const modal = await this.modalController.create({ component: EliminateEventPage, componentProps: { diff --git a/src/app/pages/events/edit-event/edit-event.page.ts b/src/app/pages/events/edit-event/edit-event.page.ts index 994fa65a8..fa81f4350 100644 --- a/src/app/pages/events/edit-event/edit-event.page.ts +++ b/src/app/pages/events/edit-event/edit-event.page.ts @@ -35,19 +35,19 @@ export class EditEventPage implements OnInit { profile:string; constructor( - public formBuilder: FormBuilder, - public alertController: AlertController, - private router: Router, - private activatedRoute: ActivatedRoute, - private eventsService: EventsService, + public formBuilder: FormBuilder, + public alertController: AlertController, + private router: Router, + private activatedRoute: ActivatedRoute, + private eventsService: EventsService, private modalCtrl: ModalController, private alertService: AlertService, private attachamentsService: AttachmentsService, private route: Router, - private iab: InAppBrowser) { + private iab: InAppBrowser) { this.loadedEvent = new Event(); this.loadedEvent.Body = new EventBody(); - + } ngOnInit() { @@ -73,7 +73,7 @@ export class EditEventPage implements OnInit { this.pageId = paramMap.get('eventId'); eventid = paramMap.get('eventId'); console.log(eventid); - + } if (paramMap.has("caller")){ this.backURL = "/home/" + paramMap.get('caller'); @@ -99,7 +99,7 @@ export class EditEventPage implements OnInit { modal.onDidDismiss().then((data) => { if (data['data'] != null) - { + { let newattendees: EventPerson[] = data['data']; this.loadedEvent.Attendees = newattendees; } @@ -142,20 +142,20 @@ export class EditEventPage implements OnInit { Delete() { - this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () => + this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento removido', buttons: ['OK'] }); - + setTimeout(()=>{ alert.dismiss(); }, 1500); this.router.navigate(['/home/events']); - }); + }); } Save() @@ -165,18 +165,18 @@ export class EditEventPage implements OnInit { this.activatedRoute.paramMap.subscribe(paramMap =>{ if (paramMap.has("profile")){ console.log(paramMap.get('profile')); - + } }); - this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () => + this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento actualizado', buttons: ['OK'] }); - + setTimeout(()=>{ alert.dismiss(); }, 1500); @@ -189,13 +189,13 @@ export class EditEventPage implements OnInit { } loadAttachments() - { + { /* console.log(this.pageId); */ - + this.attachamentsService.getAttachmentsById(this.pageId).subscribe(res => { this.loadedEventAttachments = res; console.log(res); - + }); } async viewDocument(documenturl:string) @@ -230,12 +230,12 @@ export class EditEventPage implements OnInit { cssClass: 'attachments', backdropDismiss: false }); - + await modal.present(); - + modal.onDidDismiss().then((data) => { if (data['data'] != null) - { + { let newattendees: EventPerson[] = data['data']; this.loadedEvent.Attendees = newattendees; } diff --git a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts index 65585077c..3ff003566 100644 --- a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts +++ b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts @@ -32,15 +32,15 @@ export class EventDetailModalPage implements OnInit { profile:string; constructor( - public formBuilder: FormBuilder, - public alertController: AlertController, - private router: Router, - private activatedRoute: ActivatedRoute, - private eventsService: EventsService, + public formBuilder: FormBuilder, + public alertController: AlertController, + private router: Router, + private activatedRoute: ActivatedRoute, + private eventsService: EventsService, private modalCtrl: ModalController, private alertService: AlertService, private attachamentsService: AttachmentsService, - private route: Router,) { + private route: Router,) { this.loadedEvent = new Event(); this.loadedEvent.Body = new EventBody(); } @@ -75,7 +75,7 @@ export class EventDetailModalPage implements OnInit { this.pageId = paramMap.get('eventId'); eventid = paramMap.get('eventId'); console.log(eventid); - + } if (paramMap.has("caller")){ this.backURL = "/home/" + paramMap.get('caller'); @@ -101,7 +101,7 @@ export class EventDetailModalPage implements OnInit { modal.onDidDismiss().then((data) => { if (data['data'] != null) - { + { let newattendees: EventPerson[] = data['data']; this.loadedEvent.Attendees = newattendees; } @@ -144,35 +144,35 @@ export class EventDetailModalPage implements OnInit { Delete() { - this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () => + this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento removido', buttons: ['OK'] }); - + setTimeout(()=>{ alert.dismiss(); }, 1500); this.router.navigate(['/home/events']); - }); + }); } Save() { - if (this.ionicForm.valid) + if (this.ionicForm.valid) { - this.eventsService.putEvent(this.loadedEvent, 2, 3, "md").subscribe(async () => + this.eventsService.putEvent(this.loadedEvent, 2, 3, "md").subscribe(async () => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento actualizado', buttons: ['OK'] }); - + setTimeout(()=>{ alert.dismiss(); }, 1500); @@ -185,16 +185,16 @@ export class EventDetailModalPage implements OnInit { } loadAttachments() - { + { /* this.attachamentsService.getEventAttachments(this.pageId).subscribe(attachments => { this.loadedEventAttachments = attachments; }); */ this.attachamentsService.getAttachmentsById(this.pageId).subscribe(res => { console.log(res); - + },(error) => { console.log(error); - + }); } async viewDocument(documenturl:string) @@ -234,7 +234,7 @@ export class EventDetailModalPage implements OnInit { modal.onDidDismiss().then((data) => { if (data['data'] != null) - { + { let newattendees: EventPerson[] = data['data']; this.loadedEvent.Attendees = newattendees; } diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts index 96a642ed8..0324721f9 100644 --- a/src/app/pages/events/event-detail/event-detail.page.ts +++ b/src/app/pages/events/event-detail/event-detail.page.ts @@ -36,16 +36,16 @@ export class EventDetailPage implements OnInit { constructor( - public formBuilder: FormBuilder, - public alertController: AlertController, - private router: Router, - private activatedRoute: ActivatedRoute, - private eventsService: EventsService, + public formBuilder: FormBuilder, + public alertController: AlertController, + private router: Router, + private activatedRoute: ActivatedRoute, + private eventsService: EventsService, private modalCtrl: ModalController, private alertService: AlertService, private attachamentsService: AttachmentsService, private route: Router, - private iab: InAppBrowser) { + private iab: InAppBrowser) { this.loadedEvent = new Event(); this.loadedEvent.Body = new EventBody(); } @@ -73,7 +73,7 @@ export class EventDetailPage implements OnInit { this.pageId = paramMap.get('eventId'); eventid = paramMap.get('eventId'); console.log(eventid); - + } if (paramMap.has("caller")){ this.backURL = "/home/" + paramMap.get('caller'); @@ -99,7 +99,7 @@ export class EventDetailPage implements OnInit { modal.onDidDismiss().then((data) => { if (data['data'] != null) - { + { let newattendees: EventPerson[] = data['data']; this.loadedEvent.Attendees = newattendees; } @@ -142,18 +142,18 @@ export class EventDetailPage implements OnInit { Delete() { - this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () => + this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => { /* const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento removido', buttons: ['OK'] }); - + await alert.present(); */ this.router.navigate(['/home/events']); - }); + }); } Save() @@ -163,18 +163,18 @@ export class EventDetailPage implements OnInit { this.activatedRoute.paramMap.subscribe(paramMap =>{ if (paramMap.has("profile")){ console.log(paramMap.get('profile')); - + } }); - this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () => + this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento actualizado', buttons: ['OK'] }); - + setTimeout(()=>{ alert.dismiss(); }, 1500); @@ -187,13 +187,13 @@ export class EventDetailPage implements OnInit { } loadAttachments() - { + { /* console.log(this.pageId); */ - + this.attachamentsService.getAttachmentsById(this.pageId).subscribe(res => { this.loadedEventAttachments = res; console.log(res); - + }); } async viewDocument(documenturl:string) @@ -228,17 +228,17 @@ export class EventDetailPage implements OnInit { cssClass: 'attachments', backdropDismiss: false }); - + await modal.present(); - + modal.onDidDismiss().then((data) => { if (data['data'] != null) - { + { let newattendees: EventPerson[] = data['data']; this.loadedEvent.Attendees = newattendees; } }); } - + } diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 833d4323f..a3b4b8509 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -412,7 +412,7 @@ export class EventsService { return this.http.post(`${puturl}`, event, options) } - deleteEvent(eventid:string, eventDeleteType:number) + deleteEvent(eventid:string, eventDeleteType:number, calendarName:string) { const puturl = environment.apiURL + 'calendar/DeleteEvent'; let params = new HttpParams(); @@ -421,10 +421,38 @@ export class EventsService { // 0 for occurence and 1 for serie (delete all events) params = params.set("eventDeleteType", eventDeleteType.toString()); - let options = { - headers: this.headers, - params: params - }; + let options; + + switch (this.loggeduser.Profile) { + case 'MDGPR': + if(calendarName == 'Pessoal'){ + options = { + headers: this.headersMdPessoal, + params: params + }; + } + else if(calendarName == 'Oficial'){ + options = { + headers: this.headersMdOficial, + params: params + }; + } + break; + case 'PR': + if(calendarName == 'Pessoal'){ + options = { + headers: this.headersPrPessoal, + params: params + }; + } + else if(calendarName == 'Oficial'){ + options = { + headers: this.headersPrOficial, + params: params + }; + } + break; + } return this.http.delete(`${puturl}`, options) } 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 04d844b06..49b16ce2b 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -115,7 +115,7 @@ export class ViewEventPage implements OnInit { if (this.loadedEvent.IsRecurring) { } else { - this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () => { + this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => { this.toastService.successMessage('Evento apagado'); this.close(); });