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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-24 16:15:53 +01:00
parent 9f1ee3a583
commit c542d0728e
2 changed files with 60 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+35 -19
View File
@@ -97,27 +97,42 @@ export class ExpedienteDetailPage implements OnInit {
} }
goBack() { goBack() {
this.activatedRoute.paramMap.subscribe(params => { if(this.task.Status == "Pending"){
switch (params["params"].caller) { if (window.innerWidth <= 800) {
case 'events': this.router.navigate(['/home/gabinete-digital/pendentes']);
this.router.navigate(['/home',params["params"].caller]); }
break; else {
let navigationExtras: NavigationExtras = {
case 'gabinete-digital': queryParams: {
let navigationExtras: NavigationExtras = { "pendentes": true,
queryParams: {
"expedientes": true,
} }
} }
if( window.innerWidth < 801) { this.router.navigate(['/home/gabinete-digital'], navigationExtras);
this.router.navigate(['/home/gabinete-digital/expediente']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
break;
} }
}); }
else{
this.activatedRoute.paramMap.subscribe(params => {
switch (params["params"].caller) {
case 'events':
this.router.navigate(['/home',params["params"].caller]);
break;
case 'gabinete-digital':
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes": true,
}
}
if( window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/expediente']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
break;
}
});
}
} }
sendExpedienteToPending() { sendExpedienteToPending() {
@@ -149,6 +164,7 @@ export class ExpedienteDetailPage implements OnInit {
"FsId": res.workflowInstanceDataFields.FsId, "FsId": res.workflowInstanceDataFields.FsId,
"DocId": res.workflowInstanceDataFields.DocID, "DocId": res.workflowInstanceDataFields.DocID,
"WorkflowName": res.workflowDisplayName, "WorkflowName": res.workflowDisplayName,
"Status": res.workflowInstanceDataFields.Status,
} }
//console.log('task', this.task); //console.log('task', this.task);
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+25 -8
View File
@@ -102,6 +102,7 @@ export class PedidoPage implements OnInit {
"DeadlineType": res.workflowInstanceDataFields.DeadlineType, "DeadlineType": res.workflowInstanceDataFields.DeadlineType,
"ProcessInstanceID": res.workflowInstanceDataFields.InstanceID, "ProcessInstanceID": res.workflowInstanceDataFields.InstanceID,
"activityInstanceName": res.activityInstanceName, "activityInstanceName": res.activityInstanceName,
"Status": res.workflowInstanceDataFields.Status,
} }
console.log(this.task); console.log(this.task);
} }
@@ -126,6 +127,7 @@ export class PedidoPage implements OnInit {
"DeadlineType": res.workflowInstanceDataFields.DeadlineType, "DeadlineType": res.workflowInstanceDataFields.DeadlineType,
"ProcessInstanceID": res.workflowInstanceDataFields.InstanceID, "ProcessInstanceID": res.workflowInstanceDataFields.InstanceID,
"activityInstanceName": res.activityInstanceName, "activityInstanceName": res.activityInstanceName,
"Status": res.workflowInstanceDataFields.Status,
} }
console.log(this.task); console.log(this.task);
} }
@@ -443,17 +445,32 @@ export class PedidoPage implements OnInit {
} }
goBack() { goBack() {
if (window.innerWidth <= 800) { if(this.task.Status == "Pending"){
this.router.navigate(['/home/gabinete-digital/pedidos']); if (window.innerWidth <= 800) {
} else { this.router.navigate(['/home/gabinete-digital/pendentes']);
let navigationExtras: NavigationExtras = { }
queryParams: { else {
"pedidos": true, let navigationExtras: NavigationExtras = {
queryParams: {
"pendentes": true,
}
} }
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
else{
if (window.innerWidth <= 800) {
this.router.navigate(['/home/gabinete-digital/pedidos']);
}
else {
let navigationExtras: NavigationExtras = {
queryParams: {
"pedidos": true,
}
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
} }
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
} }
} }
} }