From 081f731503a5346402ee2ef8867f19626bde41a9 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 11 Mar 2021 12:01:14 +0100 Subject: [PATCH] Convert gabinete digital mobile to desktop --- .../approve-event-modal/approve-event-modal.page.ts | 2 ++ .../pages/gabinete-digital/event-list/event-list.page.ts | 9 ++++++++- src/app/pages/search/search.page.html | 2 +- src/global.scss | 4 ++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index 15ca40eef..d88b2a1ef 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts @@ -51,6 +51,8 @@ export class ApproveEventModalPage implements OnInit { ngOnInit() { this.getTask(); this.getAttachments(); + + } 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 11f2c739c..666145b04 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 @@ -67,12 +67,19 @@ S async openApproveModal(eventSerialNumber){ + let classs; + if( window.innerWidth <= 1024){ + 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: 'cal-modal modal modal-desktop', + cssClass: classs, backdropDismiss: false }); diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index a7e0a6a00..333d8b741 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -155,7 +155,7 @@ - + diff --git a/src/global.scss b/src/global.scss index 96c86704f..bf4f3103d 100644 --- a/src/global.scss +++ b/src/global.scss @@ -374,4 +374,8 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- } } } +} + +.gabinete-digital-mobile-modal-to-Desktop{ + border-top-right-radius: 27px; } \ No newline at end of file