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

Fix scrollbar and skeleton loeader

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-16 15:01:32 +01:00
parent f2f08f6964
commit 144444e1b2
17 changed files with 79 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+2 -2
View File
@@ -28,7 +28,7 @@
</ion-refresher>
<div class="main-content width-100">
<div *ngIf="despachoList">
<div >
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
@@ -65,7 +65,7 @@
</div>
</div>
<div *ngIf="skeletonLoader">
<div *ngIf="skeletonLoader && despachoList.length == 0">
<ion-list>
<ion-item>
src/app/pages/gabinete-digital/despachos/despachos.page.html
+2 -2
View File
@@ -28,7 +28,7 @@
</ion-refresher>
<div class="width-100">
<div *ngIf="despachoList">
<div >
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
@@ -66,7 +66,7 @@
</div>
</div>
<div *ngIf="skeletonLoader">
<div *ngIf="skeletonLoader && despachoList.length == 0">
<ion-list>
<ion-item>
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+27 -27
View File
@@ -34,37 +34,37 @@
<!-- *ngFor = "let task of parecerList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" -->
<ion-item
class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of diplomasList"
(click)="goToDiploma(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100">
<div class="exp-top-detail">
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
</div>
<div class="exp-remetente">
<ion-label>{{task.Remetente}}</ion-label>
</div>
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label></label>
</div>
</div>
<div class="exp-bottom-detail">
<ion-label>{{ task.Folio }}</ion-label>
</div>
class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of diplomasList"
(click)="goToDiploma(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100">
<div class="exp-top-detail">
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
</div>
</ion-item>
<div class="exp-remetente">
<ion-label>{{task.Remetente}}</ion-label>
</div>
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label></label>
</div>
</div>
<div class="exp-bottom-detail">
<ion-label>{{ task.Folio }}</ion-label>
</div>
</div>
</ion-item>
</ion-list>
</div>
</div>
<div *ngIf="skeletonLoader">
<div *ngIf="skeletonLoader && diplomasList.length == 0">
<ion-list>
<ion-item>
src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+2 -2
View File
@@ -59,7 +59,7 @@
<ion-label>{{ task.Folio }}</ion-label>
</div>
</div>
</ion-item>
</ion-item>
</ion-list>
</div>
@@ -94,7 +94,7 @@
</ion-list>
</div>
</div>
<div *ngIf="skeletonLoader">
<div *ngIf="skeletonLoader && diplomasAssinadoList.length == 0 && skeletonLoader && diplomasList.length == 0">
<ion-list>
<ion-item>
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+1 -1
View File
@@ -41,7 +41,7 @@ export class ExpedientePage implements OnInit {
}
LoadList(){
LoadList() {
this.skeletonLoader = true
this.processes.GetTasksList("Expediente", false).subscribe(result => {
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+1 -1
View File
@@ -52,7 +52,7 @@
</ion-item>
</ion-list>
</div>
<div *ngIf="skeletonLoader">
<div *ngIf="skeletonLoader && taskslist.length == 0">
<ion-list>
<ion-item>
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+1 -3
View File
@@ -4,8 +4,6 @@ import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common';
import { LoadingService } from 'src/app/services/loading.service';
import { ModalController, NavParams } from '@ionic/angular';
import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
import { AlertService } from 'src/app/services/alert.service';
@@ -21,7 +19,7 @@ export class ExpedientesPrPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
taskslist:DailyWorkTask[] = [];
serialNumber:string;
showLoader:boolean;
src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+1 -1
View File
@@ -106,7 +106,7 @@
</ion-list>
</div>
</div>
<div *ngIf="skeletonLoader">
<div *ngIf="skeletonLoader && deferimentoList.length == 0 && skeletonLoader && parecerList.length == 0">
<ion-list>
<ion-item>
src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+4 -12
View File
@@ -1,34 +1,27 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common';
import { LoadingService } from 'src/app/services/loading.service';
import { ModalController, NavParams } from '@ionic/angular';
import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
import { AlertService } from 'src/app/services/alert.service';
import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido.page';
@Component({
selector: 'app-pedidos',
templateUrl: './pedidos.page.html',
styleUrls: ['./pedidos.page.scss'],
})
export class PedidosPage implements OnInit {
//profile:string;
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
parecerList:any[];
parecerList:any[] = [];
fulltask:any;
parecerListResult:tasksList[] = [];
deferimentoListResult:tasksList[] = [];
deferimentoList:any[];
deferimentoList:any[] = [];
taskType: string;
serialNumber:string;
skeletonLoader = true
@@ -109,7 +102,7 @@ export class PedidosPage implements OnInit {
this.skeletonLoader = false
let allParecer = parecer.concat(parecerPr).reverse();
this.parecerList = new Array();
this.parecerList =[];
allParecer.forEach(element => {
@@ -141,7 +134,7 @@ export class PedidosPage implements OnInit {
console.log(result);
this.deferimentoList = new Array();
this.deferimentoList = [];
let res = result.reverse();
res.forEach(element => {
let date = new Date(element.taskStartDate);
@@ -181,5 +174,4 @@ export class PedidosPage implements OnInit {
}, 2000);
}
}
src/app/pages/gabinete-digital/pendentes/pendentes.page.html
+3 -4
View File
@@ -27,7 +27,7 @@
</ion-refresher-content>
</ion-refresher>
<div *ngIf="pendentesList.length >= 1" class="width-100">
<div class="width-100">
<div >
<ion-list>
<div
@@ -60,12 +60,11 @@
</div>
</div>
</div>
</div>
</div>
</ion-list>
</div>
</div>
<div *ngIf="skeletonLoader">
<div *ngIf="skeletonLoader && pendentesList.length == 0">
<ion-list>
<ion-item>
<ion-thumbnail slot="end">
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+1 -2
View File
@@ -16,7 +16,7 @@ import { AlertService } from 'src/app/services/alert.service';
export class PendentesPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
pendentesList:DailyWorkTask[];
pendentesList:DailyWorkTask[] = [];
taskType: string;
serialNumber:string;
totalDocs:any;
@@ -32,7 +32,6 @@ export class PendentesPage implements OnInit {
private router: Router,
private activatedRoute: ActivatedRoute,
){
this.pendentesList = new Array();
this.profile = 'mdgpr';
}
src/app/shared/gabinete-digital/despachos/despachos.page.html
+1 -1
View File
@@ -20,7 +20,7 @@
</ion-refresher>
<div class="overflow-y-auto height-100 width-100">
<div *ngIf="despachoList.length >= 1">
<div >
<ion-list part="divo">
<ion-item
class="expediente ion-no-padding cursor-pointer"
src/app/shared/gabinete-digital/despachos/despachos.page.ts
+1 -1
View File
@@ -85,7 +85,7 @@ export class DespachosPage implements OnInit {
this.LoadList();
}
goToDespacho(serialNumber:any){
goToDespacho(serialNumber:any) {
this.router.navigate(['/home/gabinete-digital/despachos',serialNumber,'gabinete-digital']);
}
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+21 -21
View File
@@ -13,28 +13,28 @@
<div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of taskslist"
(click)="goToExpediente(task.SerialNumber)"
>
<div class="item width-100">
<div class="exp-top-detail">
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
</div>
<div class="exp-remetente">
<ion-label>{{task.Remetente}}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label></label>
</div>
</div>
<div class="exp-bottom-detail">
<ion-label>{{ task.Folio }}</ion-label>
</div>
class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of taskslist"
(click)="goToExpediente(task.SerialNumber)"
>
<div class="item width-100">
<div class="exp-top-detail">
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
</div>
</ion-item>
<div class="exp-remetente">
<ion-label>{{task.Remetente}}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label></label>
</div>
</div>
<div class="exp-bottom-detail">
<ion-label>{{ task.Folio }}</ion-label>
</div>
</div>
</ion-item>
</ion-list>
</div>
<div *ngIf="skeletonLoader && taskslist.length == 0">
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+7 -6
View File
@@ -62,8 +62,10 @@ export class ExpedientesPrPage implements OnInit {
case 'MDGPR':
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
console.log(result);
this.taskslist = new Array();
this.taskslist = []
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
@@ -81,8 +83,8 @@ export class ExpedientesPrPage implements OnInit {
"Status": element.workflowInstanceDataFields.Status,
}
this.taskslist.push(task);
});
console.log(this.taskslist);
});
this.skeletonLoader = false;
});
@@ -90,7 +92,7 @@ export class ExpedientesPrPage implements OnInit {
case 'PR':
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
console.log(result);
this.taskslist = new Array();
this.taskslist = [];
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
let date = new Date(element.taskStartDate);
@@ -109,8 +111,7 @@ export class ExpedientesPrPage implements OnInit {
"Status": element.workflowInstanceDataFields.Status,
}
this.taskslist.push(task);
});
console.log(this.taskslist);
});
this.skeletonLoader = false;
});
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+2 -2
View File
@@ -21,7 +21,7 @@ export class ExpedientsPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
taskslist:DailyWorkTask[] = [];
serialNumber:string;
@Input() profile:string;
@@ -67,7 +67,7 @@ export class ExpedientsPage implements OnInit {
this.skeletonLoader = true
this.processes.GetTasksList("Expediente", false).subscribe(result => {
this.taskslist = new Array();
this.taskslist = [];
this.skeletonLoader = false
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+2 -2
View File
@@ -23,13 +23,13 @@ export class PedidosPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
parecerList:any[];
parecerList:any[] = [];
fulltask:any;
parecerListResult:tasksList[] = [];
deferimentoListResult:tasksList[] = [];
deferimentoList:any[];
deferimentoList:any[] = [];
taskType: string;
@Input() serialNumber:string;