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

add lebels

Browse Source
This commit is contained in:
Peter Maquiran
2023-04-20 15:34:00 +01:00
parent 74a2fe8058
commit 0c27c2f213
6 changed files with 22 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+1 -9
View File
@@ -83,16 +83,8 @@ export class DiplomasAssinarPage implements OnInit {
try {
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.TaskService.loadDiplomas()
let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma");
let format = diplomasAssinar.map(element => {
return this.customTaskPipe.transform(element)
});
this.deplomasStore.resetDiplomasParaAssinar(format)
this.diplomasList = this.sortService.sortDate(format, 'CreateDate')
} catch(error) {
}
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
+2
View File
@@ -82,6 +82,8 @@ export class DiplomasGerarPage implements OnInit {
this.skeletonLoader = true
try {
await this.TaskService.loadDiplomas();
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.diplomasList = [];
src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+1 -37
View File
@@ -109,43 +109,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
try {
this.skeletonLoader = true
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.skeletonLoader = false
this.showLoader = false;
let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
let diplomasList = [];
diplomasValidar.forEach(async element => {
let task = this.pipeTask(element)
diplomasList.push(task);
});
this.deplomasStore.resetDiplomasReview(diplomasValidar)
this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate');
let diplomasAssinados = diplomas.filter(data => data.activityInstanceName == "Diploma Assinado");
let diplomasAssinadoList = diplomasAssinados.map( element => {
return this.pipeTask(element);
});
this.diplomasAssinadoList = this.sortService.sortDate(diplomasAssinadoList, 'CreateDate')
this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados);
let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma");
this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar.map(element => {
return this.customTaskPipe.transform(element)
}))
// console.log('DIPLOMAS ASSINADOS', this.diplomasAssinadoList)
await this.TaskService.loadDiplomas()
} catch(error) {
this.skeletonLoader = false
}
src/app/pages/gabinete-digital/gabinete-digital.page.html
+10 -10
View File
@@ -350,8 +350,8 @@
<ion-icon src="assets/images/icons-agenda.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Eventos para Aprovação <br>
<span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length >=2">{{ TaskService.eventoaprovacaostore.newList.length}} Eventos para aprovação</span>
<span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length ==1">{{ TaskService.eventoaprovacaostore.newList.length}} Evento para aprovação</span></p>
<span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length >=2">{{ TaskService.eventoaprovacaostore.newList.length}} Eventos para aprovação novos</span>
<span class="new-task-count" *ngIf="TaskService.eventoaprovacaostore.newList.length ==1">{{ TaskService.eventoaprovacaostore.newList.length}} Evento para aprovação novo</span></p>
<p class="text-center exp-card-content"> {{TaskService.eventoaprovacaostore.countAll}} <span class="title1">Documentos</span></p>
</div>
@@ -404,13 +404,13 @@
</div>
<p *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">
Pedidos de Parecer<br>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length >=2" >{{ TaskService.pedidosstore.listParecerCount.length}} Pedidos de Parecer</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length ==1" >{{ TaskService.pedidosstore.listParecerCount.length}} Pedido de Parecer</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length >=2" >{{ TaskService.pedidosstore.listParecerCount.length}} Pedidos de Parecer novos</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length ==1" >{{ TaskService.pedidosstore.listParecerCount.length}} Pedido de Parecer novo</span>
</p>
<p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">
Pedidos de Parecer solicitados por mim <br>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length >=2">{{ TaskService.pedidosstore.listParecerCount.length}} Pedido de Parecer solicitados por mim</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length ==1">{{ TaskService.pedidosstore.listParecerCount.length}} Pedidos de Parecer solicitados por mim</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length >=2">{{ TaskService.pedidosstore.listParecerCount.length}} Pedido de Parecer solicitados por mim novos</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listParecerCount.length ==1">{{ TaskService.pedidosstore.listParecerCount.length}} Pedidos de Parecer solicitados por mim novo</span>
</p>
<p class="text-center exp-card-content"> {{TaskService.pedidosstore.countparecer}} <span class="title1">Documentos</span></p>
</div>
@@ -427,8 +427,8 @@
</div>
<p class="text-center exp-card-title ">
Pedidos de Deferimento<br>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listDeferimentoCount.length >=2">{{ TaskService.pedidosstore.listDeferimentoCount.length}} Pedidos de Deferimento</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listDeferimentoCount.length ==1">{{ TaskService.pedidosstore.listDeferimentoCount.length}} Pedidos de Deferimento</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listDeferimentoCount.length >=2">{{ TaskService.pedidosstore.listDeferimentoCount.length}} Pedidos de Deferimento novos</span>
<span class="new-task-count" *ngIf="TaskService.pedidosstore.listDeferimentoCount.length ==1">{{ TaskService.pedidosstore.listDeferimentoCount.length}} Pedido de Deferimento novo</span>
</p>
<p class="text-center exp-card-content"> {{TaskService.pedidosstore.countdeferimento}} <span class="title1">Documentos</span></p>
</div>
@@ -449,8 +449,8 @@
</p>
<p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">Meus Pendentes<br>
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=2">{{ TaskService.pendentesstore.newList.length}} Meus Pendente</span>
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length ==1">{{ TaskService.pendentesstore.newList.length}} Meu Pendent</span>
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=2">{{ TaskService.pendentesstore.newList.length}} Meus Pendente novos</span>
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length ==1">{{ TaskService.pendentesstore.newList.length}} Meu Pendent novo</span>
</p>
<p class="text-center exp-card-content"> <span class="number">{{TaskService.pendentesstore.count}} </span> <span class="title1">Documentos</span></p>
src/app/services/task.service.ts
+2 -1
View File
@@ -299,7 +299,7 @@ export class TaskService {
diplomasList.push(task);
});
this.sortService.sortDate(diplomasList, 'CreateDate')
diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate')
this.deplomasStore.resetDiplomaGerar(diplomasList);
@@ -320,6 +320,7 @@ export class TaskService {
let diplomasAssinar: any = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma");
diplomasAssinar = diplomasAssinar.map((element) => this.expedienteTaskPipe.transform(element))
this.sortService.sortDate(diplomasAssinar, 'CreateDate')
this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
let diplomasAssinados: any = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado");
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "47dd1b2bc",
"SHA": "47dd1b2bc84906c09e286e745cfc1fef3441133e",
"shortSHA": "74a2fe805",
"SHA": "74a2fe80582edea712fa31d9d859bf3bb20d788b",
"branch": "feature/gabineteLabels",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Apr 20 11:45:46 2023 +0100'",
"lastCommitMessage": "add seach button",
"lastCommitNumber": "4924",
"lastCommitTime": "'Thu Apr 20 13:36:59 2023 +0100'",
"lastCommitMessage": "fix update",
"lastCommitNumber": "4925",
"change": "",
"changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: version/git-version.ts",
"changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/services/task.service.ts",
"changeAuthor": "peter.maquiran"
}