diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index fe6ec4526..227d8d729 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -121,11 +121,11 @@ export class CreateProcessPage implements OnInit { let SourceType; let SourceSecFsId; - if(this.task.workflowInstanceDataFields.FolderID) { + if(this.task.workflowInstanceDataFields.FolderID || this.task.FolderId) { SourceId = this.task.workflowInstanceDataFields.FolderID SourceType = 'FOLDER' SourceSecFsId = 361 - } else { + } else { SourceId = this.task.workflowInstanceDataFields.SourceID SourceType = 'DOC' SourceSecFsId = 8 diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html index c613e0d65..e184bc4b8 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html @@ -65,7 +65,7 @@
Documentos Anexados
- +

{{ Document.Assunto }}

{{ Document.Sender}}{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 0d18b4f3e..7e31cae4a 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -156,27 +156,30 @@ export class GabineteDigitalPage implements OnInit, DoCheck { } const pathname = window.location.pathname - this.LoadCounts(); + this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == pathname) { - this.checkRoutes(); - this.LoadCounts(); - // this.waitForDomService.selector({ - // selector: 'app-gabinete-digital ion-content .aside-wrapper', - // callback: ()=> { - // this.checkRoutes(); - // this.LoadCounts(); - // } - // }) - // console.log('yes', pathname) - } else { - // console.log('not') + + this.waitForDomService.selector({ + selector: 'app-gabinete-digital ion-content .aside-wrapper', + callback: ()=> { + this.checkRoutes(); + this.LoadCounts(); + } + }) } }); this.hideRefreshButton(); - this.loadAllProcesses(); + + this.waitForDomService.selector({ + selector: 'app-gabinete-digital ion-content .aside-wrapper', + callback: ()=> { + this.loadAllProcesses(); + } + }) + } async loadAllProcesses(){ diff --git a/src/app/services/dom/wait-for-dom.service.ts b/src/app/services/dom/wait-for-dom.service.ts index 216c129c9..3ab9c3d12 100644 --- a/src/app/services/dom/wait-for-dom.service.ts +++ b/src/app/services/dom/wait-for-dom.service.ts @@ -9,7 +9,7 @@ export class WaitForDomService { constructor() { } selector({ selector, callback }) { - + function _try() { if (!document.querySelector(selector)) { window.requestAnimationFrame(_try);