mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 13:26:08 +00:00
save
This commit is contained in:
@@ -77,14 +77,15 @@ export class EventListPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
goToEventToApproveDetail(serialNumber:string){
|
goToEventToApproveDetail(serialNumber:string){
|
||||||
let navigationExtras: NavigationExtras = {
|
console.log(serialNumber);
|
||||||
|
|
||||||
|
/* let navigationExtras: NavigationExtras = {
|
||||||
queryParams: {
|
queryParams: {
|
||||||
"serialNumber": serialNumber,
|
"serialNumber": serialNumber,
|
||||||
}
|
}
|
||||||
};
|
}; */
|
||||||
|
|
||||||
if(this.router.url == '/home/agenda/event-list'){
|
if(this.router.url == '/home/agenda/event-list'){
|
||||||
//this.router.navigate(['/home/agenda']);
|
|
||||||
this.router.navigate(['/home/agenda/event-list/approve-event',serialNumber, 'agenda'])
|
this.router.navigate(['/home/agenda/event-list/approve-event',serialNumber, 'agenda'])
|
||||||
}
|
}
|
||||||
else if(this.router.url == '/home/gabinete-digital/event-list'){
|
else if(this.router.url == '/home/gabinete-digital/event-list'){
|
||||||
|
|||||||
@@ -100,9 +100,6 @@
|
|||||||
<ion-footer class="display-none-{{showAside}} ion-no-border">
|
<ion-footer class="display-none-{{showAside}} ion-no-border">
|
||||||
<div class="buttons">
|
<div class="buttons">
|
||||||
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
|
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
|
||||||
<ion-menu-button (click)="openMenu()" autoHide="false">
|
|
||||||
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
|
|
||||||
</ion-menu-button>
|
|
||||||
<button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
|
<button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
|
||||||
<button hidden class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</button>
|
<button hidden class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
<ion-item
|
<ion-item
|
||||||
class="item ion-no-padding width-100 cursor-pointer"
|
class="item ion-no-padding width-100 cursor-pointer"
|
||||||
*ngFor="let event of eventsMDGPRList"
|
*ngFor="let event of eventsMDGPRList"
|
||||||
(click)="goToEventDetail(event)"
|
(click)="goToEventDetail(event.serialNumber)"
|
||||||
>
|
>
|
||||||
<!-- (click)="openApproveModal(event)" -->
|
<!-- (click)="openApproveModal(event)" -->
|
||||||
<div class="event-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
|
<div class="event-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
|
||||||
|
|||||||
@@ -77,21 +77,8 @@ export class EventsToApprovePage implements OnInit {
|
|||||||
this.showLoader = false;
|
this.showLoader = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
goToEventDetail(eventToAprove){
|
goToEventDetail(event){
|
||||||
let InstanceId;
|
this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital'])
|
||||||
|
|
||||||
if(!eventToAprove.workflowInstanceDataFields.hasOwnProperty('InstanceId')){
|
|
||||||
InstanceId = ''
|
|
||||||
} else {
|
|
||||||
InstanceId =eventToAprove.workflowInstanceDataFields.InstanceId
|
|
||||||
}
|
|
||||||
|
|
||||||
let navigationExtras: NavigationExtras = {
|
|
||||||
queryParams: {
|
|
||||||
"serialNumber": eventToAprove.serialNumber,
|
|
||||||
}
|
|
||||||
};
|
|
||||||
this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* async openApproveModal(eventToAprove) {
|
/* async openApproveModal(eventToAprove) {
|
||||||
|
|||||||
Reference in New Issue
Block a user