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

Improve

Browse Source
This commit is contained in:
Peter Maquiran
2021-08-17 11:15:49 +01:00
parent 926d4f4a38
commit d323428de4
9 changed files with 163 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+8 -8
View File
@@ -58,17 +58,17 @@
</ion-list>
</div>
<div *ngIf="diplomasList.length >= 1">
<div *ngIf="diplomasAssinadoList.length >= 1">
<ion-list *ngSwitchCase="'assinados'">
<div
class="expediente ion-no-padding ion-no-margin cursor-pointer"
*ngFor = "let task of diplomasList"
*ngFor = "let task of diplomasAssinadoList"
(click)="goToDiploma(task.SerialNumber)"
>
>
<div class="item width-100">
<div class="exp-top-detail">
<div class="subject">
<ion-label>{{ task.Folio }}</ion-label>
<ion-label>1123{{ task.Folio }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
@@ -93,15 +93,15 @@
</ion-list>
</div>
<div
*ngIf="!skeletonLoader && diplomasList.length == 0"
<div
*ngIf="!skeletonLoader && diplomasList.length == 0 && diplomasAssinadoList.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
<div *ngIf="skeletonLoader && diplomasList.length == 0">
<div *ngIf="skeletonLoader && diplomasAssinadoList.length == 0 && skeletonLoader && diplomasList.length == 0">
<ion-list>
<ion-item>
<ion-thumbnail slot="end">
src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+44 -63
View File
@@ -14,6 +14,7 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
export class DiplomasPage implements OnInit {
//profile:string;
diplomasList:DailyWorkTask[] = [];
diplomasAssinadoList:DailyWorkTask[] = [];
showLoader: boolean;
totalDocs:any;
serialNumber:string;
@@ -64,84 +65,64 @@ constructor(
}
async LoadList() {
this.diplomasList = [];
console.log(this.diplomasList);
console.log(this.segment);
this.skeletonLoader = true
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
switch (this.segment) {
case 'validar':
let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
console.log(diplomasValidar);
this.diplomasList = [];
let diplomasList = [];
diplomasValidar.forEach(element => {
let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
diplomasValidar.forEach(element => {
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": element.totalDocuments,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
"Status": element.workflowInstanceDataFields.Status,
}
this.diplomasList.push(task);
this.diplomasList = removeDuplicate(this.diplomasList);
this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse();
let task = this.pipeTask(element)
diplomasList.push(task);
});
});
this.showLoader = false;
break;
case 'assinados':
this.diplomasList = new Array();
let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
diplomasAssinados.forEach(async element => {
this.diplomasList = this.sortArrayISODate(diplomasList).reverse();
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
this.showLoader = false;
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": element.totalDocuments,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
"Status": element.workflowInstanceDataFields.Status,
}
this.diplomasList.push(task);
this.diplomasList = removeDuplicate(this.diplomasList);
this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse();
let diplomasAssinadoList = []
});
this.showLoader = false;
break;
default:
console.log('No segment provided!');
break;
}
let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
diplomasAssinados.forEach(async element => {
let task = this.pipeTask(element)
diplomasAssinadoList.push(task);
});
this.diplomasAssinadoList = this.sortArrayISODate(diplomasAssinadoList).reverse();
console.log('diplomasAssinados', diplomasAssinados)
this.showLoader = false;
this.skeletonLoader = false
}
pipeTask(element) {
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
return {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": element.totalDocuments,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
"Status": element.workflowInstanceDataFields.Status,
}
}
sortArrayISODate(myArray: any) {
return myArray.sort(function(a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);