diff --git a/src/app/modals/add-note/add-note.page.ts b/src/app/modals/add-note/add-note.page.ts index 2901666af..5be2d0be6 100644 --- a/src/app/modals/add-note/add-note.page.ts +++ b/src/app/modals/add-note/add-note.page.ts @@ -54,7 +54,7 @@ export class AddNotePage implements OnInit { select: true } }); - await modal.present(); + modal.onDidDismiss().then((res)=>{ if(res){ const data = res.data; @@ -64,6 +64,8 @@ export class AddNotePage implements OnInit { console.log(error) }); + await modal.present(); + } removeAttachment(index: number){ diff --git a/src/app/modals/chat-options-features/chat-options-features.page.ts b/src/app/modals/chat-options-features/chat-options-features.page.ts index c67aa3313..70794ecab 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.ts +++ b/src/app/modals/chat-options-features/chat-options-features.page.ts @@ -204,7 +204,7 @@ export class ChatOptionsFeaturesPage implements OnInit { cssClass: 'modal modal-desktop', backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { if(data){ @@ -212,6 +212,8 @@ export class ChatOptionsFeaturesPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } else{ this.modalController.dismiss('meeting'); diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 06c3666a4..038a5880d 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -589,8 +589,7 @@ export class CreateProcessPage implements OnInit { backdropDismiss: false }); - await modal.present(); - + modal.onDidDismiss().then((data) => { if (data) { @@ -605,6 +604,9 @@ export class CreateProcessPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); + } else { this.showAttendees = true } @@ -629,7 +631,6 @@ export class CreateProcessPage implements OnInit { backdropDismiss: false }); - await modal.present(); modal.onDidDismiss().then((data) => { @@ -646,6 +647,9 @@ export class CreateProcessPage implements OnInit { console.log(error) }); + await modal.present(); + + } else { this.showAttendees = true } @@ -664,7 +668,7 @@ export class CreateProcessPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(res => { if (res['data'] == 'close') { this.modalController.dismiss(res['data']) @@ -673,6 +677,8 @@ export class CreateProcessPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } async setContact(data: EventPerson[]) { @@ -721,12 +727,14 @@ export class CreateProcessPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((res) => { }, (error) => { console.log(error) }); + + await modal.present(); } @@ -747,7 +755,7 @@ export class CreateProcessPage implements OnInit { select: true } }); - await modal.present(); + modal.onDidDismiss().then((res) => { if (res) { const data = res.data; @@ -756,6 +764,8 @@ export class CreateProcessPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } } diff --git a/src/app/modals/dar-parecer/dar-parecer.page.ts b/src/app/modals/dar-parecer/dar-parecer.page.ts index 8760fb9e4..aea5428c4 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.ts +++ b/src/app/modals/dar-parecer/dar-parecer.page.ts @@ -91,8 +91,8 @@ export class DarParecerPage implements OnInit { select: true } }); - await modal.present(); - modal.onDidDismiss().then((res)=>{ + + modal.onDidDismiss().then((res)=>{ if(res){ const data = res.data; this.documents.push(data.selected); @@ -100,6 +100,8 @@ export class DarParecerPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index f510a13a9..fcda6dddf 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -125,7 +125,7 @@ export class DelegarPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { if(data) { @@ -138,6 +138,8 @@ export class DelegarPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } else { this.showAttendees=true } diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index ce671a45c..97d0379d4 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -197,11 +197,13 @@ export class DocumentDetailPage implements OnInit { }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then( async(res)=>{}, (error) => { console.log(error) }); + await modal.present(); + } async openBookMeetingModal() { @@ -221,12 +223,14 @@ export class DocumentDetailPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(res=>{ //this.RouteService.goBack(); }, (error) => { console.log(error) }); + + await modal.present(); } async openOptions() { @@ -239,7 +243,7 @@ export class DocumentDetailPage implements OnInit { }, translucent: true }); - await popover.present() + popover.onDidDismiss().then((res:any) => { if(res.data.component == 'openBookMeetingModal') { @@ -250,6 +254,8 @@ export class DocumentDetailPage implements OnInit { }, (error) => { console.log(error) }); + + await popover.present() } } diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index 6d14ddbd8..a7ad1f857 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -322,8 +322,6 @@ export class DocumentSetUpMeetingPage implements OnInit { backdropDismiss: false }); - await modal.present(); - modal.onDidDismiss().then((data) => { if(data) { @@ -339,6 +337,8 @@ export class DocumentSetUpMeetingPage implements OnInit { console.log(error) }); + await modal.present() + } else { this.showAttendees = true; } @@ -360,7 +360,7 @@ export class DocumentSetUpMeetingPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { @@ -376,6 +376,8 @@ export class DocumentSetUpMeetingPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } else { this.showAttendees = true; } @@ -391,7 +393,7 @@ export class DocumentSetUpMeetingPage implements OnInit { select: true } }); - await modal.present(); + modal.onDidDismiss().then((res)=> { if(res){ const data = res.data; @@ -400,6 +402,8 @@ export class DocumentSetUpMeetingPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } removeAttachment(index: number) { diff --git a/src/app/modals/forward/forward.page.ts b/src/app/modals/forward/forward.page.ts index 217d9a00e..a75e620c9 100644 --- a/src/app/modals/forward/forward.page.ts +++ b/src/app/modals/forward/forward.page.ts @@ -173,7 +173,7 @@ export class ForwardPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { if(data) { @@ -186,6 +186,8 @@ export class ForwardPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } else { this.showAttendees=true } diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index 3818ccd7d..d50e7b92b 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -304,7 +304,7 @@ export class ProfilePage implements OnInit { componentProps: { } }); - await modal.present(); + modal.onDidDismiss().then(() => { this.isProfileOpen = false; @@ -312,6 +312,8 @@ export class ProfilePage implements OnInit { console.log(error) }) + await modal.present(); + } } diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts index d1ddf133e..703d19469 100644 --- a/src/app/modals/view-document/view-document.page.ts +++ b/src/app/modals/view-document/view-document.page.ts @@ -131,12 +131,14 @@ export class ViewDocumentPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(res=>{ //this.RouteService.goBack(); }, (error) => { console.log(error) }); + + await modal.present(); } // efetuar despacho @@ -159,7 +161,7 @@ export class ViewDocumentPage implements OnInit { }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then( async(res)=>{} , (error) => { @@ -167,6 +169,8 @@ export class ViewDocumentPage implements OnInit { } ); + await modal.present(); + } } diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts index df3a77296..a50efda54 100644 --- a/src/app/modals/view-event/view-event.page.ts +++ b/src/app/modals/view-event/view-event.page.ts @@ -208,7 +208,7 @@ export class ViewEventPage implements OnInit { cssClass: 'discart-expedient-modal', }); - await modal.present(); + modal.onDidDismiss().then((res) => { if (res) { @@ -222,6 +222,8 @@ export class ViewEventPage implements OnInit { console.log(error) }); + await modal.present(); + } @@ -236,7 +238,7 @@ export class ViewEventPage implements OnInit { cssClass: 'modal modal-desktop', }); - await modal.present(); + modal.onDidDismiss().then((res) => { if (res) { @@ -250,6 +252,8 @@ export class ViewEventPage implements OnInit { console.log(error) }); + await modal.present(); + } async editEvent() { @@ -269,7 +273,7 @@ export class ViewEventPage implements OnInit { }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then((res) => { if (res) { @@ -282,6 +286,7 @@ export class ViewEventPage implements OnInit { }, (error) => { console.log(error) }); + await modal.present(); } docIndex(index: number) { @@ -347,12 +352,13 @@ export class ViewEventPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(res => { //this.RouteService.goBack(); }, (error) => { console.log(error) }); + await modal.present(); } // efetuar despacho @@ -374,13 +380,15 @@ export class ViewEventPage implements OnInit { }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then( async (res) => { }, (error) => { console.log(error) }); + await modal.present(); + } diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index fdcc88b7b..71eb8c44c 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -930,13 +930,15 @@ export class AgendaPage implements OnInit { cssClass: 'modal modal-desktop', backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { if (data) { } this.openAddEventDismiss(data['data']) }); + + await modal.present(); } else { this.mobileComponent.showAddNewEvent = true; this.taskParticipants = [{ diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index cad8a56c1..e5d4aefe6 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -530,7 +530,7 @@ export class EditEventPage implements OnInit { select: true, } }); - await modal.present(); + modal.onDidDismiss().then( async (res)=> { if(res) { const data = res.data; @@ -555,6 +555,8 @@ export class EditEventPage implements OnInit { } }) + + await modal.present(); } } diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts index 1619476af..2afa6d17f 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts @@ -102,7 +102,6 @@ export class EventActionsPopoverPage implements OnInit { backdropDismiss: false }); - await modal.present(); modal.onDidDismiss() .then( async (res) => { @@ -140,6 +139,9 @@ export class EventActionsPopoverPage implements OnInit { } }); + + await modal.present(); + } async rejeitar() { @@ -173,9 +175,10 @@ export class EventActionsPopoverPage implements OnInit { // backdropDismiss: false }); - await modal.present(); modal.onDidDismiss().then(res => {}); + await modal.present(); + } diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index b9207f186..10ff02fdc 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -514,7 +514,7 @@ export class NewEventPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { @@ -532,6 +532,8 @@ export class NewEventPage implements OnInit { } }); + + await modal.present(); } setIntervenient(data) { @@ -566,13 +568,15 @@ export class NewEventPage implements OnInit { select: true } }); - await modal.present(); + modal.onDidDismiss().then((res)=>{ if(res){ const data = res.data; this.documents.push(data.selected); } }); + + await modal.present(); } removeAttachment(index: number) { diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 0e1c91480..176d1cb29 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -316,7 +316,7 @@ export class ViewEventPage implements OnInit { cssClass: 'discart-expedient-modal', }); - await modal.present(); + modal.onDidDismiss().then((res) => { @@ -329,6 +329,7 @@ export class ViewEventPage implements OnInit { } }); + await modal.present(); } @@ -381,7 +382,7 @@ export class ViewEventPage implements OnInit { }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then((res) => { @@ -402,6 +403,8 @@ export class ViewEventPage implements OnInit { this.getAttachments() }); + + await modal.present(); } docIndex(index: number) { @@ -480,10 +483,11 @@ export class ViewEventPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(res => { //this.RouteService.goBack(); }); + await modal.present(); } // efetuar despacho diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 8d934ed36..03bc3b0ab 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -727,7 +727,7 @@ export class ChatPage implements OnInit { component: ContactsPage, cssClass: 'modal modal-desktop', }); - await modal.present(); + modal.onDidDismiss().then((Data) => { // console.log(Data,'daatatatat'); @@ -737,6 +737,8 @@ export class ChatPage implements OnInit { }); + await modal.present(); + } async newGroup() { @@ -756,11 +758,13 @@ export class ChatPage implements OnInit { roomId: roomId, }, }); - await modal.present(); + modal.onDidDismiss().then((res) => { this.modalController.dismiss(res.data); }); + + await modal.present(); } async openMessagesModal(roomId: any) { @@ -803,8 +807,9 @@ export class ChatPage implements OnInit { // roomId: roomId, }, }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); } async openGroupMessagesModal(roomId: any) { @@ -816,10 +821,11 @@ export class ChatPage implements OnInit { roomId: roomId, }, }); - await modal.present(); + modal.onDidDismiss().then(() =>{ this.ChatSystemService.currentRoom.roomLeave() }); + await modal.present(); } } diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts index b6a3d1ded..373b5c612 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts @@ -198,8 +198,10 @@ export class GroupContactsPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); + } } diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index e2f364f8f..0af7de7ad 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -335,10 +335,11 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then((res) => { }); + await modal.present(); } ngOnDestroy() { @@ -620,12 +621,14 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { cssClass: 'modal modal-desktop', backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { if (data) { } }); + + await modal.present(); } @@ -827,11 +830,12 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(() => { this.getRoomInfo(); }); + await modal.present(); } } diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts index e358d0aec..a65f432b0 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.ts +++ b/src/app/pages/chat/messages/contacts/contacts.page.ts @@ -111,8 +111,9 @@ export class ContactsPage implements OnInit { roomId: roomId, }, }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); } } diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 32f363959..655cd8817 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -580,9 +580,10 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); } async bookMeeting() { @@ -605,7 +606,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { cssClass: 'modal modal-desktop', backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { if (data?.data && data.data.id) { @@ -625,6 +626,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { // }) } }); + + await modal.present(); } } diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.ts b/src/app/pages/chat/new-group/contacts/contacts.page.ts index 482aca832..9fafe97b7 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.page.ts +++ b/src/app/pages/chat/new-group/contacts/contacts.page.ts @@ -111,9 +111,10 @@ export class ContactsPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); } } diff --git a/src/app/pages/chat/new-group/new-group.page.ts b/src/app/pages/chat/new-group/new-group.page.ts index c59c74d3c..e49406f48 100644 --- a/src/app/pages/chat/new-group/new-group.page.ts +++ b/src/app/pages/chat/new-group/new-group.page.ts @@ -105,8 +105,9 @@ export class NewGroupPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); } async setDuration(ev: any) { diff --git a/src/app/pages/events/edit-event/edit-event.page.ts b/src/app/pages/events/edit-event/edit-event.page.ts index b2a307b33..c65f80a44 100644 --- a/src/app/pages/events/edit-event/edit-event.page.ts +++ b/src/app/pages/events/edit-event/edit-event.page.ts @@ -95,7 +95,7 @@ export class EditEventPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { if (data['data'] != null) @@ -104,6 +104,7 @@ export class EditEventPage implements OnInit { this.loadedEvent.Attendees = newattendees; } }); + await modal.present(); } getEventAttendees(): EventPerson[] diff --git a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts index 9dfb832b5..12136919e 100644 --- a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts +++ b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts @@ -97,7 +97,7 @@ export class EventDetailModalPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { if (data['data'] != null) @@ -106,6 +106,8 @@ export class EventDetailModalPage implements OnInit { this.loadedEvent.Attendees = newattendees; } }); + + await modal.present(); } getEventAttendees(): EventPerson[] diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts index 140b14b51..52095b581 100644 --- a/src/app/pages/events/event-detail/event-detail.page.ts +++ b/src/app/pages/events/event-detail/event-detail.page.ts @@ -99,7 +99,7 @@ export class EventDetailPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { if (data['data'] != null) @@ -108,6 +108,7 @@ export class EventDetailPage implements OnInit { this.loadedEvent.Attendees = newattendees; } }); + await modal.present(); } getEventAttendees(): EventPerson[] @@ -236,7 +237,7 @@ export class EventDetailPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { if (data['data'] != null) @@ -246,6 +247,8 @@ export class EventDetailPage implements OnInit { } }); + await modal.present(); + } } diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 85b23d8cd..819e6436d 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -321,8 +321,9 @@ export class EventsPage implements OnInit { cssClass: 'event-detail', backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); } @@ -337,8 +338,9 @@ export class EventsPage implements OnInit { cssClass: 'view-event', backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); } diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 75040ca26..df1ca63a5 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/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) { diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index 2d29142d4..e7ed249b2 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/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(); } diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 23227d247..2b84ccdc8 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/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(); + } diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index 267926471..cdc96b4c2 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/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) { diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts index f9783e6cf..4ab2083e6 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts +++ b/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) { diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index d2df013d2..83686c4d4 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/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) { 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 ae67c41d4..572617754 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 @@ -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(); + + } diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 2838216e3..6607ba2fc 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/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(); } } diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 7f2845f6b..ac814b6ce 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/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() { diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 543fe4d6c..5c8b58a64 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/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){ diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 6c290703e..1f9a98c81 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/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(); } } diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 138878f27..8441a72b1 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/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) { diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 98398943d..190a58916 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/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() { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 0524e36c6..181812bd2 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/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"; diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 78607043f..a476fe8db 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/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() { diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts index 12f070c4f..5066402ff 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts @@ -122,12 +122,14 @@ export class PublicationDetailPage implements OnInit { cssClass: 'new-publication modal modal-desktop', backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(()=>{ setTimeout(() => { this.getPublicationDetail(); }, 5000); }); + + await modal.present(); } openPreview(imageUrl:string){ diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 0a1c62f2e..d2bf64958 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -199,10 +199,11 @@ export class PublicationsPage implements OnInit { cssClass: 'new-action modal modal-desktop', backdropDismiss: true }); - await modal.present(); + modal.onDidDismiss().then(() => { this.getActions(); }); + await modal.present(); //this.refreshing() } @@ -241,10 +242,11 @@ export class PublicationsPage implements OnInit { cssClass: 'new-action modal modal-desktop', backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(() => { this.getActions(); }); + await modal.present(); } else { this.desktopComponent.showAddActions = true; } @@ -306,8 +308,9 @@ export class PublicationsPage implements OnInit { cssClass: 'new-action modal modal-desktop', backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); } else { // open angular component @@ -438,7 +441,7 @@ export class PublicationsPage implements OnInit { }, //translucent: true }); - await modal.present(); + modal.onDidDismiss().then(res => { if (res['data'] == 'edit') { this.closeDesktopComponent(); @@ -450,6 +453,7 @@ export class PublicationsPage implements OnInit { this.closeDesktopComponent() } }); + await modal.present(); } } diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts index 14d116885..c89e9efea 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -142,12 +142,14 @@ export class PublicationDetailPage implements OnInit { cssClass: 'new-publication modal modal-desktop', backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(()=>{ setTimeout(() => { this.getPublicationDetail(); }, 5000); }); + + await modal.present(); } async openPreview(item) { diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index b6417e573..66a61a629 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -219,10 +219,11 @@ export class ViewPublicationsPage implements OnInit { cssClass: 'new-publication modal modal-desktop', backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(() => { this.doRefresh(event); }); + await modal.present(); } goToPublicationDetail(publicationId: string) { @@ -240,10 +241,12 @@ export class ViewPublicationsPage implements OnInit { cssClass: 'publication-detail modal modal-desktop', // backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(() => { this.getPublicationsIds(); }); + + await modal.present(); } } diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index dc1891e69..5cbe87ed8 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -823,11 +823,12 @@ export class SearchPage implements OnInit { } }); - await modal.present(); + modal.onDidDismiss().then((data) => { this.searchSender = data.data; }); + await modal.present(); } @@ -848,11 +849,12 @@ export class SearchPage implements OnInit { } }); - await modal.present(); - + modal.onDidDismiss().then((data) => { this.searchOrganicEntiry = data.data; }); + await modal.present(); + } @@ -924,9 +926,9 @@ export class SearchPage implements OnInit { }, cssClass: 'modal modal-desktop', }); - await modal.present(); - modal.onDidDismiss().then((res)=>{}); + modal.onDidDismiss().then((res)=>{}); + await modal.present(); } else if(this.type == "AccoesPresidenciais") { this.viewPublicationDetail(Id, DocTypeDesc); @@ -959,8 +961,9 @@ export class SearchPage implements OnInit { //backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(()=>{}); + await modal.present(); } @@ -984,8 +987,9 @@ export class SearchPage implements OnInit { }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then((res)=>{}); + await modal.present(); } diff --git a/src/app/services/events/edit-event/edit-event.page.ts b/src/app/services/events/edit-event/edit-event.page.ts index 0d2be2c45..4ac7b984e 100644 --- a/src/app/services/events/edit-event/edit-event.page.ts +++ b/src/app/services/events/edit-event/edit-event.page.ts @@ -230,7 +230,7 @@ export class EditEventPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { if (data['data'] != null) @@ -240,5 +240,7 @@ export class EditEventPage implements OnInit { } }); + await modal.present(); + } } diff --git a/src/app/services/events/event-detail-modal/event-detail-modal.page.ts b/src/app/services/events/event-detail-modal/event-detail-modal.page.ts index 4029cefb8..7ddf885a0 100644 --- a/src/app/services/events/event-detail-modal/event-detail-modal.page.ts +++ b/src/app/services/events/event-detail-modal/event-detail-modal.page.ts @@ -95,7 +95,7 @@ export class EventDetailModalPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { if (data['data'] != null) @@ -104,6 +104,8 @@ export class EventDetailModalPage implements OnInit { this.loadedEvent.Attendees = newattendees; } }); + + await modal.present(); } getEventAttendees(): EventPerson[] @@ -227,7 +229,7 @@ export class EventDetailModalPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { if (data['data'] != null) @@ -237,6 +239,8 @@ export class EventDetailModalPage implements OnInit { } }); + await modal.present(); + } } diff --git a/src/app/services/events/event-detail/event-detail.page.ts b/src/app/services/events/event-detail/event-detail.page.ts index e06180717..d5afa0596 100644 --- a/src/app/services/events/event-detail/event-detail.page.ts +++ b/src/app/services/events/event-detail/event-detail.page.ts @@ -93,7 +93,7 @@ export class EventDetailPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { if (data['data'] != null) @@ -102,6 +102,8 @@ export class EventDetailPage implements OnInit { this.loadedEvent.Attendees = newattendees; } }); + + await modal.present(); } getEventAttendees(): EventPerson[] @@ -228,7 +230,6 @@ export class EventDetailPage implements OnInit { backdropDismiss: false }); - await modal.present(); modal.onDidDismiss().then((data) => { if (data['data'] != null) @@ -238,6 +239,8 @@ export class EventDetailPage implements OnInit { } }); + await modal.present(); + } } diff --git a/src/app/services/events/events.page.ts b/src/app/services/events/events.page.ts index 7b42f57c5..29c7d2455 100644 --- a/src/app/services/events/events.page.ts +++ b/src/app/services/events/events.page.ts @@ -326,8 +326,9 @@ export class EventsPage implements OnInit { cssClass: 'event-detail', backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); } diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index 56f9aa815..347c322d6 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -188,7 +188,7 @@ export class ApproveEventPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss() .then( async (res) => { @@ -232,6 +232,8 @@ export class ApproveEventPage implements OnInit { console.log(error) }); + await modal.present(); + } goToEventsToApprove() { diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 6f788844c..b8a3f412a 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -484,7 +484,7 @@ export class EditEventPage implements OnInit { select: true, } }); - await modal.present(); + modal.onDidDismiss().then( async (res) => { if(res) { const data = res.data; @@ -507,6 +507,8 @@ export class EditEventPage implements OnInit { } }); + + await modal.present(); } diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 0ec19f8cc..3d9460c98 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -391,13 +391,15 @@ export class NewEventPage implements OnInit { select: true } }); - await modal.present(); + modal.onDidDismiss().then((res) => { if(res){ const data = res.data; this.documents.push(data.selected); } }); + + await modal.present(); } close() { diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index f1d2b2a5c..a5357e5cf 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -249,10 +249,12 @@ export class ViewEventPage implements OnInit { cssClass: 'discart-expedient-modal', }); - await modal.present(); + modal.onDidDismiss().then((res) => { }); + + await modal.present(); } async editEvent() { @@ -330,10 +332,12 @@ export class ViewEventPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(res=>{ //this.RouteService.goBack(); }); + + await modal.present(); } // efetuar despacho @@ -355,8 +359,9 @@ export class ViewEventPage implements OnInit { }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then( async(res)=>{}); + await modal.present(); } diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts index 37d2739d7..b25274e5e 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts @@ -277,8 +277,9 @@ export class GroupContactsPage implements OnInit { cssClass: 'new-group modal-desktop', backdropDismiss: false, }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); } async openGroupMessages(room:any){ @@ -292,8 +293,9 @@ export class GroupContactsPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); } } diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 116b52943..e937d044a 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -192,10 +192,11 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then((res) => { }); + await modal.present(); } ngAfterViewInit() { @@ -611,11 +612,13 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(() => { //this.getRoomInfo(); }); + + await modal.present(); } } @@ -631,7 +634,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe showSearchInput: true, } }); - await modal.present(); + modal.onDidDismiss().then(async res => { if (res) { const data = res.data; @@ -640,6 +643,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe this.addFileWebtrix() } }); + + await modal.present(); } viewDocument(file: any, url?: string) { @@ -790,7 +795,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe showSearchInput: true, } }); - await modal.present(); + modal.onDidDismiss().then(async res => { const data = res.data; @@ -822,6 +827,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe } }); + + await modal.present(); } async addFileToChatMobile(types: typeof FileType[]) { const roomId = this.roomId diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts index 242903778..5963701f3 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.ts +++ b/src/app/shared/chat/messages/contacts/contacts.page.ts @@ -132,8 +132,9 @@ export class ContactsPage implements OnInit { roomId: roomId, }, }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); } async openMessages(username:string){ diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index df5e18b14..44f9255fa 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -397,10 +397,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then((res) => { }); + await modal.present(); } sendMessage() { @@ -539,9 +540,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); } openSendMessageOptions(ev?: any) { @@ -722,7 +724,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy showSearchInput: true, } }); - await modal.present(); + modal.onDidDismiss().then(async res => { const data = res.data; @@ -752,6 +754,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy } }); + + await modal.present(); } async addFileToChatMobile(types: typeof FileType[]) { @@ -909,7 +913,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy members: this.members, } }); - await modal.present(); + modal.onDidDismiss().then(async (res) => { @@ -945,6 +949,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy } }); + await modal.present(); + } diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.ts b/src/app/shared/chat/new-group/contacts/contacts.page.ts index c8c262a8a..01218ebe9 100644 --- a/src/app/shared/chat/new-group/contacts/contacts.page.ts +++ b/src/app/shared/chat/new-group/contacts/contacts.page.ts @@ -66,9 +66,8 @@ export class ContactsPage implements OnInit { backdropDismiss: false }); - await modal.present(); - modal.onDidDismiss(); + await modal.present(); } } diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts index bc9127d06..5b15f0187 100644 --- a/src/app/shared/chat/new-group/new-group.page.ts +++ b/src/app/shared/chat/new-group/new-group.page.ts @@ -225,8 +225,9 @@ export class NewGroupPage implements OnInit{ backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss(); + await modal.present(); } async setDuration(ev: any) { diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 9c5612958..f64de1cb0 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -348,7 +348,7 @@ export class EditEventToApproveComponent implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then((data) => { @@ -363,6 +363,7 @@ export class EditEventToApproveComponent implements OnInit { } }); + await modal.present(); } else { this.showAttendees = true } @@ -425,7 +426,7 @@ export class EditEventToApproveComponent implements OnInit { select: true, } }); - await modal.present(); + modal.onDidDismiss().then( async (res)=>{ if(res){ @@ -457,6 +458,8 @@ export class EditEventToApproveComponent implements OnInit { // }); } }); + + await modal.present(); } diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 5c0087028..40f2072de 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -251,13 +251,14 @@ export class PedidosPage implements OnInit { }, cssClass: 'modal modal-desktop', }); - await modal.present(); + modal.onDidDismiss().then((res)=>{ this.LoadList(); }, (error) => { console.log(error) }); + await modal.present(); } diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 3c22affb6..f3df46a4d 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -144,13 +144,14 @@ export class HeaderPage implements OnInit { } }); - await modal.present(); + modal.onDidDismiss().then(() => { this.canOpenSearch = true; }); + await modal.present(); } } @@ -193,12 +194,14 @@ export class HeaderPage implements OnInit { componentProps: { } }); - await modal.present(); + modal.onDidDismiss().then(() => { this.notificationLengthData() this.showProfileModal = false }) + + await modal.present(); } } diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts index cfb50d77d..403c48078 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts @@ -107,15 +107,17 @@ export class ChatOptionsPopoverPage implements OnInit { showSearchInput: true, } }); - await modal.present(); + modal.onDidDismiss().then((res)=>{ - if(res){ + if(res) { const data = res.data; this.documents.push(data.selected); } }); + + await modal.present(); } async bookMeeting() { 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 8b9247dcc..f5c9aec4f 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.ts +++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts @@ -48,7 +48,7 @@ export class DiplomaOptionsPage implements OnInit { } async openAddNoteModal(actionName:string) { - this.popoverController.dismiss(); + // this.popoverController.dismiss(); let classs; if( window.innerWidth <= 800) { classs = 'modal modal-desktop' @@ -64,8 +64,6 @@ export class DiplomaOptionsPage implements OnInit { backdropDismiss: true }); - await modal.present(); - modal.onDidDismiss().then(async (res) => { if(res.data){ @@ -102,6 +100,8 @@ export class DiplomaOptionsPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } async askToChange(note:string, documents:any){ @@ -289,7 +289,6 @@ export class DiplomaOptionsPage implements OnInit { }, cssClass: classs, }); - await modal.present(); modal.onDidDismiss().then(async (res) => { @@ -300,7 +299,11 @@ export class DiplomaOptionsPage implements OnInit { this.goBack(); }, (error) => { console.log(error) - }); + }).catch(e => { + console.log(e) + }) + + await modal.present(); } async distartExpedientModal() { @@ -316,7 +319,6 @@ export class DiplomaOptionsPage implements OnInit { backdropDismiss: false }); - await modal.present(); modal.onDidDismiss().then(res => { if (res['data'] == 'close') { this.close(); @@ -325,7 +327,14 @@ export class DiplomaOptionsPage implements OnInit { this.openMenu(); */ } - }); + }, (error) => { + console.log(error) + }).catch(e => { + console.log(e) + }) + + await modal.present(); + } goBack() { 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 b291cb4a7..36c9c312c 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -65,12 +65,14 @@ export class DespachosOptionsPage implements OnInit { }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then( res => { // this.goBack(); }, (error) => { console.log(error) }); + + await modal.present(); } sendExpedienteToPending() { @@ -100,7 +102,7 @@ export class DespachosOptionsPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(res=>{ if(res['data']=='close'){ this.goBack('back'); @@ -108,6 +110,8 @@ export class DespachosOptionsPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } @@ -127,12 +131,14 @@ export class DespachosOptionsPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(() => { this.goBack('no'); }, (error) => { console.log(error) }) + + await modal.present(); } async openDelegarModal(task: any) { @@ -151,7 +157,6 @@ export class DespachosOptionsPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); modal.onDidDismiss().then(res => { if(res){ const data = res.data; @@ -163,6 +168,8 @@ export class DespachosOptionsPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } async generateDiploma(note:string, documents:any){ 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 9ef7ae385..bdbed6a30 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 @@ -86,7 +86,7 @@ export class DespachosPrOptionsPage implements OnInit { }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then( (res)=> { if(res['data']=='openDiscart') { @@ -103,6 +103,8 @@ export class DespachosPrOptionsPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } sendExpedienteToPending() { @@ -137,7 +139,6 @@ export class DespachosPrOptionsPage implements OnInit { backdropDismiss: false }); - await modal.present(); modal.onDidDismiss().then(res=>{ if(res['data']=='close'){ this.close(); @@ -150,6 +151,8 @@ export class DespachosPrOptionsPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } @@ -169,7 +172,7 @@ export class DespachosPrOptionsPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then( ()=> {}, (error) => { @@ -177,6 +180,8 @@ export class DespachosPrOptionsPage implements OnInit { } ) + await modal.present(); + } async openDelegarModal(task: any) { @@ -195,7 +200,7 @@ export class DespachosPrOptionsPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(res => { if(res) { const data = res.data; @@ -207,6 +212,8 @@ export class DespachosPrOptionsPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } async generateDiploma(note:string, documents:any) { @@ -257,8 +264,6 @@ export class DespachosPrOptionsPage implements OnInit { backdropDismiss: true }); - await modal.present(); - modal.onDidDismiss().then(async (res) => { if(res.data){ @@ -298,6 +303,8 @@ export class DespachosPrOptionsPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts index 74cedb63f..323d9bdc1 100644 --- a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts +++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts @@ -62,8 +62,6 @@ export class DiplomasGerarOptionsPage implements OnInit { backdropDismiss: true }); - await modal.present(); - modal.onDidDismiss().then(async (res) => { if (res.data) { @@ -113,6 +111,8 @@ export class DiplomasGerarOptionsPage implements OnInit { console.log(error) }); + await modal.present(); + } async sendExpedienteToPending() { @@ -149,13 +149,15 @@ export class DiplomasGerarOptionsPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then( ()=>{}, (error) => { console.log(error) } ) + + await modal.present(); } async openDelegarModal() { @@ -173,7 +175,7 @@ export class DiplomasGerarOptionsPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(res => { if(res) { const data = res.data; @@ -185,6 +187,9 @@ export class DiplomasGerarOptionsPage implements OnInit { }, (error) => { console.log(error) }); + + + await modal.present(); } 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 dbe024887..6399be3d6 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 @@ -100,7 +100,6 @@ export class OptsExpedientePrPage implements OnInit { backdropDismiss: true }); - await modal.present(); modal.onDidDismiss().then(async (res) => { @@ -128,6 +127,8 @@ export class OptsExpedientePrPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } async approve(note:string, documents:any) { @@ -165,7 +166,7 @@ export class OptsExpedientePrPage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then( async (res)=>{ @@ -230,6 +231,8 @@ export class OptsExpedientePrPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } @@ -289,7 +292,7 @@ export class OptsExpedientePrPage implements OnInit { }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then( async (res)=>{ let body = res['data']; @@ -317,6 +320,8 @@ export class OptsExpedientePrPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } async openBookMeetingModal(task: any) { @@ -335,13 +340,14 @@ export class OptsExpedientePrPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then( ()=>{}, (error) => { console.log(error) } ) + await modal.present(); } goBack() { @@ -370,7 +376,7 @@ export class OptsExpedientePrPage implements OnInit { select: true } }); - await modal.present(); + modal.onDidDismiss().then((res)=>{ if(res){ const data = res.data; @@ -394,6 +400,8 @@ export class OptsExpedientePrPage implements OnInit { console.log(error) }); + await modal.present(); + } diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index d3c8fa4d9..060758143 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -75,12 +75,14 @@ export class OptsExpedientePage implements OnInit { documents: this.fulltask.Documents, }, }); - await modal.present(); + modal.onDidDismiss().then( ()=>{}, (error) => { console.log(error) }) + + await modal.present(); } close() { @@ -111,7 +113,7 @@ export class OptsExpedientePage implements OnInit { select: true } }); - await modal.present(); + modal.onDidDismiss().then( async (res)=>{ if(res){ const data = res.data; @@ -149,6 +151,8 @@ export class OptsExpedientePage implements OnInit { console.log(error) }); + await modal.present(); + } async openAddNoteModal(actionName:string) { @@ -168,8 +172,6 @@ export class OptsExpedientePage implements OnInit { //backdropDismiss: true }); - await modal.present(); - modal.onDidDismiss().then( async (res) => { if(res.data){ @@ -197,6 +199,8 @@ export class OptsExpedientePage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } async sendToReview(note:string, documents:any) { @@ -288,13 +292,15 @@ export class OptsExpedientePage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then( ()=>{}, (error) => { console.log(error) } ) + + await modal.present(); } async openExpedientActionsModal(taskAction: any, task: any) { @@ -316,7 +322,7 @@ export class OptsExpedientePage implements OnInit { }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then(async res=>{ let body = res['data']; @@ -343,6 +349,8 @@ export class OptsExpedientePage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } async distartExpedientModal(body:any){ @@ -355,7 +363,7 @@ export class OptsExpedientePage implements OnInit { backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then( async (res) => { @@ -430,6 +438,8 @@ export class OptsExpedientePage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } } 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 b64ef16fd..61ee09216 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -117,12 +117,14 @@ export class RequestOptionsPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then( ()=>{} , (error) => { console.log(error) }) + + await modal.present(); } async openNewGroupPage(){ @@ -135,12 +137,14 @@ export class RequestOptionsPage implements OnInit { documents: this.fulltask.Documents, }, }); - await modal.present(); + modal.onDidDismiss().then( () => { this.popoverController.dismiss('close'); }, (error) => { console.log(error) }); + + await modal.present(); } async newGroup(){ @@ -178,7 +182,7 @@ export class RequestOptionsPage implements OnInit { }, cssClass: classs, }); - await modal.present(); + modal.onDidDismiss().then(res=> { if(res['data']=='openDiscart') { @@ -191,6 +195,8 @@ export class RequestOptionsPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } async repreciar(note:string, documents:any) { @@ -237,8 +243,6 @@ export class RequestOptionsPage implements OnInit { backdropDismiss: true }); - await modal.present(); - modal.onDidDismiss().then(async (res) => { @@ -269,6 +273,8 @@ export class RequestOptionsPage implements OnInit { }, (error) => { console.log(error) }); + + await modal.present(); } async arquivar(note:string, documents:any) { @@ -307,13 +313,15 @@ export class RequestOptionsPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then( () => { this.popoverController.dismiss('close'); }, (error) => { console.log(error) }); + await modal.present(); + } async openForwardModal(tasK: any) { @@ -331,12 +339,14 @@ export class RequestOptionsPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(() => { this.popoverController.dismiss('close'); }, (error) => { console.log(error) }); + + await modal.present(); } async openDelegarModal(task: any) { @@ -356,7 +366,7 @@ export class RequestOptionsPage implements OnInit { cssClass: classs, backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then( async (res)=> { if(res['data']=='close') { @@ -366,6 +376,8 @@ export class RequestOptionsPage implements OnInit { }, (error) => { console.log(error) }) + + await modal.present(); } diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts index 4f74af317..feec553f0 100644 --- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts @@ -114,12 +114,13 @@ export class PublicationDetailPage implements OnInit { cssClass: 'new-publication', backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(()=>{ setTimeout(() => { this.getPublicationDetail(); - }, 5000); + }, 5000); }); + await modal.present(); } else { this.addNewPublication.emit({ publicationType: publicationType, diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index 64066d27e..7196dac06 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -227,10 +227,12 @@ export class ViewPublicationsPage implements OnInit { cssClass: 'new-publication modal modal-desktop', backdropDismiss: false }); - await modal.present(); + modal.onDidDismiss().then(()=>{ this.doRefresh(event); }); + + await modal.present(); } else { this.addNewPublication.emit({ publicationType: publicationType, @@ -251,10 +253,11 @@ export class ViewPublicationsPage implements OnInit { cssClass: 'new-action modal modal-desktop', backdropDismiss: true }); - await modal.present(); + modal.onDidDismiss().then(() => { // Do nothing }); + await modal.present(); } else { this.editPublication.emit(folderId); diff --git a/src/app/tiny-mce/tiny-mce.page.ts b/src/app/tiny-mce/tiny-mce.page.ts index 585540c83..e1ed7be13 100644 --- a/src/app/tiny-mce/tiny-mce.page.ts +++ b/src/app/tiny-mce/tiny-mce.page.ts @@ -49,13 +49,11 @@ export class TinyMCEPage implements OnInit { content: this.content } }); + + + modal.onDidDismiss().then((res)=>{},() => {}) + await modal.present(); - - modal.onDidDismiss().then((res)=>{ - - - - },() => {}) } } diff --git a/version/git-version.ts b/version/git-version.ts index f88725a53..fe75fc7a2 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "0f778d827", - "SHA": "0f778d82718a697989968b3ca212ca9cbcecba09", + "shortSHA": "a61ee6c07", + "SHA": "a61ee6c07e9b4cb3e14c78690c2e6357922630f5", "branch": "developer-catch", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Jul 14 10:46:35 2023 +0100'", - "lastCommitMessage": "add", - "lastCommitNumber": "5061", + "lastCommitTime": "'Fri Jul 14 18:57:07 2023 +0100'", + "lastCommitMessage": "improve", + "lastCommitNumber": "5062", "change": "", - "changeStatus": "On branch developer-catch\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/app.component.ts\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/modals/create-process/create-process.module.ts\n\tmodified: src/app/modals/group-icons/group-icons.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/popover/deploma-options/deploma-options-routing.module.ts\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.module.ts\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified: src/app/tiny-mce/tiny-mce.page.ts", + "changeStatus": "On branch developer-catch\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/add-note/add-note.page.ts\n\tmodified: src/app/modals/chat-options-features/chat-options-features.page.ts\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/modals/dar-parecer/dar-parecer.page.ts\n\tmodified: src/app/modals/delegar/delegar.page.ts\n\tmodified: src/app/modals/document-detail/document-detail.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/forward/forward.page.ts\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/chat/new-group/contacts/contacts.page.ts\n\tmodified: src/app/pages/chat/new-group/new-group.page.ts\n\tmodified: src/app/pages/events/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/events/event-detail-modal/event-detail-modal.page.ts\n\tmodified: src/app/pages/events/event-detail/event-detail.page.ts\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/services/events/edit-event/edit-event.page.ts\n\tmodified: src/app/services/events/event-detail-modal/event-detail-modal.page.ts\n\tmodified: src/app/services/events/event-detail/event-detail.page.ts\n\tmodified: src/app/services/events/events.page.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: src/app/shared/chat/new-group/contacts/contacts.page.ts\n\tmodified: src/app/shared/chat/new-group/new-group.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified: src/app/shared/popover/despachos-options/despachos-options.page.ts\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts\n\tmodified: src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts\n\tmodified: src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/shared/popover/request-options/request-options.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts\n\tmodified: src/app/tiny-mce/tiny-mce.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file