diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 73fdf8642..799d4b299 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -417,7 +417,7 @@ > - + { /* console.log(res); */ const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); @@ -143,7 +140,7 @@ export class ApproveEventPage implements OnInit { return await popover.present(); } - async emendTask(serialNumber:string){ + async emendTask(serialNumber:string) { console.log('Desktop'); const modal = await this.modalController.create({ @@ -186,7 +183,7 @@ export class ApproveEventPage implements OnInit { //this.goBack(); } - goToEventsToApprove(){ + goToEventsToApprove() { let navigationExtras: NavigationExtras = { queryParams: { "eventos": true, @@ -196,32 +193,10 @@ export class ApproveEventPage implements OnInit { } + /** @description edit event to aprove */ async editar(serialNumber: string) { - if(window.innerWidth > 800){ - console.log('DESTOP'); - - this.EditApproveEventDismiss.emit(); - } - else{ - /* const modal = await this.modalController.create({ - component: EditEventToApproveComponent, - componentProps: { - serialNumber: serialNumber, - InstanceId:this.InstanceId - }, - cssClass: 'modal modal-desktop', - // backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then(res => { - this.getTask(); - this.getAttachments(); - }); */ - } + + this.EditApproveEventDismiss.emit(); } - - - - } diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 00b8d3014..224242d9f 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -13,7 +13,7 @@ - +
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 803b018a4..c7df52414 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -41,7 +41,6 @@ export class EditEventToApprovePage implements OnInit { public stepHour = 1; public stepMinute = 5; public stepSecond = 5; - public dateControlStart = new FormControl(moment("DD MM YYYY hh")); public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); @@ -88,7 +87,6 @@ export class EditEventToApprovePage implements OnInit { show = false isRecurring:string; isEventEdited: boolean; - segment:string = "true"; profile:string; eventAttendees: EventPerson[]; @@ -101,7 +99,7 @@ export class EditEventToApprovePage implements OnInit { showAttendees = false; - InstanceId: string + InstanceId: string; @Output() openAttendeesComponent = new EventEmitter(); @Output() clearContact = new EventEmitter(); @@ -109,6 +107,8 @@ export class EditEventToApprovePage implements OnInit { @Output() setIntervenientCC = new EventEmitter(); @Output() closeComponent = new EventEmitter(); + @Input() saveData: any; + constructor( private modalController: ModalController, private eventsService: EventsService, @@ -117,9 +117,6 @@ export class EditEventToApprovePage implements OnInit { private processes:ProcessesService, private toastService: ToastService, ) { - - /* this.serialNumber = this.navParams.get('serialNumber'); */ - this.isEventEdited = false; } @@ -221,7 +218,6 @@ export class EditEventToApprovePage implements OnInit { ReviewUserComment: '' } - console.log(event); this.eventsService.postEventToApproveEdit(event).subscribe(()=>{ this.toastService.successMessage('Evento editado'); @@ -229,7 +225,6 @@ export class EditEventToApprovePage implements OnInit { this.toastService.badRequest('Evento não editado'); }) - this.loadedAttachments.forEach((document:any)=>{ if(document['action'] == 'add') { delete document.action @@ -249,7 +244,6 @@ export class EditEventToApprovePage implements OnInit { }) - this.modalController.dismiss(); } @@ -281,21 +275,21 @@ export class EditEventToApprovePage implements OnInit { } - async addParticipants() { + // async addParticipants() { - //this.saveTemporaryData(); + // //this.saveTemporaryData(); - this.openAttendeesComponent.emit({ - type: "intervenient" - }); + // this.openAttendeesComponent.emit({ + // type: "intervenient" + // }); - this.clearContact.emit(); - } + // this.clearContact.emit(); + // } async addParticipantsCC() { - //this.saveTemporaryData(); + // //this.saveTemporaryData(); this.openAttendeesComponent.emit({ type: "CC" @@ -331,6 +325,8 @@ export class EditEventToApprovePage implements OnInit { } + // this.clearContact.emit(); + // } async getAttachments() { diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 3af6a5215..9d133d599 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -20,7 +20,6 @@ import * as moment from 'moment'; }) export class EditEventPage implements OnInit { - stEvent: Event; isRecurring:string; isEventEdited: boolean; @@ -126,7 +125,7 @@ export class EditEventPage implements OnInit { this.isEventEdited = false; - if(this.postEvent.IsRecurring == false){ + if(this.postEvent.IsRecurring == false) { this.isRecurring = "Não se repete"; } else{ @@ -137,7 +136,6 @@ export class EditEventPage implements OnInit { this.getAttachments(this.postEvent.EventId); this.restoreDatepickerData() - } close() { diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index 4fad35895..15ec45d77 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -15,8 +15,8 @@ export class EventListPage implements OnInit { // [desktop] event list to approve showLoader: boolean; - eventsPRList: any; - eventsMDGPRList: any; + eventsPRList: any = [] + eventsMDGPRList: any = [] eventPerson: EventPerson; eventBody: EventBody; categories: string[];