commit

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts

@@ -392,7 +392,7 @@ export class DespachoPrPage implements OnInit {
       backdropDismiss: true
     });
 
-    await modal.present();
+
 
     modal.onDidDismiss().then(async (res) => {
       
@@ -433,6 +433,8 @@ export class DespachoPrPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
@@ -455,7 +457,7 @@ export class DespachoPrPage implements OnInit {
       },
       cssClass: classs,
     });
-    await modal.present();
+
     modal.onDidDismiss().then(res => {
       
       if (res['data'] == 'openDiscart') {
@@ -469,6 +471,8 @@ export class DespachoPrPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async distartExpedientModal2(task: any) {
@@ -483,12 +487,14 @@ export class DespachoPrPage implements OnInit {
       backdropDismiss: false
     });
 
-    await modal.present();
+
     modal.onDidDismiss().then(() => {
       this.TaskService.loadDiplomas()
     }, (error) => {
       console.log(error)
     })
+
+    await modal.present();
   }
 
   async openBookMeetingModal(task: any) {
@@ -506,13 +512,15 @@ export class DespachoPrPage implements OnInit {
       cssClass: classs,
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss().then(
       ()=>{}
       , (error) => {
         console.log(error)
       }
     )
+
+    await modal.present();
   }
 
   async openDelegarModal(task: any) {
@@ -558,7 +566,7 @@ export class DespachoPrPage implements OnInit {
       backdropDismiss: false
     });
 
-    await modal.present();
+
     modal.onDidDismiss().then(res => {
       if (res['data'] == 'close') {
         this.close();
@@ -567,6 +575,8 @@ export class DespachoPrPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async openOptions(taskAction?: any) {

src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts

@@ -237,13 +237,15 @@ export class DespachosPrPage implements OnInit {
       },
       cssClass: classs,
     });
-    await modal.present();
+ 
     modal.onDidDismiss().then((res) => {
       
       this.LoadList();
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
 
@@ -277,13 +279,14 @@ export class DespachosPrPage implements OnInit {
       cssClass: classs,
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss().then(
       (e)=>{},
       (error) => {
         console.log(error)
       }
     );
+    await modal.present();
   }
 
 

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts

@@ -409,7 +409,6 @@ export class DespachoPage implements OnInit {
       backdropDismiss: true
     });
 
-    await modal.present();
 
     modal.onDidDismiss().then(async (res) => {
       if (res.data) {
@@ -446,6 +445,9 @@ export class DespachoPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
+
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
@@ -466,7 +468,7 @@ export class DespachoPage implements OnInit {
       },
       cssClass: classs,
     });
-    await modal.present();
+
     modal.onDidDismiss().then(async (res) => {
 
 
@@ -478,6 +480,8 @@ export class DespachoPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async openBookMeetingModal(task: any) {
@@ -495,8 +499,9 @@ export class DespachoPage implements OnInit {
       cssClass: classs,
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss();
+    await modal.present();
   }
 
   async openDelegarModal(task: any) {
@@ -514,7 +519,7 @@ export class DespachoPage implements OnInit {
       cssClass: classs,
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss().then(res => {
       if (res) {
         const data = res.data;
@@ -527,6 +532,7 @@ export class DespachoPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+    await modal.present();
   }
 
   async distartExpedientModal() {
@@ -542,7 +548,6 @@ export class DespachoPage implements OnInit {
       backdropDismiss: false
     });
 
-    await modal.present();
     modal.onDidDismiss().then(res => {
       if (res['data'] == 'close') {
         this.close();
@@ -555,6 +560,7 @@ export class DespachoPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+    await modal.present();
   }
 
   async openOptions(taskAction?: any) {
@@ -570,7 +576,7 @@ export class DespachoPage implements OnInit {
       },
       translucent: true
     });
-    await popover.present();
+
 
     popover.onDidDismiss().then((res) => {
       // console.log('res', res.data)
@@ -582,6 +588,8 @@ export class DespachoPage implements OnInit {
       console.log(error)
     })
 
+    await popover.present();
+
   }
 
 

src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts

@@ -243,7 +243,7 @@ export class DiplomaAssinarPage implements OnInit {
       backdropDismiss: true
     });
 
-    await modal.present();
+
 
     modal.onDidDismiss().then(async (res) => {
       if (res.data) {
@@ -282,6 +282,7 @@ export class DiplomaAssinarPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+    await modal.present();
   }
 
   async arquivar(note: string, documents: AttachmentList) {
@@ -346,7 +347,7 @@ export class DiplomaAssinarPage implements OnInit {
       backdropDismiss: false
     });
 
-    await modal.present();
+
     modal.onDidDismiss().then(res => {
       if (res['data'] == 'close') {
         this.close();
@@ -358,6 +359,8 @@ export class DiplomaAssinarPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   toDateString(e) {

src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts

@@ -158,7 +158,7 @@ export class DiplomasGerarPage implements OnInit {
       cssClass: classs,
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss().then(res => {
       if(res){
         const data = res.data;
@@ -171,6 +171,8 @@ export class DiplomasGerarPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
 
@@ -189,12 +191,14 @@ export class DiplomasGerarPage implements OnInit {
       cssClass: classs,
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss().then(
       ()=>{},
       (error) => {
         console.log(error)
       })
+
+      await modal.present();
   }
 
   async sendExpedienteToPending() {
@@ -234,7 +238,7 @@ export class DiplomasGerarPage implements OnInit {
       backdropDismiss: true
     });
 
-    await modal.present();
+
 
     modal.onDidDismiss().then(async (res) => {
       if (res.data) {
@@ -281,6 +285,8 @@ export class DiplomasGerarPage implements OnInit {
       console.log(error)
     });
 
+    await modal.present();
+
   }
   
   async viewDocument(DocId:string, Document) {

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts

@@ -97,11 +97,17 @@ export class DiplomaPage implements OnInit {
       },
       translucent: true
     });
-    return await popover.present().then(() => {
+    
+    popover.onDidDismiss().then(() => {
       this.TaskService.loadDiplomas()
     }, (error) => {
       console.log(error)
+    }).catch((e) => {
+      console.log(e)
     })
+
+
+    let a = await popover.present();
   }
 
   async LoadTaskDetail(serial: string) {
@@ -328,7 +334,7 @@ export class DiplomaPage implements OnInit {
       backdropDismiss: true
     });
 
-    await modal.present();
+
 
     modal.onDidDismiss().then(async (res) => {
       this.TaskService.loadDiplomas()
@@ -367,6 +373,8 @@ export class DiplomaPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async openBookMeetingModal(task: any) {
@@ -384,12 +392,13 @@ export class DiplomaPage implements OnInit {
       cssClass: classs,
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss().then(
       ()=>{},
       (error) => {
         console.log(error)
       })
+      await modal.present();
   }
 
   async arquivar(note: string, documents: AttachmentList) {
@@ -438,7 +447,7 @@ export class DiplomaPage implements OnInit {
       },
       cssClass: classs,
     });
-    await modal.present();
+
     modal.onDidDismiss().then(async (res) => {
       
 
@@ -452,6 +461,8 @@ export class DiplomaPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async distartExpedientModal() {
@@ -467,7 +478,7 @@ export class DiplomaPage implements OnInit {
       backdropDismiss: false
     });
 
-    await modal.present();
+
     modal.onDidDismiss().then(res => {
       this.TaskService.loadDiplomas()
       if (res['data'] == 'close') {
@@ -480,6 +491,8 @@ export class DiplomaPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   getDocumentPdf(Documents: any) {

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts

@@ -191,7 +191,7 @@ export class ApproveEventModalPage implements OnInit {
       backdropDismiss: false
     });
 
-    await modal.present();
+
 
     modal.onDidDismiss().then( async (res) => {
       if(res.data.option == 'save') { 
@@ -232,6 +232,8 @@ export class ApproveEventModalPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async editar(serialNumber: string) {
@@ -245,8 +247,7 @@ export class ApproveEventModalPage implements OnInit {
       // backdropDismiss: false
     });
 
-    await modal.present();
-
+  
     modal.onDidDismiss().then(res => {
       this.getTask();
       this.getAttachments();
@@ -254,6 +255,9 @@ export class ApproveEventModalPage implements OnInit {
       console.log(error)
     });
 
+    await modal.present();
+
+
   } 
 
 

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts

@@ -181,7 +181,7 @@ export class ApproveEventPage implements OnInit {
       backdropDismiss: false
     });
 
-    await modal.present();
+
 
     modal.onDidDismiss()
       .then(async (res) => {
@@ -223,6 +223,8 @@ export class ApproveEventPage implements OnInit {
         console.log(error)
       });
 
+      await modal.present();
+
   }
 
   async rejeitar(serialNumber: string) {
@@ -297,7 +299,7 @@ export class ApproveEventPage implements OnInit {
       backdropDismiss: false
     });
 
-    await modal.present();
+
 
     modal.onDidDismiss().then(async (res) => {
       
@@ -337,6 +339,8 @@ export class ApproveEventPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   goToEventsToApprove() {
@@ -359,7 +363,7 @@ export class ApproveEventPage implements OnInit {
       cssClass: 'modal modal-desktop'
     });
 
-    await modal.present();
+
 
     modal.onDidDismiss().then(res => {
       this.getTask();
@@ -368,6 +372,7 @@ export class ApproveEventPage implements OnInit {
       console.log(error)
     });
 
+    await modal.present();
   }
 
 }

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts

@@ -374,7 +374,7 @@ export class BookMeetingModalPage implements OnInit {
         backdropDismiss: false
       });
 
-      await modal.present();
+
 
       modal.onDidDismiss().then((data) => {
 
@@ -391,6 +391,8 @@ export class BookMeetingModalPage implements OnInit {
         console.log(error)
       });
 
+      await modal.present();
+
     } else {
       this.showAttendees = true;
     }
@@ -450,12 +452,13 @@ export class BookMeetingModalPage implements OnInit {
       backdropDismiss: false
     });
 
-    await modal.present();
+
     modal.onDidDismiss().then(
       ()=> {}
       , (error) => {
         console.log(error)
       })
+      await modal.present();
   }
 
   async getDoc() {

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -507,7 +507,7 @@ export class ExpedientTaskModalPage implements OnInit {
         backdropDismiss: false
       });
 
-      await modal.present();
+
 
       modal.onDidDismiss().then((data) => {
 
@@ -523,6 +523,8 @@ export class ExpedientTaskModalPage implements OnInit {
       }, (error) => {
         console.log(error)
       });
+
+      await modal.present();
     } else {
       this.showAttendees = true
     }
@@ -585,9 +587,10 @@ export class ExpedientTaskModalPage implements OnInit {
       cssClass: classs,
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss().then((res)=>{
     });
+    await modal.present();
   }
 
 
@@ -601,7 +604,7 @@ export class ExpedientTaskModalPage implements OnInit {
         select: true
       }
     });
-    await modal.present();
+
       modal.onDidDismiss().then((res)=>{
         if(res){
           const data = res.data;
@@ -610,6 +613,8 @@ export class ExpedientTaskModalPage implements OnInit {
       }, (error) => {
         console.log(error)
       });
+
+      await modal.present();
   }
 
   removeAttachment(index: number){

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -289,7 +289,7 @@ export class ExpedienteDetailPage implements OnInit {
       //backdropDismiss: true
     });
 
-    await modal.present();
+
 
     modal.onDidDismiss().then(res => {
       
@@ -319,6 +319,8 @@ export class ExpedienteDetailPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   subscribeEventTrigger(value) {
@@ -465,7 +467,7 @@ export class ExpedienteDetailPage implements OnInit {
         findOnly: [8]
       }
     });
-    await modal.present();
+
     modal.onDidDismiss().then(async (res) => {
       if (res) {
         const data = res.data;
@@ -507,6 +509,8 @@ export class ExpedienteDetailPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
@@ -525,7 +529,7 @@ export class ExpedienteDetailPage implements OnInit {
       },
       cssClass: classs,
     });
-    await modal.present();
+
     modal.onDidDismiss().then(async (res) => {
       let body = res['data'];
       if (res['data']) {
@@ -545,6 +549,8 @@ export class ExpedienteDetailPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async distartExpedientModal(body: any) {
@@ -556,7 +562,6 @@ export class ExpedienteDetailPage implements OnInit {
       backdropDismiss: false
     });
 
-    await modal.present();
     modal.onDidDismiss().then(async (res) => {
       
       
@@ -629,6 +634,8 @@ export class ExpedienteDetailPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async openBookMeetingModal(task: any) {
@@ -648,12 +655,14 @@ export class ExpedienteDetailPage implements OnInit {
       cssClass: classs,
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss().then(res => {
 
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   goToEvent(eventId: any) {
@@ -672,13 +681,15 @@ export class ExpedienteDetailPage implements OnInit {
       cssClass: 'modal modal-desktop',
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss().then((res) => {
       if (res) {
       }
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async openOptions(taskAction?: any) {
@@ -724,12 +735,14 @@ export class ExpedienteDetailPage implements OnInit {
         task: this.task
       },
     });
-    await modal.present();
+
     modal.onDidDismiss().then(
       ()=>{}, 
       (error) => {
         console.log(error)
       })
+
+      await modal.present();
   }
 
 }

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts

@@ -201,7 +201,7 @@ export class ExpedientePrPage implements OnInit {
         select: true
       }
     });
-    await modal.present();
+
       modal.onDidDismiss().then((res)=>{
         if(res){
           
@@ -241,6 +241,8 @@ export class ExpedientePrPage implements OnInit {
       console.log(error)
     });
 
+    await modal.present();
+
   }
 
   removeAttachment(index: number){
@@ -322,7 +324,7 @@ export class ExpedientePrPage implements OnInit {
       //backdropDismiss: true
     });
 
-    await modal.present();
+
 
     modal.onDidDismiss().then(res => {
       
@@ -352,6 +354,8 @@ export class ExpedientePrPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
@@ -371,7 +375,7 @@ export class ExpedientePrPage implements OnInit {
       },
       cssClass: classs,
     });
-    await modal.present();
+
     modal.onDidDismiss().then(async(res)=>{
       let body = res['data'];
       if(res['data']) {
@@ -396,6 +400,8 @@ export class ExpedientePrPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async distartExpedientModal(body:any){
@@ -407,7 +413,7 @@ export class ExpedientePrPage implements OnInit {
       backdropDismiss: false
     });
 
-    await modal.present();
+
     modal.onDidDismiss().then( async (res)=>{
       
 
@@ -481,6 +487,8 @@ export class ExpedientePrPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async distartExpedientModal2(task: any){
@@ -495,13 +503,15 @@ export class ExpedientePrPage implements OnInit {
       backdropDismiss: false
     });
 
-    await modal.present();
+
     modal.onDidDismiss().then(
       () => {},
       (error) => {
         console.log(error)
       }
     )
+
+    await modal.present();
   }
 
   async openBookMeetingModal(task: any) {
@@ -519,13 +529,14 @@ export class ExpedientePrPage implements OnInit {
       cssClass: classs,
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss().then(
       ()=>{}, 
       (error) => {
         console.log(error)
       }
     )
+    await modal.present();
   }
 
   async viewEventDetail(eventId: any) {
@@ -540,13 +551,15 @@ export class ExpedientePrPage implements OnInit {
       cssClass: 'modal modal-desktop',
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss().then((res) => {
       if (res) {
       }
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async openOptions(taskAction?: any) {

src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -154,13 +154,14 @@ export class ExpedientesPrPage implements OnInit {
       },
       cssClass: 'modal modal-desktop',
     });
-    await modal.present();
+
     modal.onDidDismiss().then((res)=>{
       
       this.LoadList();
     }, (error) => {
       console.log(error)
     });
+    await modal.present();
   }
 
   goBack() {

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -112,7 +112,6 @@ export class GabineteDigitalPage implements OnInit {
 
     window.onresize = (event) => {
       if (window.innerWidth < 701) {
-        this.modalController.dismiss();
         this.hideRefreshBtn = false;
         this.hideInMobile = false;
         this.segmentVista = "listview";

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts

@@ -383,13 +383,15 @@ export class PedidoPage implements OnInit {
       },
       cssClass: classs,
     });
-    await modal.present();
+
     modal.onDidDismiss().then(res => {
       
       this.goBack();
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async openBookMeetingModal(task: any) {
@@ -407,12 +409,14 @@ export class PedidoPage implements OnInit {
       cssClass: classs,
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss().then(
       ()=>{},
       (error) => {
         console.log(error)
       });
+
+      await modal.present();
   }
 
   openNewGroupPage() {
@@ -438,13 +442,14 @@ export class PedidoPage implements OnInit {
         task: this.task
       },
     });
-    await modal.present();
+
     modal.onDidDismiss().then(
       ()=>{},
       (error) => {
         console.log(error)
       }
     )
+    await modal.present();
   }
 
   // async viewEventDetail(eventId: any) {
@@ -477,7 +482,7 @@ export class PedidoPage implements OnInit {
       backdropDismiss: false
     });
 
-    await modal.present();
+
     modal.onDidDismiss().then(res => {
       if (res['data'] == 'close') {
         this.close();
@@ -489,6 +494,8 @@ export class PedidoPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async openDelegarModal(task: any) {
@@ -508,7 +515,7 @@ export class PedidoPage implements OnInit {
       cssClass: classs,
       backdropDismiss: false
     });
-    await modal.present();
+  
     modal.onDidDismiss().then(res => {
       if(res){
         const data = res.data;
@@ -520,6 +527,8 @@ export class PedidoPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async openForwardModal(task: any) {
@@ -538,12 +547,14 @@ export class PedidoPage implements OnInit {
       cssClass: classs,
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss().then(
       ()=>{},
       (error) => {
         console.log(error)
       })
+    
+      await modal.present();
   }
 
   async openDarParecer(task: any) {
@@ -564,7 +575,7 @@ export class PedidoPage implements OnInit {
       cssClass: classs,
       backdropDismiss: false
     });
-    await modal.present();
+
     modal.onDidDismiss().then(res => {
       this.TaskService.loadPedidos();
       if(res.data == 'sucess'){
@@ -573,6 +584,8 @@ export class PedidoPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   async openAddNoteModal(actionName: string) {
@@ -593,7 +606,7 @@ export class PedidoPage implements OnInit {
     });
 
 
-    await modal.present();
+
 
     modal.onDidDismiss().then(async (res) => {
       const DocumentToSave = await res.data.documents.map(async (e) => {
@@ -624,6 +637,8 @@ export class PedidoPage implements OnInit {
     }, (error) => {
       console.log(error)
     });
+
+    await modal.present();
   }
 
   goBack() {