diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss index ee616afff..1a5a23f86 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss @@ -194,24 +194,42 @@ ion-menu{ -/* @media only screen and (max-width: 1140px) { +@media only screen and (max-width: 800px) { .content{ - width: 100%; + width: 100% !important; } .aside-right{ display: none; } -} */ -/* @media only screen and (min-width: 1140px) { +} +@media only screen and (min-width: 801px) { .div-icon{ display: none; } .content{ - //width: 75%; + width: 65%; border-right: 1px solid #d8d8d8; } + .aside-right{ + width: 35%; + } +} + +@media only screen and (min-width: 1024px){ + .content{ + width: 70%; + } + .aside-right{ + width: 30%; + } +} + +@media only screen and (min-width: 1140px){ + .content{ + width: 75%; + } .aside-right{ width: 25%; } -} */ +} 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 c53e1f352..924754022 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 @@ -1,20 +1,6 @@ - + + + @@ -60,7 +46,9 @@
- +
+ +
{{ task.Folio}}
@@ -108,7 +96,7 @@
Documentos Anexados
- +

{{ task.Folio }}

diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss index 17f8b49a6..e16af5cfe 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss @@ -1,4 +1,9 @@ @import '~src/function.scss'; +.main-content{ + background-color: #fff !important; + border-top-left-radius: 25px; + border-top-right-radius: 25px; +} .content{ padding: 30px 20px 0 20px !important; margin: 0; diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index daa1a6279..7f49744f5 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -4,10 +4,10 @@ import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { DailyWorkTask } from '../../../../models/dailyworktask.model'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { formatDate } from '@angular/common'; import { Event } from '../../../../models/event.model'; -import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; +import { MenuController, ModalController, PopoverController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page'; import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page'; @@ -44,11 +44,16 @@ export class ExpedienteDetailPage implements OnInit { private menu: MenuController, private router: Router, private modalController: ModalController, - private navParams: NavParams, private alertService: AlertService, - public popoverController: PopoverController,) { - this.serialnumber = this.navParams.get('serialNumber'); - this.profile = this.navParams.get('profile'); + public popoverController: PopoverController, + private activatedRoute: ActivatedRoute, + ) { + this.activatedRoute.queryParams.subscribe(params => { + if(params["serialNumber"]) { + this.serialnumber = params["serialNumber"]; + console.log(params["serialNumber"]); + } + }); } ngOnInit() { @@ -71,6 +76,15 @@ export class ExpedienteDetailPage implements OnInit { this.modalController.dismiss(); } + goBack(){ + let navigationExtras: NavigationExtras = { + queryParams: { + "expedientes": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + sendExpedienteToPending(){ this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ console.log(res); diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss index dab508d2e..e692465fd 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss @@ -3,7 +3,6 @@ background-color: #fff !important; border-top-left-radius: 25px; border-top-right-radius: 25px; - } .content{ padding: 30px 20px 0 20px !important; diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index 4d74d1055..67ea75a48 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -23,7 +23,7 @@
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 923e5bc37..17bb1d782 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { Router } from '@angular/router'; +import { NavigationExtras, Router } from '@angular/router'; import { CalendarComponent } from 'ionic2-calendar'; import { DailyWorkTask } from '../../../models/dailyworktask.model'; @@ -31,6 +31,7 @@ export class ExpedientsPage implements OnInit { private processes:ProcessesService, private modalController: ModalController, private alertService: AlertService, + private router: Router, ) { this.profile = 'mdgpr'; } @@ -87,6 +88,15 @@ export class ExpedientsPage implements OnInit { }, 2000); } + goToExpediente(serialNumber:any){ + let navigationExtras: NavigationExtras = { + queryParams: { + "serialNumber": serialNumber, + } + }; + this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras); + } + async viewExpedientDetail(serialNumber:any) { console.log(this.profile); const modal = await this.modalController.create({ diff --git a/src/global.scss b/src/global.scss index 471f40e3a..193c3396a 100644 --- a/src/global.scss +++ b/src/global.scss @@ -603,6 +603,15 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- // center +app-approve-event ion-content .main-content{ + max-width: 1366px !important; + margin: 0px auto !important; +} + +app-expediente-detail ion-content .main-content{ + max-width: 1366px !important; + margin: 0px auto !important; +} app-pedido ion-content .main-content{ max-width: 1366px !important;