diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 78ef058cc..4a5df9b76 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -324,7 +324,7 @@ (viewEventDetailDismiss)="viewEventDetailDismiss($event)" > - + - diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 4cfcbed9f..9e55f2946 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -576,7 +576,6 @@ app-event-list{ display: flex; flex-direction: column; height: 100%; - height: 100%; flex-wrap: wrap-reverse; z-index: 1000; } @@ -585,7 +584,7 @@ app-approve-event{ display: flex; flex-direction: column; height: 100%; - height: 100%; + z-index: 1000; } diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 918a80754..0d3ea798e 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -101,13 +101,13 @@ export class AgendaPage implements OnInit { startTime: Date; endTime: Date; - mobileComponent: any = { showAddNewEvent: false, showEditEvent: false, showEventDitails: false, showEventList: false, transparentEventList: false, + transparentEventToApprove: false, showEventToApprove: false } @@ -458,7 +458,7 @@ export class AgendaPage implements OnInit { }); }); - // this.timelineFilter(this.timelineFilterState); + this.timelineFilter(this.timelineFilterState); this.myCal.update(); this.myCal.loadEvents(); @@ -491,7 +491,7 @@ export class AgendaPage implements OnInit { }); - // this.timelineFilter(this.timelineFilterState); + this.timelineFilter(this.timelineFilterState); this.myCal.update(); this.myCal.loadEvents(); @@ -701,6 +701,8 @@ export class AgendaPage implements OnInit { console.log(this.selectedEvent); + console.log(this.postEvent); + this.mobileComponent.showEditEvent = true; } @@ -730,6 +732,8 @@ export class AgendaPage implements OnInit { } approveEventDismiss({saveData, serialNumber, action}){ + + console.log(saveData); if(action == 'Aprovar'){ this.eventToaprove = { @@ -770,4 +774,11 @@ export class AgendaPage implements OnInit { } + async AproveEventEditEvent(data){ + console.log(data) + this.postEvent =data; + this.mobileComponent.transparentEventToApprove= true; + this.mobileComponent.showAddNewEvent = true; + } + } \ No newline at end of file diff --git a/src/app/shared/agenda/approve-event/approve-event.component.ts b/src/app/shared/agenda/approve-event/approve-event.component.ts index 6c3817a43..08874303b 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.ts +++ b/src/app/shared/agenda/approve-event/approve-event.component.ts @@ -29,6 +29,7 @@ export class ApproveEventComponent implements OnInit { @Output() approveEventDismiss = new EventEmitter(); @Output() closeEventToApprove = new EventEmitter(); + @Output() AproveEventEditEvent = new EventEmitter(); constructor( private router:Router, @@ -46,7 +47,7 @@ export class ApproveEventComponent implements OnInit { } notImplemented(){ - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + this.AproveEventEditEvent.emit(this.loadedEvent); } close(){ diff --git a/src/app/shared/agenda/event-list/event-list.component.html b/src/app/shared/agenda/event-list/event-list.component.html index ed50ba2c2..fb5a3b5a0 100644 --- a/src/app/shared/agenda/event-list/event-list.component.html +++ b/src/app/shared/agenda/event-list/event-list.component.html @@ -39,7 +39,7 @@ + *ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber, event)">

{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}

diff --git a/src/app/shared/agenda/event-list/event-list.component.ts b/src/app/shared/agenda/event-list/event-list.component.ts index 7ed80b91c..a98bf6ad0 100644 --- a/src/app/shared/agenda/event-list/event-list.component.ts +++ b/src/app/shared/agenda/event-list/event-list.component.ts @@ -58,14 +58,19 @@ export class EventListComponent implements OnInit { this.eventsMDGPRList = res; }); } - async openApproveModal(eventSerialNumber){ + async openApproveModal(eventSerialNumber, data){ - debugger + let a =this.eventsMDGPRList.filter((elem)=>{ + console.log(eventSerialNumber," ",elem.serialNumber) + return eventSerialNumber == elem.serialNumber + }); + + console.log(a); this.approveEventDismiss.emit({ "serialNumber": eventSerialNumber, "action": "Aprovar", - "saveData": {} + "saveData": data }); }