improve gabinete digital

src/app/pages/gabinete-digital/expediente/expediente.page.ts

@@ -66,6 +66,15 @@ export class ExpedientePage implements OnInit {
 
   async viewExpedientDetail(serialNumber:any) {
     console.log(this.profile);
+
+
+    let classs;
+    if( window.innerWidth <= 1024){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'gabinete-digital-mobile-modal-to-Desktop'
+    }
+
     
     const modal = await this.modalController.create({
       component: ExpedienteDetailPage,
@@ -73,7 +82,7 @@ export class ExpedientePage implements OnInit {
         serialNumber: serialNumber,
         profile: this.profile,
       },
-      cssClass: 'modal modal-desktop',
+      cssClass: classs,
       backdropDismiss: false
     });
     await modal.present();

src/app/pages/gabinete-digital/gabinete-digital.module.ts

@@ -9,8 +9,9 @@ import { GabineteDigitalPageRoutingModule } from './gabinete-digital-routing.mod
 import { GabineteDigitalPage } from './gabinete-digital.page';
 import { SharedModule } from 'src/app/shared/shared.module';
 
-import { EventListComponent } from 'src/app/shared/gabinete-digital/event-list/event-list.component';
-import { ExpedienteComponent } from 'src/app/shared/gabinete-digital/expediente/expediente.component'
+import { EventListComponent } from 'src/app/shared/agenda/event-list/event-list.component';
+import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/expediente.page'
+
 /* import { ComponentsModule } from 'src/app/components/components.module'; */
 
 @NgModule({
@@ -24,7 +25,7 @@ import { ExpedienteComponent } from 'src/app/shared/gabinete-digital/expediente/
   declarations: [
     GabineteDigitalPage,
     EventListComponent,
-    ExpedienteComponent
+    ExpedientePage
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })

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

@@ -2,22 +2,6 @@
   <app-header></app-header>
 </ion-header>
 
-<!-- <ion-header class="ion-no-border">
-  <ion-toolbar class="ion-no-border" class="bg-blue">
-    <div class="div-top-header">
-    <div class="div-search">
-      <ion-icon src='assets/images/icons-search.svg'></ion-icon>
-    </div>
-    <div class="div-logo">
-      <img src='assets/images/logo-no-bg.png' alt='logo'>
-    </div>
-    <div class="div-profile">
-      <ion-icon src='assets/images/icons-profile.svg'></ion-icon>
-    </div>
-  </div>
-</ion-toolbar>
-</ion-header> -->
-
 <ion-content class="height-100">
   <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
     <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
@@ -29,8 +13,8 @@
     <div class="d-flex height-100">
 
       <!--  -->
-      <div class="d-flex flex-column pt-25 justify-center">
-        <p class="text-center mt-0">Gabinete Digital</p>
+      <div class="d-flex aside-wrapper flex-column pt-25 justify-center">
+        <p class="text-center mt-0 aside-title px-20">Gabinete Digital</p>
         <div class="aside overflow-y-auto d-flex flex-wrap justify-center">
           <div class="exp-card d-flex flex-column justify-center" (click)="openEventsToApproveList('MDGPR')">
             <div class="d-flex justify-center">
@@ -87,7 +71,8 @@
 
       <!--  -->
       <div class="d-none flex-1 aside-content height-100 overflow-y-auto pt-25">
-        123
+        <app-event-list class="d-flex flex-1 flex-column height-100" *ngIf="desktopComponent.showEventList"></app-event-list>
+        <app-expediente class="d-flex flex-1 flex-column height-100" *ngIf="desktopComponent.showExpediente"></app-expediente>
       </div>
     </div>
 

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

@@ -153,6 +153,14 @@ ion-content{
 @media only screen and (min-width: 1024px) {
 
   .main-content{
+    .aside-wrapper{
+      justify-content: flex-start !important;
+      .aside-title{
+        font-family: Roboto;
+        font-size: 25px;
+        text-align: left;
+      }
+    }
     .aside{
       width: 340px;
     }

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

@@ -17,6 +17,16 @@ export class GabineteDigitalPage implements OnInit {
   showLoader: boolean;
   public profile:string;
 
+  count_exp_dailywork=0;  
+  count_exp_pp : string;
+  count_exp_pd : string;
+  count_dip_apr : string;
+  count_dip_pv : string;
+  count_de_pr : string;
+  count_ev_pr=0;
+  count_ev_md=0;
+
+
   desktopComponent: any = {
     showEventList: false,
     showExpediente : false
@@ -30,15 +40,12 @@ export class GabineteDigitalPage implements OnInit {
       
     }
 
-  count_exp_dailywork=0;  
-  count_exp_pp : string;
-  count_exp_pd : string;
-  count_dip_apr : string;
-  count_dip_pv : string;
-  count_de_pr : string;
-  count_ev_pr=0;
-  count_ev_md=0;
-
+  closeAllDesktopComponent(){
+    this.desktopComponent = {
+      showEventList: false,
+      showExpediente: false
+    }
+  }  
   ngOnInit() {
     //Initialize profile as mdgpr
     this.profile = "mdgpr";
@@ -89,39 +96,59 @@ this.processesbackend.GetActionsList().subscribe(res=>{
   }
   
   async openEventsToApproveList(segment:any){
+    
+    this.closeAllDesktopComponent();
+
+    let classs;
     if( window.innerWidth <= 1024){
+      classs = 'modal'
+    } else  {
+      classs = 'gabinete-digital-mobile-modal-to-Desktop'
+    }
+
+    //if( window.innerWidth <= 1024){
       const modal = await this.modalController.create({
         component: EventListPage,
         componentProps:{
           segment: segment,
         },
-        cssClass: 'modal expedient-task-modal modal-desktop',
+        cssClass: classs,
         backdropDismiss: false
       });
       await modal.present();
       modal.onDidDismiss();
-    } else {
-
-    }
+    //} else {
+      //this.desktopComponent.showEventList = true;
+    //}
 
   }
 
   async openExpedientList(){
     
+    this.closeAllDesktopComponent();
+
+    let classs;
     if( window.innerWidth <= 1024){
+      classs = 'modal'
+    } else  {
+      classs = 'gabinete-digital-mobile-modal-to-Desktop'
+    }
+
+    //if( window.innerWidth <= 1024){
       const modal = await this.modalController.create({
         component: ExpedientePage,
         componentProps:{
           profile: this.profile,
         },
-        cssClass: 'modal  modal-desktop',
+        cssClass: classs,
         backdropDismiss: false
       });
       await modal.present();
       modal.onDidDismiss();
-    } else {
-
-    }
+    //} else {
+      console.log('show desktop modal')
+      //this.desktopComponent.showExpediente = true;
+    //}
 
   }
 

src/app/pages/search/search.page.ts

@@ -403,7 +403,7 @@ export class SearchPage implements OnInit {
         componentProps:{
           eventId: id
         },
-        cssClass: 'modal',
+        cssClass: 'modal modal-desktop',
         backdropDismiss: false
       });
       await modal.present();
@@ -422,7 +422,7 @@ export class SearchPage implements OnInit {
       componentProps:{
         publicationId: publicationId,
       },
-      cssClass: 'publication-detail',
+      cssClass: 'publication-detail modal modal-desktop',
       backdropDismiss: false
     });