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

Browse Source
This commit is contained in:
Peter Maquiran
2023-04-25 10:04:32 +01:00
parent fd0941999d
commit 544b35443d
11 changed files with 296 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html
+3 -3
View File
@@ -60,15 +60,15 @@
</div>
<div
*ngIf="!skeletonLoader && taskslist.length == 0 && taskslist.length == 0"
*ngIf="!skeletonLoader && expedientegbstore.list.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
<div *ngIf="skeletonLoader && !taskslist">
<div *ngIf="skeletonLoader && expedientegbstore.list.length == 0">
<ion-list *ngIf="skeletonLoader && taskslist.length == null">
<ion-list >
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts
+21 -18
View File
@@ -17,7 +17,6 @@ import { TaskService } from 'src/app/services/task.service'
export class ExpedientsPage implements OnInit {
segment: string;
taskslist = [];
serialNumber: string;
@Input() profile: string;
@@ -65,37 +64,41 @@ export class ExpedientsPage implements OnInit {
this.skeletonLoader = true
this.processes.GetTaskListExpediente(false).subscribe(result => {
this.taskslist = [];
this.skeletonLoader = false
let taskslist = [];
let res = result.filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
let task = this.expedienteTaskPipe.transform(element)
this.taskslist.push(task);
taskslist.push(task);
});
this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate')
this.addProcessTODb(this.taskslist);
this.taskslist = this.taskslist.filter(function(item) {
taskslist = this.sortService.sortDate(taskslist, 'CreateDate')
// this.addProcessTODb(taskslist);
taskslist = taskslist.filter(function(item) {
return item.activityInstanceName != 'Retificar Expediente'
})
this.expedientegbstore.reset(this.taskslist);
this.expedientegbstore.reset(taskslist);
}, (error) => {
this.getEventsFromLocalDb();
this.skeletonLoader = false
//this.getEventsFromLocalDb();
console.log('stop')
}, () =>{
this.skeletonLoader = false
});
}
addProcessTODb(task) {
this.storage.set('gabinete-expediente', task).then(() => {
// addProcessTODb(task) {
// this.storage.set('gabinete-expediente', task).then(() => {
})
}
// })
// }
getEventsFromLocalDb() {
this.storage.get('gabinete-expediente').then((expediente) => {
this.taskslist = expediente
})
}
// getEventsFromLocalDb() {
// this.storage.get('gabinete-expediente').then((expediente) => {
// taskslist = expediente
// })
// }
doRefresh(event) {
if (event) {
src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+72 -22
View File
@@ -139,29 +139,79 @@
<span>Lista vazia</span>
</div>
<div *ngIf="skeletonLoader && deplomasStore.diplomasAssinadoList.length == 0 && skeletonLoader && deplomasStore.diplomasReviewList.length == 0">
<ion-list>
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
<p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
<p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
<div *ngSwitchCase="'validar'" class="centered-div" >
<div
*ngIf=" deplomasStore.diplomasReviewList.length == 0 && !skeletonLoader"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
</div>
<div *ngSwitchCase="'assinados'" class="centered-div">
<div
*ngIf="deplomasStore.diplomasAssinadoList.length == 0 && !skeletonLoader"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
</div>
<div *ngSwitchCase="'validar'" >
<ion-list *ngIf="skeletonLoader && deplomasStore.diplomasReviewList.length == 0">
<ion-list>
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
<p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
<p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
</ion-list>
</ion-list>
</div>
<div *ngSwitchCase="'assinados'" >
<ion-list *ngIf="skeletonLoader && deplomasStore.diplomasAssinadoList.length == 0">
<ion-list>
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
<p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
<p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
</ion-list>
</ion-list>
</div>
</div>
src/app/shared/gabinete-digital/diplomas/diplomas.page.scss
+10
View File
@@ -227,3 +227,13 @@ ion-item{
float: right;
margin-right: 10px;
}
.centered-div{
width: 100px;
height: 100px;
position: absolute;
top: 50%;
left: 50%;
margin: -35px 0 0 -35px;
}
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+3
View File
@@ -78,6 +78,9 @@ export class ExpedientesPrPage implements OnInit {
this.expedienteGdStore.reset(this.taskslist);
this.skeletonLoader = false;
}, (error) => {
this.skeletonLoader = false
// this.getEventsFromLocalDb();
});
}
src/app/shared/gabinete-digital/expedients/expedients.page.html
+3 -3
View File
@@ -91,14 +91,14 @@
</div>
<div
*ngIf="!skeletonLoader && taskslist.length == 0 && taskslist.length == 0"
*ngIf="!skeletonLoader && expedientegbstore.list.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
<div *ngIf="skeletonLoader && taskslist">
<ion-list *ngIf="taskslist.length == 0">
<div *ngIf="skeletonLoader && expedientegbstore.list.length == 0">
<ion-list *ngIf="expedientegbstore.list.length == 0">
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+19 -17
View File
@@ -17,7 +17,6 @@ import { TaskService } from 'src/app/services/task.service'
export class ExpedientsPage implements OnInit {
segment: string;
taskslist = [];
serialNumber: string;
@Input() profile: string;
@@ -73,37 +72,40 @@ export class ExpedientsPage implements OnInit {
this.skeletonLoader = true
this.processes.GetTaskListExpediente(false).subscribe(result => {
this.taskslist = [];
let taskslist = [];
this.skeletonLoader = false
let res = result.filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active");
this.taskslist = res.map((e) => this.expedienteTaskPipe.transform(e))
this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate')
this.addProcessTODb(this.taskslist);
taskslist = res.map((e) => this.expedienteTaskPipe.transform(e))
taskslist = this.sortService.sortDate(taskslist, 'CreateDate')
// this.addProcessTODb(taskslist);
this.taskslist = this.taskslist.filter(function(item) {
taskslist = taskslist.filter(function(item) {
return item.activityInstanceName != 'Retificar Expediente'
})
this.expedientegbstore.reset(this.taskslist);
this.expedientegbstore.reset(taskslist);
}, (error) => {
this.skeletonLoader = false
this.getEventsFromLocalDb();
// this.getEventsFromLocalDb();
}, () =>{
this.skeletonLoader = false
});
}
addProcessTODb(task) {
this.storage.set('gabinete-expediente', task).then(() => {
// addProcessTODb(task) {
// this.storage.set('gabinete-expediente', task).then(() => {
})
}
// })
// }
getEventsFromLocalDb() {
this.storage.get('gabinete-expediente').then((expediente) => {
this.taskslist = expediente
})
}
// getEventsFromLocalDb() {
// this.storage.get('gabinete-expediente').then((expediente) => {
// this.taskslist = expediente
// })
// }
doRefresh(event) {
if (event) {
src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+32 -5
View File
@@ -36,7 +36,7 @@
<!-- <button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button> -->
</div>s
</div>
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
@@ -145,7 +145,7 @@
<div *ngSwitchCase="'parecer'" class="centered-div" >
<div
*ngIf=" pedidosstore.listparecer.length == 0"
*ngIf=" pedidosstore.listparecer.length == 0 && !skeletonLoader"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
@@ -154,16 +154,16 @@
<div *ngSwitchCase="'deferimento'" class="centered-div">
<div
*ngIf="pedidosstore.listdeferimento.length == 0"
*ngIf="pedidosstore.listdeferimento.length == 0 && !skeletonLoader"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
</div>
<div *ngIf="skeletonLoader && pedidosstore.listparecer.length == 0 && skeletonLoader && pedidosstore.listdeferimento.length == 0 ">
<div *ngSwitchCase="'deferimento'" >
<ion-list>
<ion-list *ngIf="skeletonLoader && pedidosstore.listdeferimento.length == 0">
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
@@ -186,6 +186,33 @@
</ion-item>
</ion-list>
</div>
<div *ngSwitchCase="'parecer'" >
<ion-list *ngIf="skeletonLoader && pedidosstore.listparecer.length == 0">
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
<p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
<p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
</ion-list>
</div>
</div>
</ion-content>
src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+1
View File
@@ -76,6 +76,7 @@ export class PendentesPage implements OnInit {
})
}, (error) => {
this.skeletonLoader = false;
if(error.status == 0){
this.getFromDb();
}