diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
index 706867ea8..0a8e4d9c0 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -65,7 +65,7 @@
-
+
+
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index 1bd78b36f..e7aeecbbe 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -44,6 +44,7 @@ export class DespachosPage implements OnInit {
loadedAttachments:any;
dicIndex = 0;
inicial = false
+ skeletonLoader = true
constructor (
private processes:ProcessesService,
@@ -83,10 +84,14 @@ export class DespachosPage implements OnInit {
async LoadList() {
+ this.skeletonLoader = true
+
let result = await this.processes.GetTasksList("Despacho", false).toPromise();
//let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
this.despachoList = new Array();
+ this.skeletonLoader = false
+
await result.forEach( (element, index) => {
let date = new Date(element.taskStartDate);
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index 119aa88b7..ce7ab7e18 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -64,7 +64,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index 0038ecf2b..fbb558eb1 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -22,6 +22,8 @@ export class DiplomasAssinarPage implements OnInit {
@Input() profile:string;
@Input() segment:string;
+ skeletonLoader = true
+
constructor(
private processes:ProcessesService,
private modalController: ModalController,
@@ -61,52 +63,54 @@ export class DiplomasAssinarPage implements OnInit {
}, 2000);
}
- async LoadList(){
+ async LoadList(){
- let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
- this.diplomasList = new Array();
- let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
- console.log(diplomasAssinar);
- diplomasAssinar.forEach(element => {
- let DocId = element.workflowInstanceDataFields.FolderID;
- let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
- this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
- this.totalDocs = res.DocumentsTotal;
- console.log(res.DocumentsTotal);
- let task = {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceDataFields.Subject,
- "Senders": element.workflowInstanceDataFields.Sender,
- "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
- "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
- "Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": element.totalDocuments,
- "DocId": element.workflowInstanceDataFields.DocId,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- "Status": element.workflowInstanceDataFields.Status,
- }
- this.diplomasList.push(task);
- },
- (error)=>{
- let task = {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceDataFields.Subject,
- "Senders": element.workflowInstanceDataFields.Sender,
- "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
- "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
- "Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": element.totalDocuments,
- "DocId": element.workflowInstanceDataFields.DocId,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- "Status": element.workflowInstanceDataFields.Status,
- }
- this.diplomasList.push(task);
- });
- });
- this.showLoader = false;
- }
+ this.skeletonLoader = true
+
+ let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+ this.diplomasList = new Array();
+ let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
+ console.log(diplomasAssinar);
+ diplomasAssinar.forEach(element => {
+ let DocId = element.workflowInstanceDataFields.FolderID;
+ let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+ this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
+ this.totalDocs = res.DocumentsTotal;
+ console.log(res.DocumentsTotal);
+ let task = {
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceDataFields.Subject,
+ "Senders": element.workflowInstanceDataFields.Sender,
+ "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+ "Remetente": element.workflowInstanceDataFields.Remetente,
+ "DocumentsQty": element.totalDocuments,
+ "DocId": element.workflowInstanceDataFields.DocId,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ "Status": element.workflowInstanceDataFields.Status,
+ }
+ this.diplomasList.push(task);
+ },
+ (error)=>{
+ let task = {
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceDataFields.Subject,
+ "Senders": element.workflowInstanceDataFields.Sender,
+ "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+ "Remetente": element.workflowInstanceDataFields.Remetente,
+ "DocumentsQty": element.totalDocuments,
+ "DocId": element.workflowInstanceDataFields.DocId,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ "Status": element.workflowInstanceDataFields.Status,
+ }
+ this.diplomasList.push(task);
+ });
+ });
+ this.showLoader = false;
+ }
goBack() {
this.router.navigate(['/home/gabinete-digital']);
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
index 2b2d25d5d..c1228ca86 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
@@ -94,7 +94,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
index 27dceeb75..adfa661bb 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
@@ -19,6 +19,8 @@ serialNumber:string;
segment:string;
+skeletonLoader = true
+
constructor(
private processes:ProcessesService,
private router: Router,
@@ -144,9 +146,12 @@ constructor(
async LoadList(){
this.diplomasList = [];
console.log(this.diplomasList);
+ this.skeletonLoader = true
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+ this.skeletonLoader = false
+
switch (this.segment) {
case 'validar':
let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html
index abb682931..7346232a2 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html
@@ -53,7 +53,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 0500dd210..e1a5bc84e 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -13,7 +13,7 @@ import { AlertService } from 'src/app/services/alert.service';
export class ExpedientePage implements OnInit {
segment:string;
- showLoader: boolean;
+ skeletonLoader = true
//profile:string;
taskslist:DailyWorkTask[];
@@ -37,7 +37,8 @@ export class ExpedientePage implements OnInit {
}
LoadList(){
- this.showLoader = true;
+ this.skeletonLoader = true
+
this.processes.GetTasksList("Expediente", false).subscribe(result => {
console.log(result);
this.taskslist = new Array();
@@ -61,7 +62,7 @@ export class ExpedientePage implements OnInit {
this.taskslist.push(task);
});
console.log(this.taskslist);
- this.showLoader = false;
+ this.skeletonLoader = false;
});
}
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 2c0bca6ff..075333338 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -52,7 +52,7 @@
-
+
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 27e3597ea..611d72250 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
@@ -28,6 +28,8 @@ export class ExpedientesPrPage implements OnInit {
loggeduser: User;
@Output() openExpedientDetail:EventEmitter = new EventEmitter();
+ skeletonLoader = true
+
constructor(
private processes:ProcessesService,
private modalController: ModalController,
@@ -50,7 +52,8 @@ export class ExpedientesPrPage implements OnInit {
}
LoadList(){
- this.showLoader = true;
+ this.skeletonLoader = true
+
switch (this.loggeduser.Profile) {
case 'MDGPR':
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
@@ -76,7 +79,7 @@ export class ExpedientesPrPage implements OnInit {
this.taskslist.push(task);
});
console.log(this.taskslist);
- this.showLoader = false;
+ this.skeletonLoader = false
});
break;
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index 586f92eed..08503b149 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -106,7 +106,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index 2f393391c..62ab5762a 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -31,6 +31,7 @@ export class PedidosPage implements OnInit {
deferimentoList:any[];
taskType: string;
serialNumber:string;
+ skeletonLoader = true
@Input() segment:string;
@Output() openExpedientDetail:EventEmitter = new EventEmitter();
@@ -95,12 +96,16 @@ export class PedidosPage implements OnInit {
}
async LoadList(){
+ this.skeletonLoader = true
+
if(this.segment == 'parecer'){
this.taskType = "Pedido de Parecer";
let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
+ this.skeletonLoader = false
+
let allParecer = parecer.concat(parecerPr).reverse();
this.parecerList = new Array();
@@ -128,8 +133,9 @@ export class PedidosPage implements OnInit {
}
else if(this.segment == 'deferimento') {
this.taskType = "Pedido de Deferimento";
- this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
+ await this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
this.taskslist = result;
+ this.skeletonLoader = false
console.log(result);
@@ -157,6 +163,7 @@ export class PedidosPage implements OnInit {
});
}
+
}
refreshing() {
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
index cef57a2b4..dacd52b14 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
@@ -65,7 +65,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
index bdabd051d..cc0c8ce02 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
@@ -24,6 +24,7 @@ export class PendentesPage implements OnInit {
@Input() profile:string;
segment:string;
+ skeletonLoader = true
constructor(
private processes:ProcessesService,
@@ -60,7 +61,8 @@ export class PendentesPage implements OnInit {
}
async LoadList(){
- this.showLoader = true;
+
+ this.skeletonLoader = true
this.pendentesList = new Array();
let pendentes = await this.processes.GetPendingTasks(false).toPromise();
@@ -87,7 +89,8 @@ export class PendentesPage implements OnInit {
this.pendentesList = this.sortArrayISODate(this.pendentesList);
});
- this.showLoader = false;
+ this.skeletonLoader = false;
+
}
sortArrayISODate(myArray: any){
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
index 4108d80ed..cf5a8c9b4 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -57,7 +57,7 @@
-
+
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
index f81521de8..39498fa8d 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -37,7 +37,7 @@ taskList:tasksList[] = [];
taskType: string;
serialNumber:string;
totalDocs:any;
-loading = false
+skeletonLoader = true
@Input() profile:string;
segment:string;
@@ -99,7 +99,7 @@ goToDespachoPr(serialNumber:any){
this.despachoList = new Array();
- this.loading = true;
+ this.skeletonLoader = true;
let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
console.log(result);
@@ -143,7 +143,7 @@ goToDespachoPr(serialNumber:any){
this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
- this.loading = false;
+ this.skeletonLoader = false;
}
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html
index a87c2957e..4b89cdbb5 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html
@@ -53,7 +53,7 @@
-
+
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index aa58991ee..877396f86 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -43,6 +43,7 @@ export class DespachosPage implements OnInit {
loadedAttachments:any;
dicIndex = 0;
inicial = false
+ skeletonLoader = true
constructor (
private processes:ProcessesService,
@@ -93,6 +94,8 @@ export class DespachosPage implements OnInit {
async LoadList(){
+ this.skeletonLoader = true
+
let result = await this.processes.GetTasksList("Despacho", false).toPromise();
//let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
this.despachoList = new Array();
@@ -123,7 +126,8 @@ export class DespachosPage implements OnInit {
});
this.despachoList = this.sortArrayISODate(this.despachoList).reverse();
-
+ this.skeletonLoader = false
+
}
sortArrayISODate(myArray: any){
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index c2bc707aa..db4115473 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -55,7 +55,7 @@
-
+
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index e11c80beb..73bb4e2d3 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -18,6 +18,7 @@ diplomasList:DailyWorkTask[] = [];
showLoader: boolean;
totalDocs:any;
serialNumber:string;
+skeletonLoader = true
@Input() profile:string;
@Input() segment:string;
@@ -59,8 +60,11 @@ serialNumber:string;
async LoadList(){
+ this.skeletonLoader = true
+
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.diplomasList = new Array();
+ this.skeletonLoader = false
console.log(diplomas);
let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
index 649c7d666..c2393c8f9 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
@@ -82,7 +82,7 @@
-
+
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
index b08b51368..acc04bf1f 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -17,6 +17,7 @@ diplomasList:DailyWorkTask[] = [];
showLoader: boolean;
totalDocs:any;
serialNumber:string;
+skeletonLoader = false
@Input() segment:string;
@@ -46,12 +47,15 @@ constructor(
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
- async LoadList(){
+ async LoadList() {
+
this.diplomasList = [];
console.log(this.diplomasList);
console.log(this.segment);
+ this.skeletonLoader = true
+
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
switch (this.segment) {
@@ -118,6 +122,8 @@ constructor(
console.log('No segment provided!');
break;
}
+
+ this.skeletonLoader = false
}
sortArrayISODate(myArray: any) {
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 2e6981968..c00ca3941 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -37,7 +37,7 @@
-
+
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 b68268d20..8967468a3 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
@@ -22,7 +22,7 @@ export class ExpedientesPrPage implements OnInit {
taskslist:DailyWorkTask[];
serialNumber:string;
- showLoader:boolean;
+ skeletonLoader:boolean;
loggeduser: User;
@Output() openExpedientDetail:EventEmitter = new EventEmitter();
@@ -55,7 +55,7 @@ export class ExpedientesPrPage implements OnInit {
}
LoadList(){
- this.showLoader = true;
+ this.skeletonLoader = true;
switch (this.loggeduser.Profile) {
case 'MDGPR':
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
@@ -81,7 +81,7 @@ export class ExpedientesPrPage implements OnInit {
this.taskslist.push(task);
});
console.log(this.taskslist);
- this.showLoader = false;
+ this.skeletonLoader = false;
});
break;
@@ -109,7 +109,7 @@ export class ExpedientesPrPage implements OnInit {
this.taskslist.push(task);
});
console.log(this.taskslist);
- this.showLoader = false;
+ this.skeletonLoader = false;
});
break;
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
index b2d2f646f..b4c5cfde9 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -45,7 +45,7 @@
-
+
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index 29cdfdb35..dcf9a1b9b 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -25,6 +25,7 @@ export class ExpedientsPage implements OnInit {
serialNumber:string;
@Input() profile:string;
+ skeletonLoader = true
constructor(
private processes:ProcessesService,
@@ -58,9 +59,14 @@ export class ExpedientsPage implements OnInit {
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
- LoadList(){
+ LoadList() {
+
+ this.skeletonLoader = true
+
this.processes.GetTasksList("Expediente", false).subscribe(result => {
this.taskslist = new Array();
+ this.skeletonLoader = false
+
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
let date = new Date(element.taskStartDate);
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 95267f4be..10e41c44d 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -98,7 +98,7 @@
-
+
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 2a30049e9..eb3e0be8a 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -37,6 +37,7 @@ export class PedidosPage implements OnInit {
@Input() profile:string;
@Input() segment:string;
@Output() openPedido:EventEmitter = new EventEmitter();
+ skeletonLoader = true
constructor(
private router: Router,
@@ -72,12 +73,17 @@ export class PedidosPage implements OnInit {
}
async LoadList(){
+
+ this.skeletonLoader = true
+
if(this.segment == 'parecer'){
this.taskType = "Pedido de Parecer";
let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
+ this.skeletonLoader = false
+
let allParecer = parecer.concat(parecerPr).reverse();
console.log(allParecer);
@@ -111,6 +117,7 @@ export class PedidosPage implements OnInit {
this.taskType = "Pedido de Deferimento";
this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
this.taskslist = result;
+ this.skeletonLoader = false
this.deferimentoList = new Array();
let res = result.reverse();
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
index bcbb2202c..c05c0b65b 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
@@ -49,7 +49,7 @@
-
+
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index 53b35c705..906cc3cb0 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -21,7 +21,7 @@ export class PendentesPage implements OnInit {
taskType: string;
serialNumber:string;
totalDocs:any;
- showLoader: boolean;
+ skeletonLoader: boolean;
@Input() profile:string;
segment:string;
@@ -62,7 +62,7 @@ export class PendentesPage implements OnInit {
}
async LoadList(){
- this.showLoader = true;
+ this.skeletonLoader = true;
this.pendentesList = new Array();
let pendentes = await this.processes.GetPendingTasks(false).toPromise();
@@ -88,7 +88,7 @@ export class PendentesPage implements OnInit {
this.pendentesList = removeDuplicate( this.pendentesList)
this.pendentesList = this.sortArrayISODate(this.pendentesList);
});
- this.showLoader = false;
+ this.skeletonLoader = false;
}
sortArrayISODate(myArray: any){