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 860c052db..99af5da34 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss @@ -1,4 +1,10 @@ @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; @@ -13,8 +19,6 @@ } .main-header{ font-family: Roboto; - border-top-left-radius: 25px; - border-top-right-radius: 25px; background-color: #fff; overflow:auto; color:#000; 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 ce4ebac59..4e822511d 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -7,7 +7,7 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute, Router } from '@angular/router'; import { formatDate } from '@angular/common'; import { Event } from '../../../../models/event.model'; -import { MenuController, ModalController, NavParams } from '@ionic/angular'; +import { MenuController, ModalController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { momentG } from 'src/plugin/momentG' @@ -38,7 +38,7 @@ export class PedidoPage implements OnInit { intervenientes: any; cc: any; - constructor(private activateRoute: ActivatedRoute, + constructor(private activatedRoute: ActivatedRoute, private processes: ProcessesService, private iab: InAppBrowser, private attachmentsService: AttachmentsService, @@ -46,24 +46,19 @@ export class PedidoPage implements OnInit { private menu: MenuController, private router: Router, private modalController: ModalController, - private navParams: NavParams, private alertService: AlertService) { - this.serialnumber = this.navParams.get('serialNumber'); - this.profile = this.navParams.get('profile'); + this.activatedRoute.queryParams.subscribe(params => { + if(params["serialNumber"]) { + this.serialnumber = params["serialNumber"]; + console.log(params["serialNumber"]); + } + }); } ngOnInit() { this.profile = "mdgpr"; console.log(this.serialnumber); - this.activateRoute.paramMap.subscribe(paramMap => { - if (!paramMap.has('SerialNumber')) { - return; - } - /* this.serialnumber = paramMap.get('SerialNumber'); */ - this.LoadTaskDetail(this.serialnumber); - this.LoadRelatedEvents(this.serialnumber); - }); this.LoadTaskDetail(this.serialnumber); this.LoadRelatedEvents(this.serialnumber); } @@ -77,7 +72,7 @@ export class PedidoPage implements OnInit { async LoadTaskDetail(serial: string) { - this.processes.GetTask(serial).subscribe(res => { + this.processes.GetTask(this.serialnumber).subscribe(res => { if(res.workflowDisplayName == 'Pedido de Parecer'){ this.task = { diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 8ac086385..f3d19406b 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -36,7 +36,7 @@ diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 7851ddd5b..5ee7859a8 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.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, tasksList } from '../../../models/dailyworktask.model'; @@ -31,13 +31,15 @@ export class PedidosPage implements OnInit { deferimentoList:DailyWorkTask[]; taskType: string; - serialNumber:string; + + @Input() serialNumber:string; @Input() profile:string; @Input() segment:string; - @Output() openExpedientDetail:EventEmitter = new EventEmitter(); + @Output() openPedido:EventEmitter = new EventEmitter(); constructor( + private router: Router, private processes:ProcessesService, private modalController: ModalController, private alertService: AlertService, @@ -60,7 +62,7 @@ export class PedidosPage implements OnInit { openExpedientDetailPage(data){ console.log(data); - this.openExpedientDetail.emit(data); + this.openPedido.emit(data); } LoadList(){ @@ -128,6 +130,15 @@ export class PedidosPage implements OnInit { }, 2000); } + goToPedido(serialNumber:any){ + let navigationExtras: NavigationExtras = { + queryParams: { + "serialNumber": serialNumber, + } + }; + this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras); + } + async viewPedidoDetail(serialNumber:any) { console.log(this.profile);