This commit is contained in:
Peter Maquiran
2021-06-30 09:45:56 +01:00
parent fb367b40ae
commit 22bafcc357
9 changed files with 139 additions and 197 deletions
+3 -1
View File
@@ -417,12 +417,13 @@
>
</app-event-list>
<!-- Edit event to approve -->
<app-approve-event class="d-flex flex-column"
*ngIf="mobileComponent.showEventToApprove"
[class.transparent]="mobileComponent.transparentEventToApprove"
[serialNumber] = "eventToaprove.serialNumber"
[InstanceId] = "eventToaprove.InstanceId"
[saveData] = "eventToaprove.saveData"
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"
(closeEventToApprove)="closeEventToApprove()"
(AproveEventEditEvent)="AproveEventEditEvent($event)"
@@ -436,6 +437,7 @@
*ngIf="mobileComponent.showEditEventToApprove"
[taskParticipants]="taskParticipants"
[taskParticipantsCc]="taskParticipantsCc"
[saveData] = "eventToaprove.saveData"
[serialNumber] = "eventToaprove.serialNumber"
(setContact)="setContact($event)"
(clearContact)="clearContact()"
+37 -20
View File
@@ -1222,24 +1222,7 @@ export class AgendaPage implements OnInit {
}
approveEventDismiss({saveData, serialNumber, action}){
if(action == 'Aprovar'){
this.eventToaprove = {
back: true,
saveData: saveData,
serialNumber:serialNumber,
InstanceId: saveData.workflowInstanceDataFields.InstanceId || ""
}
// this.mobileComponent.showEventList = false;
this.mobileComponent.transparentEventList = true;
this.mobileComponent.showEventToApprove = true;
}
}
closeEventToApprove(){
closeEventToApprove() {
if (this.eventToaprove.back ==true && this.mobileComponent.showEventList ==true){
this.mobileComponent.transparentEventList = false;
this.mobileComponent.showEventToApprove = false;
@@ -1249,10 +1232,44 @@ export class AgendaPage implements OnInit {
this.mobileComponent.showEventToApprove = false;
this.mobileComponent.showEventList = false;
}
}
EditApproveEventDismiss(){
/**
* @description show event to approve details
*/
approveEventDismiss({saveData, serialNumber, action}){
console.log('save data', saveData)
if(action == 'Aprovar') {
this.eventToaprove = {
back: true,
saveData: saveData,
serialNumber:serialNumber,
InstanceId: saveData.workflowInstanceDataFields.InstanceId || ""
}
this.mobileComponent.transparentEventList = true;
this.mobileComponent.showEventToApprove = true;
}
this.eventToaprove = {
back: true,
saveData: saveData,
serialNumber:serialNumber,
InstanceId: saveData.workflowInstanceDataFields.InstanceId || ""
}
setInterval(()=>{
console.log(this.eventToaprove)
}, 100)
}
// called from emitters
/** @description open component to edit event to approve */
EditApproveEventDismiss() {
this.cloneAllmobileComponent();
this.mobileComponent.showEditEventToApprove = true;
}
@@ -2,7 +2,7 @@
<app-header></app-header>
</ion-header>
<ion-content id="main-content">
<ion-content id="main-content" *ngIf="loadedEvent">
<div class="main-content d-flex height-100">
<div *ngIf="loadedEvent" class="content d-flex flex-column width-100">
<div class="header-content width-100 d-flex justify-space-between">
@@ -20,7 +20,7 @@ import { ToastService } from 'src/app/services/toast.service';
})
export class ApproveEventPage implements OnInit {
event: Event;
loadedEvent:any;
loadedEvent:any = false
loadedEvent1:any;
loadedAttachments:any;
customDate:any;
@@ -51,7 +51,7 @@ export class ApproveEventPage implements OnInit {
private animationController: AnimationController,
private toastService: ToastService,
) {
this.activatedRoute.paramMap.subscribe(params => {
console.log(params["params"]);