This commit is contained in:
Peter Maquiran
2023-02-07 16:10:11 +01:00
parent b6c9a31477
commit 976f9cbf2c
12 changed files with 83 additions and 44 deletions
@@ -2,11 +2,11 @@
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div class="title">
<div class="thetitle"><ion-label >Diplomas para assinar</ion-label></div>
<!-- <div class="theicon">
<div class="theicon">
<button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div> -->
</div>
</div>
</ion-header>
<ion-content>
@@ -38,7 +38,7 @@
<div class="item width-100">
<div class="exp-top-detail">
<div class="subject">
<ion-label>{{ task.Folio }}</ion-label>
<ion-label>{{ task.Folio || task.workflowInstanceDataFields.Subject }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
@@ -71,9 +71,8 @@ export class DiplomasAssinarPage implements OnInit {
let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
diplomasAssinar.forEach(element => {
let task: customTask = this.customTaskPipe.transform(element)
this.diplomasList.push(task);
this.diplomasList = diplomasAssinar.map(element => {
return this.customTaskPipe.transform(element)
});
this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
@@ -66,29 +66,23 @@ export class DiplomasPage implements OnInit {
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.diplomasList = [];
let diplomasList = [];
// let diplomasReview = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
diplomas.forEach(element => {
let task = this.pipeTask(element)
diplomasList.push(task);
let diplomasList = diplomas.map(element => {
return this.pipeTask(element)
});
diplomasList = diplomasList.filter(data => data.activityInstanceName != "Tarefa de Despacho");
diplomasList = diplomasList.filter(data => data.activityInstanceName == "Revisar Diploma");
this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate')
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)
diplomasAssinadoList.push(task);
let diplomasAssinadoList = diplomasAssinados.map(element => {
return this.pipeTask(element)
});
this.diplomasAssinadoList = this.sortService.sortDate(diplomasAssinadoList, 'CreateDate')