This commit is contained in:
Peter Maquiran
2023-07-15 11:01:09 +01:00
parent a61ee6c07e
commit eba2b7f9ce
76 changed files with 525 additions and 218 deletions
@@ -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() {
@@ -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();
}
@@ -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() {
@@ -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();
}
@@ -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();
}
}
@@ -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
@@ -132,8 +132,9 @@ export class ContactsPage implements OnInit {
roomId: roomId,
},
});
await modal.present();
modal.onDidDismiss();
await modal.present();
}
async openMessages(username:string){
+10 -4
View File
@@ -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();
}
@@ -66,9 +66,8 @@ export class ContactsPage implements OnInit {
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss();
await modal.present();
}
}
@@ -225,8 +225,9 @@ export class NewGroupPage implements OnInit{
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss();
await modal.present();
}
async setDuration(ev: any) {
@@ -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();
}
@@ -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();
}
+5 -2
View File
@@ -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();
}
}
@@ -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() {
@@ -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() {
@@ -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){
@@ -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();
}
@@ -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();
}
@@ -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();
}
@@ -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();
}
}
@@ -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();
}
@@ -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,
@@ -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);