diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index 9ee5a0dfb..088b16cc0 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -18,6 +18,7 @@ import { SqliteService } from 'src/app/services/sqlite.service'; import { BackgroundService } from 'src/app/services/background.service'; import { SortService } from 'src/app/services/functions/sort.service'; import { ThemeService } from 'src/app/services/theme.service' +import { SessionStore } from 'src/app/store/session.service'; @Component({ selector: 'app-despachos-pr', @@ -124,7 +125,18 @@ export class DespachosPrPage implements OnInit { let despachos = this.sortService.sortArrayByDate(result); if(this.loggeduser.Profile != "PR") { - despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); + + + + if(SessionStore.user.Profile != 'Consultant') { + despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); + } else { + // console.log('====!!!!====', allProcessesList.filter(element => element.activityInstanceName == 'Gerar Diploma')) + despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho" || + data.activityInstanceName == "Gerar Diploma"); + } + + } else if (this.loggeduser.Profile == "PR") { despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Concluir Despacho"); } diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index e1f972cac..0125f2ec5 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -78,8 +78,9 @@ export class DiplomasAssinarPage implements OnInit { let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); this.diplomasList = []; - let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma"); - diplomasAssinar.forEach(element => { + // let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma"); + + diplomas.forEach(element => { let task: customTask = this.customTaskPipe.transform(element) this.diplomasList.push(task); }); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 3c977a90f..dbba689b4 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -33,6 +33,9 @@ import { SortService } from 'src/app/services/functions/sort.service'; import { DataService } from 'src/app/services/data.service'; import { Storage } from '@ionic/storage'; import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; +import { SessionStore } from 'src/app/store/session.service'; + + @Component({ selector: 'app-gabinete-digital', @@ -144,7 +147,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { private sortService: SortService, private dataService: DataService, private storage: Storage, - public p: PermissionService, + public p: PermissionService ) { this.loggeduser = authService.ValidatedUser; @@ -553,8 +556,14 @@ export class GabineteDigitalPage implements OnInit, DoCheck { allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento') allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma') - allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') - allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') + + if(SessionStore.user.Profile != 'Consultant') { + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') + } else { + console.log('====!!!!====', allProcessesList.filter(element => element.activityInstanceName == 'Gerar Diploma')) + } + + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo') allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Concluir Despacho por Delegação') allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Tarefa de Despacho por Delegação') @@ -577,13 +586,11 @@ export class GabineteDigitalPage implements OnInit, DoCheck { allProcessesList.forEach(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(); let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, "Senders": element.workflowInstanceDataFields.Sender, - //"CreateDate": taskDate, "CreateDate": new Date(element.taskStartDate), "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, @@ -649,7 +656,18 @@ export class GabineteDigitalPage implements OnInit, DoCheck { let despachosPr; if(this.loggeduser.Profile != 'PR') { - despachosPr = despachospr.filter(data => data.activityInstanceName == "Tarefa de Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active"); + + if(SessionStore.user.Profile != 'Consultant') { + despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); + } else { + // console.log('====!!!!====', allProcessesList.filter(element => element.activityInstanceName == 'Gerar Diploma')) + despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho" || + data.activityInstanceName == "Gerar Diploma"); + } + + despachosPr = despachospr.filter(data => data.workflowInstanceDataFields.Status == "Active"); + + this.count_de_pr = Object.keys(despachosPr).length; this.despachoprstore.count = this.count_de_pr; this.despachoprstore.reset(despachosPr) diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index 4ac263492..b998b1f2b 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -14,6 +14,7 @@ import { TotalDocumentStore } from 'src/app/store/total-document.service'; import { DespachosprStore } from 'src/app/store/despachospr-store.service'; import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service'; import { PedidosStore } from 'src/app/store/pedidos-store.service'; +import { SessionStore } from 'src/app/store/session.service'; @Component({ @@ -83,8 +84,13 @@ export class AllProcessesPage implements OnInit { allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento') allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma') - allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') - allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') + + if(SessionStore.user.Profile != 'Consultant') { + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') + } else { + console.log('!!//!!',allProcessesList.filter(element => element.activityInstanceName == 'Gerar Diploma')) + } + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo') allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Concluir Despacho por Delegação') allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Tarefa de Despacho por Delegação') @@ -159,8 +165,6 @@ export class AllProcessesPage implements OnInit { const minutes = totalMinutes - (totalDays * 24 * 60) - (hours * 60); const seconds = totalSeconds - (totalDays * 24 * 60 * 60) - (hours * 60 * 60) - (minutes * 60); - let diffDays = totalDays; - let diffMinutes = minutes; if (totalDays == 0) { if (allday) { diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index cc1650dbb..301a6d3d6 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -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"); - diplomasAssinar.forEach(element => { + diplomas.forEach(element => { let task: customTask = this.customTaskPipe.transform(element) this.diplomasList.push(task); }); diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index 7891cd9f2..3c9164d20 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -69,8 +69,9 @@ constructor( this.diplomasList = []; let diplomasList = []; - let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma"); - diplomasValidar.forEach(element => { + // let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma"); + + diplomas.forEach(element => { let task = this.pipeTask(element) diplomasList.push(task);