diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 4885f4a6d..a90a0b932 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -22,7 +22,13 @@ export class HomePage implements OnInit { totalExpediente = 0; profile: string; - constructor(private zone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { } + constructor(private zone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController) { + + router.events.subscribe((val) => { + document.querySelectorAll('ion-modal').forEach((e)=>e.remove()) + }); + + } ngOnInit() { /* //Initialize profile as mdgpr diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index aff8edc3a..11f2c739c 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -65,6 +65,8 @@ S }); } async openApproveModal(eventSerialNumber){ + + const modal = await this.modalController.create({ component: ApproveEventModalPage, componentProps:{ diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 7523b294a..cc9e51ebc 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -35,7 +35,6 @@ export class GabineteDigitalPage implements OnInit { constructor( private processesbackend:ProcessesService, private modalController: ModalController, - private eventService: EventsService, private alertService: AlertService) { window.onresize = (event) => { @@ -43,10 +42,32 @@ export class GabineteDigitalPage implements OnInit { if( window.innerWidth <= 1024){ this.modalController.dismiss(); } + this.adjastModalHeight(); }; + + this.adjastModalHeight(); } + adjastModalHeight(){ + setTimeout(() => { + if( window.innerWidth <= 1366){ + + document.querySelectorAll('.gabinete-digital-mobile-modal-to-Desktop').forEach(e=>{ + console.log('adjast width') + e.setAttribute('style',`height:${window.innerHeight - (74 + 57)}px`) + }) + } else if( window.innerWidth >= 1366){ + document.querySelectorAll('.gabinete-digital-mobile-modal-to-Desktop').forEach(e=>{ + console.log('adjast width') + e.setAttribute('style',`height:${window.innerHeight - (74)}px`) + }) + } + }, 200); + + + } + closeAllDesktopComponent(){ this.desktopComponent = { showEventList: false, @@ -114,6 +135,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ } //if( window.innerWidth <= 1024){ + this.adjastModalHeight(); const modal = await this.modalController.create({ component: EventListPage, componentProps:{ @@ -142,6 +164,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ } //if( window.innerWidth <= 1024){ + this.adjastModalHeight(); const modal = await this.modalController.create({ component: ExpedientePage, componentProps:{ diff --git a/src/app/shared/gabinete-digital/expediente/expediente.page.ts b/src/app/shared/gabinete-digital/expediente/expediente.page.ts index 46d7306b3..867834f3c 100644 --- a/src/app/shared/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/shared/gabinete-digital/expediente/expediente.page.ts @@ -76,6 +76,7 @@ export class ExpedientePage implements OnInit { const modal = await this.modalController.create({ component: ExpedienteDetailPage, componentProps:{ + enterAnimation: "", serialNumber: serialNumber, profile: this.profile, }, diff --git a/src/global.scss b/src/global.scss index 665aa4d4b..0f361a714 100644 --- a/src/global.scss +++ b/src/global.scss @@ -174,7 +174,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- display: none; } -.timeline-box-{} +/* .timeline-box-{} */ .calendar-event-border{ @@ -306,25 +306,55 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- .gabinete-digital-mobile-modal-to-Desktop{ top: 75px; left: 340px; + transform: none !important; ion-backdrop{ - display: none; + display: none; + transform: none !important; } .modal-wrapper{ + transform: none !important; width: 100%; height: 100%; box-shadow: none !important; + .ion-page { + transform: none !important; + } } } .chat-mobile-modal-to-Desktop{ top: 75px; left: 340px; + transform: none !important; ion-backdrop{ - display: none; + display: none; + transform: none !important; } .modal-wrapper{ + transform: none !important; width: 100%; height: 100%; box-shadow: none !important; + .ion-page { + transform: none !important; + } } } + +@media only screen and (min-width: 1024px) { + .gabinete-digital-mobile-modal-to-Desktop{ + top: 75px; + left: 340px; + + .modal-wrapper{ + transform: none !important; + width: 100%; + height: 100%; + box-shadow: none !important; + .ion-page { + transform: none !important; + } + } + } +} +