-
+
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 c96833f4d..5b7e4f76d 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 @@ -40,12 +40,12 @@ export class ExpedientesPrPage implements OnInit { this.loggeduser = authService.ValidatedUser; } - + ngOnInit() { const location = window.location const pathname = location.pathname + location.search - + this.LoadList(); this.router.events.forEach((event) => { @@ -82,7 +82,7 @@ export class ExpedientesPrPage implements OnInit { "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, + "DocumentsQty": element.totalDocuments, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, "Status": element.workflowInstanceDataFields.Status, diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index 3b1c75bb6..e9692af74 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -75,7 +75,7 @@ export class PendentesPage implements OnInit { async LoadList(){ - this.skeletonLoader = true + this.skeletonLoader = true; let pendentes = await this.processes.GetPendingTasks(false).toPromise(); this.pendentesList = []; diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index 85c347038..076093166 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -19,14 +19,14 @@ - +
- @@ -54,14 +54,14 @@
- +
-
@@ -93,15 +93,15 @@
-
Lista vazia
- +
- + 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 3600f0743..39524b63d 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 @@ -44,11 +44,11 @@ export class ExpedientesPrPage implements OnInit { this.LoadList(); this.router.events.forEach((event) => { - if (event instanceof NavigationStart && - event.url.startsWith('/home/gabinete-digital?expedientespr=true') || + if (event instanceof NavigationStart && + event.url.startsWith('/home/gabinete-digital?expedientespr=true') || event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital?expedientes-pr=true')) { - + if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { this.refreshing() } else { @@ -85,7 +85,7 @@ export class ExpedientesPrPage implements OnInit { "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, + "DocumentsQty": element.totalDocuments, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, "Status": element.workflowInstanceDataFields.Status, diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 07217ddc7..1f2536597 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -46,7 +46,7 @@ export class ExpedientsPage implements OnInit { this.LoadList(); this.router.events.forEach((event) => { - if (event instanceof NavigationStart && + if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital?expedientes=true')) { if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { this.doRefresh() @@ -57,7 +57,7 @@ export class ExpedientsPage implements OnInit { }); } - + segmentChanged(){ this.LoadList(); } @@ -73,7 +73,7 @@ export class ExpedientsPage implements OnInit { this.processes.GetTasksList("Expediente", false).subscribe(result => { this.taskslist = []; this.skeletonLoader = false - + let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); res.forEach(element => { let date = new Date(element.taskStartDate); @@ -86,13 +86,13 @@ export class ExpedientsPage implements OnInit { "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, + "DocumentsQty": element.totalDocuments, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, "Status": element.workflowInstanceDataFields.Status, } this.taskslist.push(task); - + }); console.log("Buffer store", this.taskslist) this.expedientegbstore.reset(this.taskslist); @@ -103,7 +103,7 @@ export class ExpedientsPage implements OnInit { setTimeout(()=>{ this.LoadList(); }, 1000) - + } goToExpediente(serialNumber:any){ diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 43a1c0c34..9a01501b9 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -115,7 +115,7 @@ export class PedidosPage implements OnInit { "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, + "DocumentsQty": element.totalDocuments, "DocId": element.workflowInstanceDataFields.ParecerDocID, "FolderID": element.workflowInstanceDataFields.FolderID, "WorkflowName": element.workflowDisplayName, @@ -150,7 +150,7 @@ export class PedidosPage implements OnInit { "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, + "DocumentsQty": element.totalDocuments, "DocId": element.workflowInstanceDataFields.DocIdDiferimento, "FolderID": element.workflowInstanceDataFields.FolderID, "WorkflowName": element.workflowDisplayName, diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index 8a49f9790..96e155e8a 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -91,7 +91,7 @@ export class PendentesPage implements OnInit { "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, + "DocumentsQty": element.totalDocuments, "DocId": element.workflowInstanceDataFields.DocIdDiferimento, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index f0a3e8a39..4c2a5f021 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -46,8 +46,6 @@ export class ViewPublicationsPage implements OnInit { } ngOnInit() { - console.log(this.folderId); - if(typeof(this.folderId) == 'object') { this.folderId = this.folderId['ProcessId'] } @@ -84,7 +82,6 @@ export class ViewPublicationsPage implements OnInit { } getPublicationDetail() { - let allActions = this.publicationEventFolderStorage.list.concat(this.publicationTravelFolderService.list) this.item = allActions.find((e)=> e.ProcessId == this.folderId); @@ -96,7 +93,6 @@ export class ViewPublicationsPage implements OnInit { const folderId = this.folderId this.publications.GetPublications(folderId).subscribe(res=> { - console.log(res); this.publicationList = new Array();