peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix skeleton loader

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-14 16:12:04 +01:00
parent 29d8894c7b
commit c0fea28eee
32 changed files with 146 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+1 -1
View File
@@ -57,7 +57,7 @@
</ion-item>
</ion-list>
</div>
<div *ngIf="despachoList?.length < 1" class="overflow-y-auto height-100">
<div *ngIf="skeletonLoader" class="overflow-y-auto height-100">
<ion-list>
<ion-item>
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+3 -3
View File
@@ -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;
}
src/app/shared/gabinete-digital/despachos/despachos.page.html
+1 -1
View File
@@ -53,7 +53,7 @@
</ion-item>
</ion-list>
</div>
<div *ngIf="despachoList.length < 1">
<div *ngIf="skeletonLoader">
<ion-list>
<ion-item>
src/app/shared/gabinete-digital/despachos/despachos.page.ts
+5 -1
View File
@@ -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){
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+1 -1
View File
@@ -55,7 +55,7 @@
</ion-list>
</div>
</div>
<div *ngIf="!diplomasList">
<div *ngIf="skeletonLoader">
<ion-list>
<ion-item>
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+4
View File
@@ -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");
src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+1 -1
View File
@@ -82,7 +82,7 @@
</ion-list>
</div>
</div>
<div *ngIf="!diplomasList">
<div *ngIf="skeletonLoader">
<ion-list>
<ion-item>
src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+7 -1
View File
@@ -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) {
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+1 -1
View File
@@ -37,7 +37,7 @@
</ion-item>
</ion-list>
</div>
<div *ngIf="!taskslist">
<div *ngIf="skeletonLoader">
<ion-list>
<ion-item>
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+4 -4
View File
@@ -22,7 +22,7 @@ export class ExpedientesPrPage implements OnInit {
taskslist:DailyWorkTask[];
serialNumber:string;
showLoader:boolean;
skeletonLoader:boolean;
loggeduser: User;
@Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
@@ -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;
src/app/shared/gabinete-digital/expedients/expedients.page.html
+1 -1
View File
@@ -45,7 +45,7 @@
</ion-item>
</ion-list>
</div>
<div *ngIf="!taskslist">
<div *ngIf="skeletonLoader">
<ion-list>
<ion-item>
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+7 -1
View File
@@ -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);
src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+1 -1
View File
@@ -98,7 +98,7 @@
</ion-list>
</div>
</div>
<div *ngIf="!parecerList && !deferimentoList">
<div *ngIf="skeletonLoader">
<ion-list>
<ion-item>
src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+7
View File
@@ -37,6 +37,7 @@ export class PedidosPage implements OnInit {
@Input() profile:string;
@Input() segment:string;
@Output() openPedido:EventEmitter<any> = new EventEmitter<any>();
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();
src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+1 -1
View File
@@ -49,7 +49,7 @@
</ion-item>
</ion-list>
</div>
<div *ngIf="pendentesList.length < 1">
<div *ngIf="skeletonLoader">
<ion-list>
<ion-item>
src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+3 -3
View File
@@ -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){