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

Fix loader

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-17 10:49:52 +01:00
parent 6719dbdce4
commit 6ef4dd6ab4
5 changed files with 48 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+29 -29
View File
@@ -32,36 +32,36 @@
<div > <div >
<ion-list> <ion-list>
<ion-item <ion-item
class="expediente ion-no-padding cursor-pointer" class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of despachoList; let i = index" *ngFor = "let task of despachoList; let i = index"
(click)="goToDespachoPr(task.SerialNumber)" (click)="goToDespachoPr(task.SerialNumber)"
> >
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" --> <!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100"> <div class="item width-100">
<div class="exp-top-detail"> <div class="exp-top-detail">
<div class="exp-date"> <div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label> <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
</div>
<div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
</div>
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-icon d-flex align-center">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label>{{task.DocumentsQty}}</label>
<!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
</ion-menu-button> -->
</div>
</div>
<div class="exp-bottom-detail">
<ion-label>{{ task.Folio }}</ion-label>
</div>
</div> </div>
</ion-item> <div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
</div>
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-icon d-flex align-center">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label>{{task.DocumentsQty}}</label>
<!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
</ion-menu-button> -->
</div>
</div>
<div class="exp-bottom-detail">
<ion-label>{{ task.Folio }}</ion-label>
</div>
</div>
</ion-item>
</ion-list> </ion-list>
</div> </div>
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+7 -4
View File
@@ -66,9 +66,11 @@ export class DespachosPrPage implements OnInit {
//Inicializar segment //Inicializar segment
this.segment = "despachos"; this.segment = "despachos";
const location = window.location
const pathname = location.pathname + location.search
this.router.events.forEach((event) => { this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
event.url.startsWith('/home/gabinete-digital?despachospr=true')) {
this.LoadList(); this.LoadList();
} }
}); });
@@ -104,7 +106,8 @@ export class DespachosPrPage implements OnInit {
this.skeletonLoader = true this.skeletonLoader = true
let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.despachoList = new Array(); this.despachoList = [];
this.skeletonLoader = false
let despachosPr; let despachosPr;
switch (this.loggeduser.Profile) { switch (this.loggeduser.Profile) {
@@ -116,7 +119,7 @@ export class DespachosPrPage implements OnInit {
break; break;
} }
this.skeletonLoader = false
despachosPr = despachosPr.filter(data => data.workflowInstanceDataFields.Status == "Active"); despachosPr = despachosPr.filter(data => data.workflowInstanceDataFields.Status == "Active");
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+4 -1
View File
@@ -70,7 +70,7 @@ export class DiplomasAssinarPage implements OnInit {
this.skeletonLoader = true this.skeletonLoader = true
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.diplomasList = new Array(); this.diplomasList = [];
let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma"); let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
console.log(diplomasAssinar); console.log(diplomasAssinar);
@@ -112,6 +112,9 @@ export class DiplomasAssinarPage implements OnInit {
this.diplomasList.push(task); this.diplomasList.push(task);
}); });
}); });
this.skeletonLoader = false
this.showLoader = false; this.showLoader = false;
} }
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+7 -2
View File
@@ -44,7 +44,7 @@ export class ExpedientesPrPage implements OnInit {
const pathname = location.pathname + location.search const pathname = location.pathname + location.search
this.router.events.forEach((event) => { this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url.startsWith('/home/gabinete-digital?expedientes-pr=true')) { if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
this.LoadList(); this.LoadList();
} }
}); });
@@ -58,6 +58,8 @@ export class ExpedientesPrPage implements OnInit {
case 'MDGPR': case 'MDGPR':
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => { this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
console.log(result); console.log(result);
this.skeletonLoader = false
this.showLoader =false
this.taskslist = new Array(); this.taskslist = new Array();
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => { res.forEach(element => {
@@ -83,10 +85,13 @@ export class ExpedientesPrPage implements OnInit {
}); });
break; break;
case 'PR': case 'PR':
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => { this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
console.log(result); console.log(result);
this.taskslist = new Array(); this.taskslist = new Array();
this.skeletonLoader = false
this.showLoader =false
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => { res.forEach(element => {
let date = new Date(element.taskStartDate); let date = new Date(element.taskStartDate);
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+1 -1
View File
@@ -26,7 +26,7 @@
<div class="main-container height-100 overflow-y-auto d-flex flex-column "> <div class="main-container height-100 overflow-y-auto d-flex flex-column ">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div class=" height-100"> <div *ngIf="despachoList.length >= 1" class=" height-100">
<ion-list> <ion-list>
<ion-item <ion-item