diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index 17bf43a22..4a9c8e21f 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -26,11 +26,21 @@ export class DiplomasPage implements OnInit, OnDestroy { private activatedRoute: ActivatedRoute, ) { this.diplomasList = []; + //Inicializar segment + this.segment = 'validar'; + + this.activatedRoute.queryParams.subscribe(params => { + if(params['validar'] == 'true') { + this.segment = 'validar'; + } else if (params['assinados'] == 'true') { + this.segment = 'assinados'; + } + }); } ngOnInit() { - this.segment = 'validar'; + //this.segment = 'validar'; this.activatedRoute.queryParams.subscribe(params => { if(params['segment'] == 'validar') { @@ -54,7 +64,7 @@ export class DiplomasPage implements OnInit, OnDestroy { } } }); - + } /* async loadDiplomas(){ @@ -150,11 +160,11 @@ export class DiplomasPage implements OnInit, OnDestroy { } async LoadList() { - + this.skeletonLoader = true let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - + this.skeletonLoader = false this.showLoader = false; @@ -168,8 +178,8 @@ export class DiplomasPage implements OnInit, OnDestroy { }); this.diplomasList = this.sortArrayISODate(diplomasList.reverse()); - - + + let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado"); let diplomasAssinadoList = [] diplomasAssinados.forEach(async element => { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 9bf903b4f..8dda37308 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -673,8 +673,18 @@ export class GabineteDigitalPage implements OnInit, DoCheck { } openDiplomasPage(segment:string) { + let navigationExtras: NavigationExtras; + + if (segment == 'validar') { + navigationExtras= { queryParams: {"validar": true,}}; + } else if (segment == 'assinados') { + navigationExtras = { queryParams: {"assinados": true,}}; + } + + this.segment = segment; + if( window.innerWidth <= 801){ - this.router.navigate(['/home/gabinete-digital/diplomas']); + this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras); } else{ this.closeAllDesktopComponents();