save

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts

@@ -10,6 +10,7 @@ import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popo
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
 import { ToastService } from 'src/app/services/toast.service';
+import { Location } from '@angular/common';
 
 @Component({
   selector: 'app-approve-event',
@@ -47,6 +48,7 @@ export class ApproveEventPage implements OnInit {
     private iab: InAppBrowser,
     private animationController: AnimationController,
     private toastService: ToastService,
+    private location: Location,
   ) {
     this.activatedRoute.paramMap.subscribe(params => {
       console.log(params["params"]);
@@ -64,7 +66,7 @@ export class ApproveEventPage implements OnInit {
   toDateString(e) {
     return new Date(e).toDateString()
   }
-  
+
   ngOnInit() {
     console.log(this.serialNumber);
     console.log(this.caller);
@@ -73,7 +75,8 @@ export class ApproveEventPage implements OnInit {
   }
 
   goBack() {
-    let navigationExtras: NavigationExtras = {
+    this.location.back();
+    /* let navigationExtras: NavigationExtras = {
       queryParams: {
         "eventos": true,
       }
@@ -82,7 +85,7 @@ export class ApproveEventPage implements OnInit {
       this.router.navigate(['/home',this.caller, 'event-list']);
     } else {
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
+    } */
 
   }
 

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

@@ -1,28 +1,6 @@
 <ion-header class="ion-no-border">
   <app-header></app-header>
 </ion-header>
-<ion-header *ngIf="!hideRefreshBtn" class="ion-no-border">
-  <div class="title-container d-flex">
-    <div class="title">
-      <ion-label>Gabinete Digital</ion-label>
-    </div>
-    <button *ngIf="hideRefreshBtn" class="btn-no-color btn-refresh" (click)="doRefresh($event)">
-      <ion-icon class="title-icon" name="reload-circle"></ion-icon>
-    </button>
-    <div class="title-icons">
-      <!-- <ion-toolbar> -->
-        <ion-segment [(ngModel)]="segmentVista" (ionChange)="onSegmentVistaChange()">
-          <ion-segment-button value="listview">
-            <fa-icon icon="stream"></fa-icon>
-          </ion-segment-button>
-          <ion-segment-button value="boxview">
-            <fa-icon icon="th-large"></fa-icon>
-          </ion-segment-button>
-        </ion-segment>
-      <!-- </ion-toolbar> -->
-    </div>
-  </div>
-</ion-header>
 
 <ion-content class="height-100">
   <ion-refresher slot="fixed" (ionRefresh)="doRefresh($event)">
@@ -35,27 +13,29 @@
       <!-- Aside left -->
       <div class="aside-wrapper d-flex flex-column width-md-40 flex-grow-1">
         <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
-        <div *ngIf="hideRefreshBtn" class="title-container">
+        <div class="title-container">
           <div class="title">
             <ion-label>Gabinete Digital</ion-label>
           </div>
           <button *ngIf="hideRefreshBtn" class="btn-no-color btn-refresh" (click)="doRefresh($event)">
             <ion-icon class="title-icon" name="reload-circle"></ion-icon>
           </button>
-          <!-- <div class="title-icons">
+          <div *ngIf="!hideRefreshBtn" class="title-icons">
               <ion-segment [(ngModel)]="segmentVista" (ionChange)="onSegmentVistaChange()">
-                <ion-segment-button value="listview">
+                <ion-segment-button value="listview" class="ion-segment-button-no-border">
                   <fa-icon icon="stream"></fa-icon>
                 </ion-segment-button>
-                <ion-segment-button value="boxview">
+                <ion-segment-button value="boxview" class="ion-segment-button-no-border">
                   <fa-icon icon="th-large"></fa-icon>
                 </ion-segment-button>
               </ion-segment>
-          </div> -->
+          </div>
         </div>
-        <div [ngSwitch]="segmentVista">
+        <div [ngSwitch]="segmentVista" class="height-100">
           <!-- This is the list view -->
-          <div *ngSwitchCase="'listview'">
+
+          <div *ngSwitchCase="'listview'" class="height-100">
+            <ion-item-sliding class="overflow-y-auto height-100">
             <div class="listview">
               <ion-list *ngIf="allProcessesList">
                 <div
@@ -67,9 +47,9 @@
                       <div class="item-subject">
                         <ion-label>{{ task.Folio }}</ion-label>
                       </div>
-                      <div class="item-icon">
+                      <div *ngIf="task.DocumentsQty != 0" class="item-icon">
                         <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                        <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
+                        <label>{{task.DocumentsQty}}</label>
                       </div>
                     </div>
                     <div class="item-middle-detail">
@@ -104,9 +84,11 @@
                 </div>
               </ion-list>
             </div>
+          </ion-item-sliding>
           </div>
+
           <!-- This is the box view -->
-          <div *ngSwitchCase="'boxview'" class="aside overflow-y-auto d-flex  flex-wrap width-100">
+          <div *ngSwitchCase="'boxview'" class="aside overflow-y-auto d-flex  flex-wrap width-100 height-100">
             <div (click)="openEventsToApprovePage();selectedElement='approval'" [class.active]="selectedElement == 'approval'"  class="exp-card d-flex flex-column" *ngIf="loggeduser.Profile == 'MDGPR'" >
               <div class="d-flex justify-center">
                 <ion-icon  src="assets/images/icons-agenda.svg"></ion-icon>

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;

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();

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);
       }
-    }
+    } */
   }
 
 }