peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-09 16:50:28 +01:00
parent a561855706
commit c11e812098
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+3 -3
View File
@@ -10,7 +10,7 @@
<ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
</div>
<div class="header-title flex-grow-1 cursor-pointer">
<label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
<label>11{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
</div>
<div (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-true">
<ion-icon src="assets/images/icons-edit.svg"></ion-icon>
@@ -81,7 +81,7 @@
<button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Adicionar Nota</button>
<div class="solid"></div>
<button full class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
<button (click)="rejectTask(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
<button (click)="rejeitar(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
</div>
</div>
@@ -95,7 +95,7 @@
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-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)="rejeitar(loadedEvent.serialNumber)">Rejeitar</button>
</div>
</ion-footer>
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+9 -6
View File
@@ -83,10 +83,12 @@ export class ApproveEventPage implements OnInit {
console.log(body);
try {
await this.processes.PostTaskAction(body).toPromise()
//this.successMessage()
//await this.processes.PostTaskAction(body).toPromise()
this.toastService.successMessage('Evento aprovado');
this.goBack();
setTimeout(()=>{
this.goBack();
},7000)
//this.goBack();
} catch (error) {
this.badRequest()
}
@@ -108,12 +110,13 @@ export class ApproveEventPage implements OnInit {
this.goBack();
}
async rejectTask(serialNumber:string){
async rejeitar(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
this.successMessage('Process');
try {
this.processes.PostTaskAction(body).toPromise();
//await this.successMessage('Processo rejeitado');
//this.processes.PostTaskAction(body).toPromise();
await this.toastService.successMessage('Processo rejeitado');
this.goBack();
} catch (error) {
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+1 -1
View File
@@ -303,7 +303,7 @@ export class GabineteDigitalPage implements OnInit {
else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
this.showEventsToApprove = true;
this.eventsToApprove.doRefresh();
//this.eventsToApprove.doRefresh();
}
}