diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index bae0452a5..709122a83 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -109,13 +109,13 @@ export class EventsPage implements OnInit { // console.log('Resize event detected'); }); - + window['zipPhoneCallback'] = function (zipphone) { var frame = document.getElementById('home-iframe'); if(frame) { frame['contentWindow']['postMessage']({call:'cookies', value: { cookies: {} }}); } - } + } } @@ -493,12 +493,13 @@ export class EventsPage implements OnInit { } goToExpediente(SerialNumber: any) { - if (this.loggeduser.Profile == 'MDGPR') { + this.router.navigate(['/home/events/expediente', SerialNumber, 'events']); + /* if (this.loggeduser.Profile == 'MDGPR') { this.router.navigate(['/home/events/expediente', SerialNumber, 'events']); } else if (this.loggeduser.Profile == 'PR') { this.router.navigate(['/home/events/expedientes-pr', SerialNumber, 'events']); - } + } */ } viewExpedientListPage() { diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index f4da1f622..590200750 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -68,7 +68,7 @@ export class ExpedientesPrPage implements OnInit { LoadList() { this.skeletonLoader = true - + this.processes.GetTaskListExpediente(false).subscribe(result => { console.log(result); this.skeletonLoader = false @@ -99,7 +99,8 @@ export class ExpedientesPrPage implements OnInit { } goToExpediente(serialNumber:any){ - this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']); + //this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']); + this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']); } async viewExpedientDetail(serialNumber:any) { diff --git a/src/app/services/events/events.page.ts b/src/app/services/events/events.page.ts index 0ceb9b85d..079667c84 100644 --- a/src/app/services/events/events.page.ts +++ b/src/app/services/events/events.page.ts @@ -64,7 +64,7 @@ export class EventsPage implements OnInit { // shared data toDayEventStorage = ToDayEventStorage expedienteGdStore = ExpedienteGdStore - + expedienteTaskPipe = new ExpedienteTaskPipe() @Output() openExpedientListPage:EventEmitter = new EventEmitter(); @@ -352,12 +352,13 @@ export class EventsPage implements OnInit { } goToExpediente(SerialNumber:any) { - if(this.loggeduser.Profile == 'MDGPR'){ + this.router.navigate(['/home/events/expediente', SerialNumber, 'events']); + /* if(this.loggeduser.Profile == 'MDGPR'){ this.router.navigate(['/home/events/expediente', SerialNumber, 'events']); } else if(this.loggeduser.Profile == 'PR'){ this.router.navigate(['/home/events/expedientes-pr', SerialNumber, 'events']); - } + } */ } viewExpedientListPage(){ diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index d03699f52..d89169481 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -97,7 +97,8 @@ export class ExpedientesPrPage implements OnInit { } goToExpediente(serialNumber:any){ - this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']); + /* this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']); */ + this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']); } } diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 5a45c172b..2f0237c92 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -37,7 +37,7 @@ export class ExpedientsPage implements OnInit { //Inicializar segment this.segment = "expedientes"; this.LoadList() - + this.router.events.forEach((event) => { if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital?expedientes=true')) {