merge

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts

@@ -24,6 +24,8 @@ 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';
+
 
 @Component({
   selector: 'app-pedido',
@@ -61,6 +63,7 @@ export class PedidoPage implements OnInit {
     private animationController: AnimationController,
     private toastService: ToastService,
     public p: PermissionService,
+    private location: Location
     ) {
       this.loggeduser = authService.ValidatedUser;
 
@@ -91,7 +94,7 @@ export class PedidoPage implements OnInit {
   toDateString(e) {
     return new Date(e).toDateString()
   }
-  
+
   async LoadTaskDetail(serial: string) {
     this.processes.GetTask(this.serialnumber).subscribe(res => {
 
@@ -167,7 +170,7 @@ export class PedidoPage implements OnInit {
         window.history.back();
       }   finally {
         if(error.status ==  0) {
-          this.toastService.badRequest('Não é possível  vizualizar este processo no modo offline')
+          this.toastService.badRequest('Não é possível  visualizar este processo no modo offline')
         } else {
           this.toastService.badRequest('Processo não encontrado')
         }
@@ -449,7 +452,7 @@ export class PedidoPage implements OnInit {
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
     } else  {
-      classs = 'modal modal-desktop'
+      classs = 'add-note-modal'
     }
     const modal = await this.modalController.create({
       component: AddNotePage,
@@ -491,8 +494,9 @@ export class PedidoPage implements OnInit {
   }
 
   goBack() {
-    if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
-      if (window.innerWidth <= 800) {
+    this.location.back();
+    /* if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
+      if (window.innerWidth <= 700) {
         this.router.navigate(['/home/gabinete-digital/pendentes']);
       }
       else {
@@ -509,7 +513,7 @@ export class PedidoPage implements OnInit {
       }
     }
     else {
-      if (window.innerWidth <= 800) {
+      if (window.innerWidth <= 700) {
         this.router.navigate(['/home/gabinete-digital/pedidos']);
       }
       else {
@@ -524,7 +528,7 @@ export class PedidoPage implements OnInit {
         }
         this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       }
-    }
+    } */
   }
 
 }

src/app/pages/gabinete-digital/pedidos/pedidos.page.html

@@ -116,7 +116,7 @@
     </div>
 
     <div [ngSwitch]="segment">
-    <div *ngSwitchCase="'parecer'" class="d-flex height-100 align-center justify-content-center" >
+    <div *ngSwitchCase="'parecer'" class="centered-div d-flex height-100 align-center justify-content-center" >
       <div
         *ngIf="!skeletonLoader && pedidosstorage.listparecer.length == 0"
         class="empty-list d-flex height-100 align-center justify-content-center"
@@ -125,7 +125,7 @@
       </div>
     </div>
 
-    <div *ngSwitchCase="'deferimento'" class="d-flex height-100 align-center justify-content-center">
+    <div *ngSwitchCase="'deferimento'" class="centered-div d-flex height-100 align-center justify-content-center">
       <div
         *ngIf="!skeletonLoader && pedidosstorage.listdeferimento.length == 0"
         class="empty-list d-flex height-100 align-center justify-content-center"

src/app/pages/gabinete-digital/pedidos/pedidos.page.scss

@@ -38,7 +38,7 @@ ion-content, .header-2, .main-content{
   }
   .ion-item-class{
     padding: 0;
-  
+
   }
   .label-text{
     width: 100%;
@@ -87,7 +87,7 @@ ion-item{
   .div-icon ion-icon{
     display: block;
     margin: 0 auto;
-  
+
   }
   .div-content-expediente p, .div-content-pendentes p{
     font-size: 14pt;
@@ -167,7 +167,7 @@ ion-item{
   .exp-workflow{
     float: left;
     margin: 0 !important;
-  
+
     .label{
       border-radius: 15px;
       background: #ffb703;
@@ -230,4 +230,13 @@ ion-item{
   font-size: 45px;
   float: right;
   margin-right: 10px;
-}
+}
+
+.centered-div{
+  width: 100px;
+  height: 100px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  margin: -35px 0 0 -35px;
+}