diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index f5456ea3c..d34fda78c 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -119,11 +119,11 @@ ion-segment-button{
font-family: Roboto;
margin: 0 auto;
background:#ecf8ff;
- overflow:auto;
+ overflow:hidden;
padding: 0 !important;
.aside-wrapper{
- overflow: auto;
+ overflow: hidden;
.listview{
width: 100%t;
padding: 0px 20px 15px 20px !important;
@@ -401,12 +401,14 @@ ion-list{
.main-content{
border-top-left-radius: 25px;
border-top-right-radius: 25px;
+ overflow: hidden;
.aside-wrapper{
display: flex;
width: 35%;
justify-content: flex-start !important;
border-right: 1px solid #d8d8d8;
+ overflow: hidden;
.aside{
background:transparent;
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 6999a754f..d12bf15c3 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -112,8 +112,12 @@ export class GabineteDigitalPage implements OnInit {
this.loggeduser = authService.ValidatedUser;
window.onresize = (event) => {
// if not mobile remove all component
- if( window.innerWidth <= 801){
+ if( window.innerWidth <= 701){
this.modalController.dismiss();
+ this.segmentVista = "listview";
+ }
+ else{
+ this.segmentVista = "boxview";
}
};
this.checkRoutes();
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index 6c03143fe..17840b6ff 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -23,6 +23,7 @@ import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.p
import { ToastService } from 'src/app/services/toast.service';
import { ForwardPage } from 'src/app/modals/forward/forward.page';
import { async } from '@angular/core/testing';
+import { Location } from '@angular/common';
@Component({
selector: 'app-pedido',
@@ -58,7 +59,9 @@ export class PedidoPage implements OnInit {
public popoverController: PopoverController,
authService: AuthService,
private animationController: AnimationController,
- private toastService: ToastService,) {
+ private toastService: ToastService,
+ private location: Location,
+ ) {
this.loggeduser = authService.ValidatedUser;
this.activatedRoute.paramMap.subscribe(params => {
@@ -488,7 +491,8 @@ export class PedidoPage implements OnInit {
}
goBack() {
- if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
+ this.location.back();
+ /* if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
if (window.innerWidth <= 700) {
this.router.navigate(['/home/gabinete-digital/pendentes']);
}
@@ -521,7 +525,7 @@ export class PedidoPage implements OnInit {
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
- }
+ } */
}
}
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 5651bbcf2..ebfebffc5 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -559,6 +559,8 @@ $app-theme: mat-light-theme((
}
}
+
+
/* .main-content{
width: 100%;
height: 100% !important;
@@ -572,3 +574,8 @@ $app-theme: mat-light-theme((
html, body { height: 100%; }
body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
+
+.ion-segment-button-no-border {
+ --indicator-color: transparent !important;
+ --indicator-color-checked: transparent !important;
+}