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

Fix

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-17 14:02:05 +01:00
parent 133e3ad122
commit b1c165bf87
23 changed files with 240 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
-1
View File
@@ -71,7 +71,6 @@
</ion-list>
</div>
</div>
<div *ngIf="task" class="aside-right flex-column height-100">
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+5 -5
View File
@@ -476,9 +476,9 @@ export class PedidoPage implements OnInit {
let navigationExtras: NavigationExtras;
if (this.task.WorkflowName == 'Pedido de Deferimento') {
if (this.task.activityInstanceName == 'Concluir Deferimento') {
navigationExtras= { queryParams: {"deferimento": true,}};
} else if (this.task.WorkflowName == 'Pedido de Parecer') {
} else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
navigationExtras = { queryParams: {"parecer": true,}};
}
@@ -493,12 +493,12 @@ export class PedidoPage implements OnInit {
let navigationExtras: NavigationExtras;
if (this.task.WorkflowName == 'Pedido de Deferimento') {
if (this.task.activityInstanceName == 'Concluir Deferimento') {
navigationExtras= { queryParams: {"deferimento": true,}};
} else if (this.task.WorkflowName == 'Pedido de Parecer') {
} else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
navigationExtras = { queryParams: {"parecer": true,}};
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+6 -2
View File
@@ -57,8 +57,12 @@ export class PedidosPage implements OnInit {
if(event instanceof NavigationStart && '/home/gabinete-digital/pedidos?parecer=true'.startsWith(event.url) ||
event instanceof NavigationStart && '/home/gabinete-digital/pedidos?deferimento=true'.startsWith(event.url)
) {
alert('resfresh')
this.refreshing()
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.refreshing()
} else {
this.LoadList()
}
}
});
}