Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

This commit is contained in:
Peter Maquiran
2021-06-29 14:17:15 +01:00
18 changed files with 1256 additions and 202 deletions
@@ -39,6 +39,8 @@ export class ApproveEventPage implements OnInit {
@Output() closeEventToApprove = new EventEmitter<any>();
@Output() AproveEventEditEvent = new EventEmitter<any>();
@Output() EditApproveEventDismiss = new EventEmitter<any>();
constructor(
private router:Router,
private modalController: ModalController,
@@ -202,9 +204,13 @@ export class ApproveEventPage implements OnInit {
async editar(serialNumber: string) {
const modal = await this.modalController.create({
if(window.innerWidth > 800){
console.log('DESTOP');
this.EditApproveEventDismiss.emit();
}
else{
/* const modal = await this.modalController.create({
component: EditEventToApproveComponent,
componentProps: {
serialNumber: serialNumber,
@@ -213,15 +219,16 @@ export class ApproveEventPage implements OnInit {
cssClass: 'modal modal-desktop',
// backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then(res => {
this.getTask();
this.getAttachments();
});
}); */
}
}
}
}