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

improve

Browse Source
This commit is contained in:
Peter Maquiran
2022-06-21 16:59:28 +01:00
parent 194e6f5cce
commit 270cec688d
11 changed files with 85 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+1 -1
View File
@@ -137,7 +137,7 @@ export class AllProcessesPage implements OnInit {
get AllProcess() {
return this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
.concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr)
.concat(this.deplomasStore.diplomasList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
.concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
}
get getAllProcessCount() {
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+2 -2
View File
@@ -1,7 +1,7 @@
<ion-header class="ion-no-border">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div class="title">
<div class="thetitle"><ion-label >Diplomas</ion-label></div>
<div class="thetitle"><ion-label >Diplomas para assinar</ion-label></div>
<div class="theicon">
<button title="Atualizar" class="btn-no-color" (click)="doRefresh()">
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
@@ -30,7 +30,7 @@
(click)="viewExpedientDetail(task.SerialNumber)" -->
<div
class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
*ngFor = "let task of deplomasStore.diplomasAssinadoList"
*ngFor = "let task of deplomasStore.diplomasParaAssinarList"
(click)="goToDiploma(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+3 -3
View File
@@ -65,9 +65,9 @@ export class DiplomasAssinarPage implements OnInit {
this.diplomasList = new Array();
this.skeletonLoader = false
// let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
diplomas.forEach(element => {
diplomasAssinar.forEach(element => {
let task: customTask = this.customTaskPipe.transform(element)
this.diplomasList.push(task);
});
@@ -75,7 +75,7 @@ export class DiplomasAssinarPage implements OnInit {
this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
this.deplomasStore.resetDiplomasList(this.diplomasList);
this.deplomasStore.resetDiplomasParaAssinar(this.diplomasList);
}
}
src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
+4 -2
View File
@@ -55,7 +55,9 @@ export class DiplomasGerarPage implements OnInit {
this.skeletonLoader = false;
diplomas.forEach(element => {
let gerarDiploma = diplomas.reverse().filter(data => data.activityInstanceName == "Gerar Diploma");
gerarDiploma.forEach(element => {
let task: customTask = this.customTaskPipe.transform(element);
this.diplomasList.push(task);
});
@@ -63,7 +65,7 @@ export class DiplomasGerarPage implements OnInit {
this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
this.deplomasStore.resetDiplomasList(this.diplomasList);
this.deplomasStore.resetDiplomaGerar(this.diplomasList);
}
src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+4 -4
View File
@@ -23,11 +23,11 @@
<div class="main-container width-100 overflow-y-auto height-100" [ngSwitch]="segment">
<div *ngIf="deplomasStore.diplomasList.length >= 1 && p.userPermission([p.permissionList.Gabinete.md_tasks])">
<div *ngIf="deplomasStore.diplomasReviewList.length >= 1 && p.userPermission([p.permissionList.Gabinete.md_tasks])">
<ion-list *ngSwitchCase="'validar'">
<div
class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
*ngFor = "let task of deplomasStore.diplomasList"
*ngFor = "let task of deplomasStore.diplomasReviewList"
(click)="goToDiploma(task.SerialNumber)"
>
<div class="item width-100">
@@ -97,13 +97,13 @@
</div>
<div
*ngIf="!skeletonLoader && deplomasStore.diplomasList.length == 0 && deplomasStore.diplomasAssinadoList.length == 0"
*ngIf="!skeletonLoader && deplomasStore.diplomasReviewList.length == 0 && deplomasStore.diplomasAssinadoList.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
<div *ngIf="skeletonLoader && deplomasStore.diplomasAssinadoList.length == 0 && skeletonLoader && deplomasStore.diplomasList.length == 0">
<div *ngIf="skeletonLoader && deplomasStore.diplomasAssinadoList.length == 0 && skeletonLoader && deplomasStore.diplomasReviewList.length == 0">
<ion-list>
<ion-item>
src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+4 -3
View File
@@ -69,8 +69,8 @@ constructor(
this.diplomasList = [];
let diplomasList = [];
// let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
// let diplomasReview = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
diplomas.forEach(element => {
let task = this.pipeTask(element)
@@ -78,10 +78,11 @@ constructor(
});
this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate')
this.deplomasStore.resetDiplomasList(this.diplomasList)
this.deplomasStore.resetDiplomasReview(this.diplomasList)
let diplomasAssinadoList = []
let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
diplomasAssinados.forEach(async element => {
let task = this.pipeTask(element)