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

Merged in feature/pendentes-count (pull request #2)

Browse Source 
Feature/pendentes count

Lists are being well presented and counted 

Approved-by: Gilson Manuel
This commit is contained in:
Peter Maquiran
2022-06-29 14:28:27 +00:00
committed by Gilson Manuel
parent e3df1e7de1 2fad8c305a
commit aaea243c7e
9 changed files with 1446 additions and 33652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbucket-pipelines.yml
+1
View File
@@ -18,6 +18,7 @@ pipelines:
- docker push $IMAGE_NAME
- step:
name: 'Deploy on server'
deployment: test
script:
- echo "Starting deploy..."
- export BITBUCKET_COMMIT_SHORT=$(echo $BITBUCKET_COMMIT| cut -c1-7)
package-lock.json
Generated
+1387 -33551
View File
File diff suppressed because it is too large Load Diff
package.json
+5 -5
View File
@@ -38,7 +38,7 @@
"@awesome-cordova-plugins/multiple-document-picker": "^5.40.0",
"@byteowls/capacitor-filesharer": "^3.0.0",
"@capacitor-community/camera-preview": "^1.2.1",
"@capacitor/android": "3.3.3",
"@capacitor/android": "3.6.0",
"@capacitor/app": "^1.0.5",
"@capacitor/browser": "1.0.6",
"@capacitor/camera": "^1.2.0",
@@ -129,7 +129,7 @@
"dotenv": "^10.0.0",
"duration": "^0.2.2",
"faker": "^5.5.3",
"firebase": "^9.3.0",
"firebase": "^9.8.4",
"g": "^2.0.1",
"global": "^4.4.0",
"hammerjs": "^2.0.8",
@@ -145,7 +145,7 @@
"jest-puppeteer": "^5.0.4",
"jetifier": "^1.6.8",
"lite-server": "^2.6.1",
"moment": "^2.29.1",
"moment": "^2.29.3",
"ng-lazyload-image": "^9.1.2",
"ng2-pdf-viewer": "^3.0.8",
"ngx-cookie-service": "^12.0.3",
@@ -160,7 +160,7 @@
"rocket.chat.realtime.api.rxjs": "^2.1.1",
"rxjs": "~6.6.3",
"rxjs-compat": "^6.6.7",
"sharp": "^0.29.1",
"sharp": "^0.30.7",
"socket.io-client": "^2.3.0",
"ts-jest": "^27.0.3",
"tslib": "^2.0.0",
@@ -204,7 +204,7 @@
"jasmine-spec-reporter": "~5.0.0",
"jest": "^27.0.6",
"jest-preset-angular": "^9.0.4",
"karma": "~6.3.4",
"karma": "^6.3.20",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0",
readme.md
+1 -1
View File
@@ -1,4 +1,4 @@
# Gabinete Digital
# Gabinete Digital, V0.1
## Requirements
src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
-74
View File
@@ -81,80 +81,6 @@ export class DiplomasPage implements OnInit, OnDestroy {
}
/* async loadDiplomas(){
this.activatedRoute.data.subscribe(data => {
switch (this.segment) {
case 'validar':
let diplomasValidar = data['diplomas'].filter(data => data.activityInstanceName == "Revisar Diploma");
diplomasValidar.forEach(async element => {
let DocId = element.workflowInstanceDataFields.FolderID;
let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
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();
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": res.DocumentsTotal,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.diplomasList.push(task);
this.diplomasList = removeDuplicate( this.diplomasList)
});
this.showLoader = false;
break;
case 'assinados':
//this.diplomasList = new Array();
let diplomasAssinados = data.diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
diplomasAssinados.forEach(async element => {
let DocId = element.workflowInstanceDataFields.FolderID;
let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
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();
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": this.totalDocs,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.diplomasList.push(task);
this.diplomasList = removeDuplicate( this.diplomasList)
});
this.showLoader = false;
break;
}
});
} */
async getTotalDocs(DocId: any) {
let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+27 -1
View File
@@ -545,6 +545,7 @@ export class GabineteDigitalPage implements OnInit {
async LoadCounts() {
let expedientes;
this.showLoader = true
try {
expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise();
@@ -618,6 +619,8 @@ export class GabineteDigitalPage implements OnInit {
this.count_total_pending = Object.keys(pendentes).length;
this.pendentesstore.count = this.count_total_pending;
pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element))
this.pendentesstore.reset(pendentes);
let depachoAPI: any = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
@@ -657,7 +660,30 @@ export class GabineteDigitalPage implements OnInit {
let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma");
this.count_dip_pv = Object.keys(diplomasValidar).length;
this.deplomasStore.resetDiplomasReview(diplomasValidar)
diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != "Tarefa de Despacho");
this.deplomasStore.resetDiplomasReview(diplomasValidar.map((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,
}
}))
let diplomasAssinar = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma");
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+1 -1
View File
@@ -112,7 +112,7 @@ export class PendentesPage implements OnInit {
this.skeletonLoader = false;
}, (error) => {
if(error.status == 0){
if(error.status == 0) {
this.getFromDb();
}
})
src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+3
View File
@@ -77,7 +77,10 @@ export class DiplomasPage implements OnInit {
diplomasList.push(task);
});
diplomasList = diplomasList.filter(data => data.activityInstanceName != "Tarefa de Despacho");
this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate')
this.deplomasStore.resetDiplomasReview(this.diplomasList)
let diplomasAssinadoList = []
src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+21 -19
View File
@@ -55,29 +55,31 @@ export class PendentesPage implements OnInit {
async LoadList(){
this.skeletonLoader = true;
this.processes.GetPendingTasks(false).subscribe(async res => {
let pendentes = await this.processes.GetPendingTasks(false).toPromise();
let pendentesList = [];
this.processes.GetPendingTasks(false).subscribe(async (pendentes) => {
this.skeletonLoader = false;
pendentes.forEach(element => {
let task: customTask = this.customTaskPipe.transform(element);
pendentesList.push(task);
});
let pendentesList = [];
pendentesList = removeDuplicate( pendentesList)
pendentesList = this.sortService.sortDate(pendentesList, 'CreateDate')
pendentes.forEach(element => {
let task: customTask = this.customTaskPipe.transform(element);
pendentesList.push(task);
});
this.listToPresent = pendentesList
this.pendentesstore.reset(pendentesList);
this.storage.set('pendente-list',pendentesList).then(() => {
pendentesList = removeDuplicate( pendentesList)
pendentesList = this.sortService.sortDate(pendentesList, 'CreateDate')
this.listToPresent = pendentesList
this.pendentesstore.reset(pendentesList);
this.storage.set('pendente-list',pendentesList).then(() => {
})
}, (error) => {
if(error.status == 0){
this.getFromDb();
}
})
this.skeletonLoader = false;
}, (error) => {
if(error.status == 0){
this.getFromDb();
}
})
}
getFromDb() {