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

Fixe merge and improve sucess message

Browse Source
This commit is contained in:
Peter Maquiran
2021-05-28 15:45:41 +01:00
parent 74e77434e3 e4972576d3
commit fde942f47f
21 changed files with 322 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+2 -2
View File
@@ -93,12 +93,12 @@ export class ApproveEventModalPage implements OnInit {
});
}
approveTask(serialNumber:string){
async approveTask(serialNumber:string){
console.log('approveTask SERIALNUMBER: ', serialNumber)
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
try {
this.processes.PostTaskAction(body).toPromise()
await this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
this.successMessage()
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+14 -17
View File
@@ -59,23 +59,23 @@ export class ApproveEventPage implements OnInit {
this.getTask();
}
notImplemented(){
notImplemented() {
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
close(){
close() {
/* this.router.navigate(['/home/gabinete-digital/event-list']); */
this.closeEventToApprove.emit();
this.modalController.dismiss();
}
goBack(){
goBack() {
let navigationExtras: NavigationExtras = {
queryParams: {
"eventos": true,
"eventos": true,
}
};
if( window.innerWidth < 801){
if( window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/event-list']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
@@ -92,14 +92,14 @@ export class ApproveEventPage implements OnInit {
this.getAttachments(instanceId);
}
approveTask(serialNumber:string){
async approveTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
try {
this.processes.PostTaskAction(body).toPromise()
this.modalController.dismiss(serialNumber);
await this.processes.PostTaskAction(body).toPromise()
this.successMessage()
this.goBack();
} catch (error) {
this.badRequest()
}
@@ -120,25 +120,22 @@ export class ApproveEventPage implements OnInit {
/* console.log('Emendar'); */
this.menu.close();
this.openEmendMessageModal(serialNumber);
this.modalController.dismiss(null);
this.goBack();
}
rejectTask(serialNumber:string){
async rejectTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
try {
this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
this.successMessage()
this.goBack();
await this.successMessage()
} catch (error) {
this.badRequest()
}
}
async getAttachments(instanceId:string){
@@ -183,7 +180,7 @@ export class ApproveEventPage implements OnInit {
await modal.present();
modal.onDidDismiss().then(res => {
modal.onDidDismiss().then( async (res) => {
console.log(res.data);
if(res.data !== ''){
@@ -196,7 +193,7 @@ export class ApproveEventPage implements OnInit {
console.log(body);
try {
this.processes.PostTaskAction(body).toPromise()
await this.processes.PostTaskAction(body).toPromise()
//this.router.navigate(['/home/gabinete-digital/event-list']);
this.goToEventsToApprove();
this.successMessage()