This commit is contained in:
Peter Maquiran
2021-08-13 09:45:44 +01:00
parent b12d440431
commit 4302ed983f
5 changed files with 28 additions and 63 deletions
@@ -176,7 +176,18 @@ export class DocumentDetailPage implements OnInit {
},
translucent: true
});
return await popover.present();
await popover.present()
popover.onDidDismiss().then((res:any) => {
if(res.data.component == 'openBookMeetingModal') {
this.openBookMeetingModal()
} else if(res.data.component == 'openExpedientActionsModal') {
this.openExpedientActionsModal(res.data.taskAction)
} else {
console.log(res.data)
alert('component not found')
}
});
}
}
@@ -136,16 +136,16 @@ export class DespachosPrPage implements OnInit {
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": element.totalDocuments,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": element.totalDocuments,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.despachoList.push(task);
@@ -143,7 +143,7 @@ export class ExpedientTaskModalPage implements OnInit {
this.dispatchFolder.SourceId = this.task.workflowInstanceDataFields.DocId
} else {
alert('component !!!!')
alert('aplicationId not found !!!!')
}
this.postData.DispatchFolder = this.dispatchFolder;
@@ -31,65 +31,19 @@ export class SearchedDocumentOptionsPage implements OnInit {
}
close() {
this.modalController.dismiss();
this.popoverController.dismiss();
}
goBack() {
this.modalController.dismiss();
this.popoverController.dismiss();
}
async openBookMeetingModal() {
const task: ExpedientTaskModalPageNavParamsTask = this.task
let classs;
if( window.innerWidth <= 800) {
classs = 'book-meeting-modal modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
console.log(this.LoadedDocument, task, ':Cars:')
const modal = await this.modalController.create({
component: DocumentSetUpMeetingPage,
componentProps: {
task: this.task,
document: this.LoadedDocument
},
cssClass: classs,
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then( async(res)=>{
this.popoverController.dismiss();
});
this.popoverController.dismiss({component:'openBookMeetingModal', taskAction: ''});
}
async openExpedientActionsModal( taskAction: any) {
const task: ExpedientTaskModalPageNavParamsTask = this.task
let classs;
if( window.innerWidth <= 800) {
classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
const modal = await this.modalController.create({
component: ExpedientTaskModalPage,
componentProps: {
taskAction: taskAction,
task: this.task,
},
cssClass: classs,
});
await modal.present();
modal.onDidDismiss().then( async(res) => {
this.popoverController.dismiss();
});
this.popoverController.dismiss({component:'openExpedientActionsModal', taskAction});
}
async distartExpedientModal(body:any) {}