diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index 5dc50a9a5..1191e66de 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -59,7 +59,6 @@ export class EditEventPage implements OnInit { console.log(this.postEvent); this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { - this.isEventEdited = true; const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento actualizado', @@ -67,7 +66,7 @@ export class EditEventPage implements OnInit { }); await alert.present(); }); - + this.isEventEdited = true; this.modalController.dismiss(this.isEventEdited); } diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 6c577483a..76a839975 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -15,6 +15,7 @@ import { EventDetailModalPage } from './event-detail-modal/event-detail-modal.pa import { ProcessesService } from '../../services/processes.service'; import { DailyWorkTask } from '../../models/dailyworktask.model'; import { ViewEventPage } from '../agenda/view-event/view-event.page'; +import { ExpedientePage } from '../gabinete-digital/expediente/expediente.page'; @Component({ selector: 'app-events', @@ -316,6 +317,27 @@ export class EventsPage implements OnInit { }); } + async viewExpedient(serialNumber:any) { + console.log(this.profile); + + const modal = await this.modalController.create({ + component: ExpedientePage, + componentProps:{ + serialNumber: serialNumber, + profile: this.profile, + }, + cssClass: 'modal', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss().then((res)=>{ + if(res){ + console.log(res); + this.RefreshEvents(); + } + }); + } + diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 46afcf33a..c11edd1fb 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { ModalController } from '@ionic/angular'; +import { ModalController, NavParams } from '@ionic/angular'; import { CalendarComponent } from 'ionic2-calendar'; import { DailyWorkTask } from '../../../models/dailyworktask.model'; @@ -20,10 +20,14 @@ export class ExpedientePage implements OnInit { @ViewChild(CalendarComponent) myCal: CalendarComponent; taskslist:DailyWorkTask[]; + serialNumber:string; constructor( private modalCtrl: ModalController, - private processes:ProcessesService) { } + private navParams: NavParams, + private processes:ProcessesService) { + this.serialNumber = this.navParams.get('serialNumber'); + } ngOnInit() { //Inicializar segment