diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 5e980a3ac..989b309ae 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -114,7 +114,7 @@ export class AgendaPage implements OnInit { eventsListOficial: Event[]; // this will make toggle add event and. - showEventEditOrOpen: "edit" | "add" | "" = "" + showEventEditOrOpen: "edit" | "add" | "" | "eventoToApprove" = "" prEventList: Event[]; mdEventList: Event[]; @@ -232,8 +232,6 @@ export class AgendaPage implements OnInit { this.eventSelectedDate = event.start; this.selectedEventId = event.id; - // this.viewEventDetail(event.id); - this.cloneAllmobileComponent(); @@ -1190,11 +1188,11 @@ export class AgendaPage implements OnInit { } // open component - async viewEventDetailDismiss(data){ + async viewEventDetailDismiss(data) { await this.cloneAllmobileComponent() - if (data.type == 'edit'){ + if (data.type == 'edit') { this.selectedEvent = data.event; this.postEvent = data.event; @@ -1221,7 +1219,6 @@ export class AgendaPage implements OnInit { } } - approveEventDismissGoBack() { window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {} @@ -1231,16 +1228,16 @@ export class AgendaPage implements OnInit { } - - approveEventDismiss({saveData, serialNumber, action}){ + approveEventDismiss({saveData, serialNumber, action}) { window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {} - if(action == 'Aprovar'){ + if(action == 'Aprovar') { this.eventToaprove = { back: true, saveData: saveData, serialNumber:serialNumber, + action: action, InstanceId: saveData.workflowInstanceDataFields.InstanceId || "" } // this.mobileComponent.showEventList = false; @@ -1248,16 +1245,24 @@ export class AgendaPage implements OnInit { this.mobileComponent.showEventToApprove = true; } - + this.showEventEditOrOpen = "eventoToApprove" } closeEventToApprove() { - - this.mobileComponent.showEventToApprove = false; - this.mobileComponent.showEventList = true; + if (this.eventToaprove.back ==true && this.mobileComponent.showEventList ==true) { + this.mobileComponent.transparentEventList = false; + this.mobileComponent.showEventToApprove = false; + this.eventToaprove.back = false; + + } + else { + + this.mobileComponent.showEventToApprove = false; + this.mobileComponent.showEventList = false; + } } - + closeEventToApproveGoBack() { if( window.innerWidth <= 801){ this.router.navigate(['/home/agenda/event-list']); @@ -1274,7 +1279,7 @@ export class AgendaPage implements OnInit { this.mobileComponent.showEditEventToApprove = true; } - async cloneAllmobileComponent(){ + async cloneAllmobileComponent() { this.mobileComponent.showAddNewEvent = false; this.mobileComponent.showEditEvent = false; @@ -1288,7 +1293,7 @@ export class AgendaPage implements OnInit { this.closeEventToApprove(); } - async AproveEventEditEvent(data){ + async AproveEventEditEvent(data) { this.postEvent =data; this.mobileComponent.transparentEventToApprove= true; this.mobileComponent.showAddNewEvent = true; @@ -1303,11 +1308,11 @@ export class AgendaPage implements OnInit { this.mobileComponent.showAttendees = true; } - async clearContact(){ + async clearContact() { this.contacts = []; } - async setContact(data:EventPerson[]){ + async setContact(data:EventPerson[]) { this.contacts = data; } @@ -1319,7 +1324,7 @@ export class AgendaPage implements OnInit { async GoBackEditOrAdd() { - if(this.showEventEditOrOpen == "edit"){ + if(this.showEventEditOrOpen == "edit") { this.cloneAllmobileComponent(); this.mobileComponent.showEditEvent = true; @@ -1327,7 +1332,11 @@ export class AgendaPage implements OnInit { this.cloneAllmobileComponent(); this.mobileComponent.showAddNewEvent = true; - } else { + } else if(this.showEventEditOrOpen == "eventoToApprove") { + this.cloneAllmobileComponent(); + this.mobileComponent.showEditEventToApprove = true + } + else { // do Nothings } diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 1a2f3e9db..2b85de163 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -66,7 +66,7 @@ export class NewPublicationPage implements OnInit { this.clear(); // this.takePicture(); } - takePicture(){ + takePicture() { const options: CameraOptions = { quality: 90, destinationType: this.camera.DestinationType.DATA_URL, 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 687e93447..803b018a4 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 @@ -127,8 +127,6 @@ export class EditEventToApprovePage implements OnInit { ngOnInit() { if(!this.restoreTemporaryData()){ - - } else { alert('restore!!') } 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 82437eff7..3af6a5215 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -86,7 +86,6 @@ export class EditEventPage implements OnInit { public stepMinutes = [1, 5, 10, 15, 20, 25]; public stepSeconds = [1, 5, 10, 15, 20, 25]; - constructor( private modalController: ModalController, private eventsService: EventsService, @@ -96,12 +95,11 @@ export class EditEventPage implements OnInit { } ngOnInit() { - - if(!this.restoreTemporaryData()){ + if(!this.restoreTemporaryData()) { // clear - if(this.postEvent){ + if(this.postEvent) { if( this.postEvent.Body){ if(typeof(this.postEvent.Body.Text) == 'string'){ this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, ''); @@ -190,7 +188,6 @@ export class EditEventPage implements OnInit { this.clearContact.emit(); } - async addParticipantsCc() { this.saveTemporaryData(); @@ -245,7 +242,6 @@ export class EditEventPage implements OnInit { return false; } - } deleteTemporaryData(){