diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index ee43756f9..a6584dde7 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -108,12 +108,6 @@ export class ViewEventPage implements OnInit { this.router.navigate(['/home',params["params"].caller]); } }); - - /* this.activatedRoute.queryParams.subscribe(params => { - if(params["caller"]) { - this.router.navigate(['/home',params["caller"]]); - } - }); */ } loadEvent(){ diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 4af7eba49..eeec4d60b 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -46,7 +46,7 @@ - + Oficial diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 1f1e47809..51a31a44f 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -154,17 +154,9 @@ export class BookMeetingModalPage implements OnInit { goBack() { this.modalController.dismiss(null); - let navigationExtras: NavigationExtras = { - queryParams: { - "expedientes": true, - } - } - if( window.innerWidth < 801) { - this.router.navigate(['/home/gabinete-digital/expediente']); - } else { - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - } + window.history.back(); } + async saveTask(){ // issue12323423 let Attendees = this.taskParticipants.concat(this.taskParticipantsCc); 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 887f46844..b09faabf3 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 @@ -35,6 +35,7 @@ export class ExpedienteDetailPage implements OnInit { fulltask: any; eventsList: Event[]; serialnumber: string; + caller:string; serialNumber: string; profile: string; intervenientes: any; @@ -65,6 +66,9 @@ export class ExpedienteDetailPage implements OnInit { if(params["params"].SerialNumber) { this.serialnumber = params["params"].SerialNumber; } + if(params["params"].caller) { + this.caller = params["params"].caller; + } }); @@ -97,7 +101,7 @@ export class ExpedienteDetailPage implements OnInit { } goBack() { - if(this.task.Status == "Pending"){ + if(this.task.Status == "Pending" && this.caller != 'events'){ if (window.innerWidth <= 800) { this.router.navigate(['/home/gabinete-digital/pendentes']); } @@ -111,6 +115,7 @@ export class ExpedienteDetailPage implements OnInit { } } else{ + console.log('HERE'); this.activatedRoute.paramMap.subscribe(params => { switch (params["params"].caller) { case 'events': diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index a2ffad9d7..7d6a6d3a1 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -189,57 +189,6 @@ export class GabineteDigitalPage implements OnInit { this.openDiplomasPage(''); this.selectedElement='DiplomasAssinar'; } - - /* this.activatedRoute.queryParams.subscribe(params => { - switch (params) - { - case params["eventos"]: - this.openEventsToApprovePage("MDGPR"); - this.selectedElement='approval'; - break; - - case params["expedientes"]: - this.openExpedientListPage(); - this.selectedElement='Correspondence'; - this.expedientesPage.doRefresh(); - break; - - case params["pendentes"]: - this.openPendentesPage(''); - this.selectedElement='Pending'; - break; - - case params["despachos"]: - this.openDespachosPage(''); - this.selectedElement='Dispatches'; - break; - - case params["pedidos"]: - this.openPedidosPage('parecer'); - this.selectedElement='RequestsForOpinion'; - break; - - case params["expedientespr"]: - this.openEventsToApprovePage("MDGPR"); - this.selectedElement='Expediente Presidente' - break; - - case params["despachospr"]: - this.openDespachosPrPage(''); - this.selectedElement='DispatchesPr' - break; - - case params["diplomas"]: - this.openDiplomasPage('validar'); - this.selectedElement='DiplomasPorValidar'; - break; - - case params["diplomasassinar"]: - this.openDiplomasPage(''); - this.selectedElement='DiplomasAssinar'; - break; - } - }); */ } refreshExpedientes(){ 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 87e9d322c..f87447fd8 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss @@ -69,19 +69,28 @@ margin: 1px; } } - + .title-content{ + display: flex; + justify-content:space-between; + align-items: flex-start !important; + border-radius: 0 !important; + .title{ + width: fit-content; + height: auto; font-size: 25px; overflow: auto; float: left; + padding-left: 5px; } .div-icon{ - width: 40px; - float: right; - font-size: 35px; - overflow: auto; + position: absolute; + width: fit-content !important; + font-size: 35px !important; padding: 1px; + right: 0 !important; } + } } ion-item-group{ margin: 15px;