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 f2a607b1d..a24365d5f 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 @@ -32,8 +32,7 @@ export class EventListPage implements OnInit { ngOnInit() { this.profile = this.navParams.get('profile'); - console.log(this.profile); - + /* console.log(this.navParams.get('md')); */ if(this.profile == "mdgpr"){ this.profile = 'MDGPR' @@ -74,19 +73,14 @@ export class EventListPage implements OnInit { } async openApproveModal(eventSerialNumber){ - let classs; - if( window.innerWidth <= 800){ - classs = 'cal-modal modal modal-desktop' - } else { - classs = 'gabinete-digital-mobile-modal-to-Desktop' - } + const modal = await this.modalController.create({ component: ApproveEventModalPage, componentProps:{ serialNumber: eventSerialNumber, }, - cssClass: 'event-list', + cssClass: 'event-list cal-modal modal modal-desktop', backdropDismiss: false }); diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index b25cf5eac..a6f019fbc 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -65,14 +65,7 @@ export class ExpedientePage implements OnInit { } async viewExpedientDetail(serialNumber:any) { - console.log(this.profile); - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop ' - } else { - classs = 'gabinete-digital-mobile-modal-to-Desktop' - } const modal = await this.modalController.create({ component: ExpedienteDetailPage, @@ -80,7 +73,7 @@ export class ExpedientePage implements OnInit { serialNumber: serialNumber, profile: this.profile, }, - cssClass: classs, + cssClass: 'modal modal-desktop', backdropDismiss: false }); await modal.present(); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 412623260..8cc4ca006 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -53,10 +53,8 @@ export class GabineteDigitalPage implements OnInit { if( window.innerWidth <= 1024){ this.modalController.dismiss(); } - this.adjastModalHeight(); - }; - this.adjastModalHeight(); + }; this.activatedRoute.queryParams.subscribe(params => { if(params["show"]){ @@ -69,24 +67,6 @@ export class GabineteDigitalPage implements OnInit { } - 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 = { @@ -178,22 +158,13 @@ this.processesbackend.GetActionsList().subscribe(res=>{ async openEventsToApproveList(profile:any){ this.closeAllDesktopComponent(); - - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'gabinete-digital-mobile-modal-to-Desktop' - } - //if( window.innerWidth <= 1024){ - this.adjastModalHeight(); const modal = await this.modalController.create({ component: EventListPage, componentProps:{ profile: profile, }, - cssClass: classs, + cssClass: 'modal modal-desktop', backdropDismiss: false }); await modal.present(); @@ -227,21 +198,14 @@ this.processesbackend.GetActionsList().subscribe(res=>{ async openExpedientList(){ this.closeAllDesktopComponent(); - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal modal-desktop' - } else { - classs = 'gabinete-digital-mobile-modal-to-Desktop' - } //if( window.innerWidth <= 1024){ - this.adjastModalHeight(); const modal = await this.modalController.create({ component: ExpedientePage, componentProps:{ profile: this.profile, }, - cssClass: classs, + cssClass: 'modal modal-desktop', backdropDismiss: false }); await modal.present(); diff --git a/src/global.scss b/src/global.scss index 9478fb330..dfde65192 100644 --- a/src/global.scss +++ b/src/global.scss @@ -399,24 +399,7 @@ border-top: 1px solid #d8d8d8; -.gabinete-digital-mobile-modal-to-Desktop{ - top: 75px; - left: 340px; - transform: none !important; - ion-backdrop{ - 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; @@ -438,20 +421,6 @@ border-top: 1px solid #d8d8d8; } @media only screen and (min-width: 1365px) { - .gabinete-digital-mobile-modal-to-Desktop{ - //top: 75px; - left: 40%; - - .modal-wrapper{ - transform: none !important; - width: 100%; - height: 100%; - box-shadow: none !important; - .ion-page { - transform: none !important; - } - } - } .search-modal{ ion-backdrop{ @@ -490,9 +459,7 @@ border-top: 1px solid #d8d8d8; } } -.gabinete-digital-mobile-modal-to-Desktop{ - border-top-right-radius: 27px; -} + /* Breakpoints */ ._xs{