diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 078f438c5..7623747ad 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -91,7 +91,7 @@ -
+
Enviar para o PR
@@ -109,6 +109,21 @@
+
+ +
+ + +
+ + + + + +
+ +
+
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html index 629b384e0..ab18db976 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -5,7 +5,7 @@
-
+
@@ -23,6 +23,18 @@
+
+
+ + +
+ + + + + +
+
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 9ffefcfc4..fffdbfb3a 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -57,20 +57,20 @@ export class OptsExpedientePage implements OnInit { } goBack() { - if(this.task.Status == "Pending" && this.caller != 'events'){ + if(this.task.Status == "Pending" && this.caller != 'events') { if (window.innerWidth <= 800) { this.router.navigate(['/home/gabinete-digital/pendentes']); } else { let navigationExtras: NavigationExtras = { queryParams: { - "pendentes": true, - } + "pendentes": true, + } } this.router.navigate(['/home/gabinete-digital'], navigationExtras); } } - else{ + else { window.history.back(); /* this.activatedRoute.paramMap.subscribe(params => { @@ -193,8 +193,8 @@ export class OptsExpedientePage implements OnInit { modal.onDidDismiss().then( async (res)=>{ console.log(res['data']); - if(body == 'descartar'){ - if(res['data']== 'Yes'){ + if(body == 'descartar') { + if(res['data']== 'Yes') { let otherbody = { "serialNumber": this.task.SerialNumber, "action": "Passivo",