diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
index 47245336b..16c3a8307 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
@@ -48,7 +48,7 @@
{{customDate}}
- das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
+ das {{loadedEvent.workflowInstanceDataFields.StartDate}} às {{loadedEvent.workflowInstanceDataFields.EndDate}}
(Não se repete)
Repete
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 666145b04..9f683ff49 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
@@ -34,6 +34,7 @@ S
this.segment = this.navParams.get('segment');
/* console.log(this.navParams.get('md')); */
console.log(this.segment);
+
this.LoadToApproveEvents();
@@ -64,9 +65,9 @@ S
this.eventsMDGPRList = res;
});
}
+
+
async openApproveModal(eventSerialNumber){
-
-
let classs;
if( window.innerWidth <= 1024){
classs = 'cal-modal modal modal-desktop'
@@ -79,7 +80,7 @@ S
componentProps:{
serialNumber: eventSerialNumber,
},
- cssClass: classs,
+ cssClass: 'event-list',
backdropDismiss: false
});
@@ -87,6 +88,7 @@ S
modal.onDidDismiss();
}
+
doRefresh(event) {
this.LoadToApproveEvents();
console.log('refresh');
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index 93fef7c8f..28b062b11 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -67,28 +67,23 @@ S
});
}
async openApproveModal(eventSerialNumber){
-
-
let classs;
if( window.innerWidth <= 1024){
- classs = 'cal-modal modal modal-desktop'
+ classs = 'modal modal-desktop'
} else {
- classs = 'gabinete-digital-mobile-modal-to-Desktop'
+ classs = 'modal modal-desktop'
}
-
const modal = await this.modalController.create({
component: ApproveEventModalPage,
componentProps:{
serialNumber: eventSerialNumber,
},
cssClass: classs,
- backdropDismiss: false
});
-
await modal.present();
-
modal.onDidDismiss();
}
+
doRefresh(event) {
this.LoadToApproveEvents();
console.log('refresh');