mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
changes from peter
This commit is contained in:
@@ -100,11 +100,13 @@ export class EventListPage implements OnInit {
|
||||
this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse();
|
||||
} catch (error) {
|
||||
this.eventsList = [];
|
||||
this.showLoader = false;
|
||||
}
|
||||
|
||||
this.eventoaprovacaostore.save(segment, this.eventsList)
|
||||
|
||||
} else {
|
||||
} else if(segment) {
|
||||
console.log('segment', segment)
|
||||
|
||||
this.color = 'pr'
|
||||
let allEvents = await this.processes.eventsToApprove(segment,'agenda desktop').toPromise()
|
||||
@@ -112,6 +114,7 @@ export class EventListPage implements OnInit {
|
||||
this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
|
||||
} catch(error) {
|
||||
this.eventsList = []
|
||||
this.showLoader = false;
|
||||
}
|
||||
|
||||
this.eventsList = this.eventsList
|
||||
|
||||
@@ -241,27 +241,10 @@ export class EditEventToApproveComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
|
||||
goBack() {
|
||||
let navigationExtras: NavigationExtras = {
|
||||
queryParams: {
|
||||
"eventos": true,
|
||||
}
|
||||
};
|
||||
if( window.innerWidth < 801) {
|
||||
this.router.navigate(['/home/gabinete-digital/event-list']);
|
||||
} else {
|
||||
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
close() {
|
||||
this.modalController.dismiss();
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
save() {
|
||||
@@ -313,6 +296,7 @@ export class EditEventToApproveComponent implements OnInit {
|
||||
|
||||
this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
|
||||
this.httpErroHalde.httpsSucessMessagge('Editar evento')
|
||||
window['approve-event-getTask']()
|
||||
}, error =>{
|
||||
this.httpErroHalde.httpStatusHandle(error)
|
||||
})
|
||||
@@ -347,9 +331,7 @@ export class EditEventToApproveComponent implements OnInit {
|
||||
|
||||
})
|
||||
|
||||
this.modalController.dismiss();
|
||||
this.goBack();
|
||||
|
||||
this.close();
|
||||
}
|
||||
|
||||
async openAttendees() {
|
||||
|
||||
Reference in New Issue
Block a user