diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index 7e9722671..32740eb16 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -32,7 +32,6 @@
- @@ -50,7 +49,6 @@
-
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.scss b/src/app/pages/gabinete-digital/event-list/event-list.page.scss index 97a3d78d6..8b6826245 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.scss +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.scss @@ -29,7 +29,7 @@ float: left; } ion-item-sliding{ - margin-top: 5px; + margin-top: 10px; } .Rectangle { //width: 360px; diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts index 758d60d91..1babb75f8 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.ts +++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts @@ -42,6 +42,7 @@ export class DeplomaOptionsPage implements OnInit { async openAddNoteModal(actionName:string) { + this.popoverController.dismiss(); let classs; if( window.innerWidth <= 800){ classs = 'modal modal-desktop' diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index 5ba718866..c478e110d 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -194,6 +194,7 @@ export class DespachosOptionsPage implements OnInit { } async openAddNoteModal(actionName:string) { + this.popoverController.dismiss(); let classs; if( window.innerWidth <= 800){ classs = 'modal modal-desktop' diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts index 2b80d3d58..c94bd2de4 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts @@ -65,7 +65,7 @@ export class DespachosPrOptionsPage implements OnInit { async openExpedientActionsModal(taskAction: any, task: any) { - //this.modalController.dismiss(); + this.popoverController.dismiss(); let classs; if( window.innerWidth <= 800){ classs = 'modal modal-desktop' @@ -102,6 +102,7 @@ export class DespachosPrOptionsPage implements OnInit { } async distartExpedientModal(){ + this.popoverController.dismiss(); console.log(this.fulltask); const modal = await this.modalController.create({ component: DiscartExpedientModalPage, @@ -128,6 +129,7 @@ export class DespachosPrOptionsPage implements OnInit { async openBookMeetingModal(task: any) { + this.popoverController.dismiss(); let classs; if( window.innerWidth <= 800){ classs = 'book-meeting-modal modal modal-desktop' @@ -147,6 +149,7 @@ export class DespachosPrOptionsPage implements OnInit { } async openDelegarModal(task: any) { + this.popoverController.dismiss(); let classs; if( window.innerWidth <= 800){ classs = 'book-meeting-modal modal modal-desktop' @@ -187,6 +190,7 @@ export class DespachosPrOptionsPage implements OnInit { } async openAddNoteModal(actionName:string) { + this.popoverController.dismiss(); let classs; if( window.innerWidth <= 800){ classs = 'modal modal-desktop' diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts index 141bf24f5..c4abc7566 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts @@ -68,6 +68,7 @@ export class OptsExpedientePrPage implements OnInit { } async openAddNoteModal(actionName:string) { + this.popoverController.dismiss(); let classs; if( window.innerWidth <= 800){ classs = 'modal modal-desktop' @@ -131,6 +132,7 @@ export class OptsExpedientePrPage implements OnInit { } async distartExpedientModal(body:any) { + this.popoverController.dismiss(); console.log(this.fulltask); const modal = await this.modalController.create({ component: DiscartExpedientModalPage, @@ -214,7 +216,7 @@ export class OptsExpedientePrPage implements OnInit { } async openExpedientActionsModal(taskAction: any, task: any) { - //this.modalController.dismiss(); + this.popoverController.dismiss(); let classs; if( window.innerWidth <= 800){ classs = 'modal modal-desktop' @@ -243,13 +245,13 @@ export class OptsExpedientePrPage implements OnInit { } else{ console.log('Not open'); - } }); } async openBookMeetingModal(task: any) { + this.popoverController.dismiss(); let classs; if( window.innerWidth <= 800){ classs = 'book-meeting-modal modal modal-desktop' @@ -289,24 +291,5 @@ export class OptsExpedientePrPage implements OnInit { // window.history.back(); } - - - - - async badRequest(message?: string, callback?) { - const modal = await this.modalController.create({ - component: BadRequestPage, - componentProps: { - message: 'hello', - }, - cssClass: 'modal modal-desktop' - }); - - modal.present() - - setTimeout(()=>{ - modal.dismiss() - },1000) - } } diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index e695f712a..3964e824a 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -97,6 +97,7 @@ export class RequestOptionsPage implements OnInit { } async openExpedientActionsModal(taskAction: any, task: any) { + this.popoverController.dismiss(); //this.modalController.dismiss(); let classs; if( window.innerWidth <= 800) {