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

Merge branches 'developer' and 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-08-06 09:03:09 +01:00
parent 2c28abbf12 c081a1ac28
commit 02f5ff7665
17 changed files with 361 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+28 -30
View File
@@ -19,10 +19,8 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { RequestOptionsPage } from 'src/app/shared/popover/request-options/request-options.page';
import { AuthService } from 'src/app/services/auth.service';
import { User } from 'src/app/models/user.model';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { ToastService } from 'src/app/services/toast.service';
import { ForwardPage } from 'src/app/modals/forward/forward.page';
import { async } from '@angular/core/testing';
import { PermissionService } from 'src/app/OtherService/permission.service';
import { Location } from '@angular/common';
@@ -496,40 +494,40 @@ export class PedidoPage implements OnInit {
goBack() {
this.location.back();
if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
if (window.innerWidth <= 700) {
this.router.navigate(['/home/gabinete-digital/pendentes']);
}
else {
// if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
// if (window.innerWidth <= 700) {
// this.router.navigate(['/home/gabinete-digital/pendentes']);
// }
// else {
let navigationExtras: NavigationExtras;
// let navigationExtras: NavigationExtras;
if (this.task.activityInstanceName == 'Concluir Deferimento') {
navigationExtras= { queryParams: {"deferimento": true,}};
} else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
navigationExtras = { queryParams: {"parecer": true,}};
}
// if (this.task.activityInstanceName == 'Concluir Deferimento') {
// navigationExtras= { queryParams: {"deferimento": true,}};
// } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
// navigationExtras = { queryParams: {"parecer": true,}};
// }
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
else {
if (window.innerWidth <= 700) {
this.router.navigate(['/home/gabinete-digital/pedidos']);
}
else {
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
// }
// }
// else {
// if (window.innerWidth <= 700) {
// this.router.navigate(['/home/gabinete-digital/pedidos']);
// }
// else {
let navigationExtras: NavigationExtras;
// let navigationExtras: NavigationExtras;
if (this.task.activityInstanceName == 'Concluir Deferimento') {
navigationExtras= { queryParams: {"deferimento": true,}};
} else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
// if (this.task.activityInstanceName == 'Concluir Deferimento') {
// navigationExtras= { queryParams: {"deferimento": true,}};
// } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
navigationExtras = { queryParams: {"parecer": true,}};
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
// navigationExtras = { queryParams: {"parecer": true,}};
// }
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
// }
// }
}
}