diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 7ded154ef..5cf70adfe 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -26,6 +26,7 @@ import { ThemeService } from 'src/app/services/theme.service' import { RouteService } from 'src/app/services/route.service'; import { PermissionService } from 'src/app/services/permission.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; +import { TaskService } from 'src/app/services/task.service' @Component({ selector: 'app-despacho-pr', @@ -67,7 +68,8 @@ export class DespachoPrPage implements OnInit { public ThemeService: ThemeService, private RouteService: RouteService, public p: PermissionService, - private httpErroHandle: HttpErrorHandle + private httpErroHandle: HttpErrorHandle, + public TaskService: TaskService ) { this.activatedRoute.paramMap.subscribe(params => { if (params["params"].SerialNumber) { @@ -112,6 +114,8 @@ export class DespachoPrPage implements OnInit { async LoadTaskDetail(serial: string) { this.processes.GetTask(serial).subscribe((res: fullTask) => { + this.TaskService.loadDiplomas(); + this.task = { "SerialNumber": res.serialNumber, "Folio": res.workflowInstanceDataFields.Subject, diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index b601b5201..77f64b3cd 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -24,6 +24,7 @@ import { BackgroundService } from 'src/app/services/background.service'; import { ThemeService } from 'src/app/services/theme.service' import { RouteService } from 'src/app/services/route.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; +import { TaskService } from 'src/app/services/task.service' @Component({ @@ -67,7 +68,8 @@ export class DespachoPage implements OnInit { private platform: Platform, private backgroundservice: BackgroundService, public ThemeService: ThemeService, - private httpErrorHandle: HttpErrorHandle + private httpErrorHandle: HttpErrorHandle, + public TaskService: TaskService ) { @@ -110,6 +112,8 @@ export class DespachoPage implements OnInit { async LoadTaskDetail(serial: string) { this.processes.GetTask(serial).subscribe((res: fullTask) => { + this.TaskService.loadDespachos(); + this.task = { "SerialNumber": res.serialNumber, "Folio": res.workflowInstanceDataFields.Subject, diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index db34a0e11..fe8a92eb1 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -15,6 +15,7 @@ import { DespachoService } from 'src/app/Rules/despacho.service' import { AttachmentList } from 'src/app/models/Excludetask'; import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; +import { TaskService } from 'src/app/services/task.service' @Component({ selector: 'app-diploma-assinar', @@ -45,6 +46,7 @@ export class DiplomaAssinarPage implements OnInit { public ThemeService: ThemeService, private httpErroHandle: HttpErrorHandle, private despachoService: DespachoService, + public TaskService: TaskService ) { this.activatedRoute.paramMap.subscribe(params => { if(params["params"].SerialNumber) { @@ -85,7 +87,8 @@ export class DiplomaAssinarPage implements OnInit { async LoadTaskDetail(serial: string) { this.processes.GetTask(serial).subscribe(res => { - console.log("res", res) + this.TaskService.loadDiplomas(); + this.task = { "SerialNumber": res.serialNumber, "Folio": res.workflowInstanceDataFields.Subject, diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts index 10e9d408a..c2dfdaf1f 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts @@ -14,6 +14,8 @@ import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { DiplomasGerarOptionsPage } from 'src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service' +import { TaskService } from 'src/app/services/task.service' + @Component({ selector: 'app-diplomas-gerar', @@ -44,7 +46,8 @@ export class DiplomasGerarPage implements OnInit { private RouteService: RouteService, public ThemeService: ThemeService, private despachoService: DespachoService, - private httpErroHandle: HttpErrorHandle + private httpErroHandle: HttpErrorHandle, + public TaskService: TaskService ) { this.activatedRoute.paramMap.subscribe(params => { if(params["params"].SerialNumber) { @@ -83,6 +86,7 @@ export class DiplomasGerarPage implements OnInit { async LoadTaskDetail(serial: string) { this.processes.GetTask(serial).subscribe(res => { + this.TaskService.loadDiplomas() this.task = { "SerialNumber": res.serialNumber, "Folio": res.workflowInstanceDataFields.Subject, diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index 083d976d4..82c3eb35d 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -20,6 +20,7 @@ import { AttachmentList } from 'src/app/models/Excludetask'; import { DespachoService } from 'src/app/Rules/despacho.service' import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; +import { TaskService } from 'src/app/services/task.service' @Component({ @@ -57,7 +58,8 @@ export class DiplomaPage implements OnInit { private platform: Platform, public ThemeService: ThemeService, private httpErrorHandle: HttpErrorHandle, - private despachoService: DespachoService + private despachoService: DespachoService, + public TaskService: TaskService ) { this.activatedRoute.paramMap.subscribe(params => { // @@ -128,6 +130,8 @@ export class DiplomaPage implements OnInit { async LoadTaskDetail(serial: string) { this.processes.GetTask(serial).subscribe(res => { + this.TaskService.loadDiplomas(); + this.task = { "SerialNumber": res.serialNumber, "Folio": res.workflowInstanceDataFields.Subject, diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index ee0372671..e3241ae4f 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -19,7 +19,6 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe'; import { ExpedienteService } from 'src/app/Rules/expediente.service'; import { expedienteTask } from 'src/app/models/dailyworktask.model'; -import { TaskService } from 'src/app/Rules/task.service'; import { PermissionService } from 'src/app/services/permission.service'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; import { ThemeService } from 'src/app/services/theme.service' @@ -37,6 +36,8 @@ import { LoginUserRespose } from 'src/app/models/user.model'; import { AuthService } from 'src/app/services/auth.service'; import { SessionStore } from 'src/app/store/session.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; +import { TaskService } from 'src/app/services/task.service' + @Component({ selector: 'app-expediente-detail', @@ -81,7 +82,6 @@ export class ExpedienteDetailPage implements OnInit { private RouteService: RouteService, private attachmentsService: AttachmentsService, public p: PermissionService, - private taskService: TaskService, private expedienteService: ExpedienteService, public platform: Platform, private sqliteservice: SqliteService, @@ -91,7 +91,8 @@ export class ExpedienteDetailPage implements OnInit { private storage: Storage, private userAuth: AuthService, private httpErroHandle: HttpErrorHandle, - private eventTriger: EventTrigger + private eventTriger: EventTrigger, + public TaskService: TaskService ) { this.loggeduser = SessionStore.user console.log('SessionStore', SessionStore) @@ -357,6 +358,7 @@ export class ExpedienteDetailPage implements OnInit { this.processes.GetTask(serial).subscribe(res => { + this.TaskService.loadExpedientes(); this.task = { "SerialNumber": res.serialNumber, diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 5ce4122ba..c0142d01c 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -23,6 +23,7 @@ import { ThemeService } from 'src/app/services/theme.service' import { RouteService } from 'src/app/services/route.service'; import { SessionStore } from 'src/app/store/session.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; +import { TaskService } from 'src/app/services/task.service' @Component({ selector: 'app-expediente-pr', @@ -62,7 +63,8 @@ export class ExpedientePrPage implements OnInit { private attachmentsService: AttachmentsService, private RouteService: RouteService, public ThemeService: ThemeService, - private httpErroHandle: HttpErrorHandle + private httpErroHandle: HttpErrorHandle, + public TaskService: TaskService ) { this.loggeduser = SessionStore.user; @@ -156,6 +158,7 @@ export class ExpedientePrPage implements OnInit { date.setMonth(date.getMonth() + 1); let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); + this.TaskService.loadExpedientes(); this.task = { "SerialNumber": res.serialNumber, "Folio": res.workflowInstanceDataFields.Subject, diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 6be5c86aa..881347cac 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -106,12 +106,12 @@
- +
- +
@@ -222,7 +222,7 @@

Todas as tarefas

-

{{ TaskService.AllProcess.length }} Documentos

+

{{ AllProcess.length }} Documentos

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index e9cf7ea5d..965fa6fb3 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -99,7 +99,7 @@ export class GabineteDigitalPage implements OnInit { hideSearchBtn: boolean = false; showSearch = false; searchSubject: string = ''; - + AllProcess = [] constructor( private processesbackend: ProcessesService, @@ -139,6 +139,13 @@ export class GabineteDigitalPage implements OnInit { this.checkRoutes(); + this.TaskService.registerCallback({ + id: import.meta.url, + funx:() => { + this.dynamicSearch() + } + }) + } closeAllDesktopComponent() { this.desktopComponent = { @@ -148,10 +155,31 @@ export class GabineteDigitalPage implements OnInit { } - openSearch() {} - async closeSearch() {} - async basicSearch() {} - async dynamicSearch() {} + openSearch() { + this.dynamicSearch() + } + async closeSearch() { + this.searchSubject = '' + this.dynamicSearch() + } + + async basicSearch() { + this.dynamicSearch() + } + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.AllProcess = this.TaskService.AllProcess.filter((task) => { + let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject + subject = subject.toLowerCase(); + return subject.includes(this.searchSubject.toLowerCase()) + }) + } else { + this.AllProcess = this.TaskService.AllProcess + } + } ngOnInit() { diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index e5946db83..021c87fdf 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -30,6 +30,7 @@ import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page'; import { RouteService } from 'src/app/services/route.service'; import { SessionStore } from 'src/app/store/session.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; +import { TaskService } from 'src/app/services/task.service' @Component({ selector: 'app-pedido', @@ -69,7 +70,8 @@ export class PedidoPage implements OnInit { private platform: Platform, public ThemeService: ThemeService, private dataService: DataService, - private htppErroHandle: HttpErrorHandle ) { + private htppErroHandle: HttpErrorHandle, + public TaskService: TaskService ) { this.loggeduser = SessionStore.user; this.activatedRoute.paramMap.subscribe(params => { @@ -108,7 +110,8 @@ export class PedidoPage implements OnInit { this.fulltask = res - + this.TaskService.loadPedidos(); + if (res.workflowDisplayName == 'Pedido de Parecer' || res.workflowDisplayName == 'Pedido de Parecer do Presidente') { let date = new Date(res.taskStartDate); diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 1512e946a..7b1b52251 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -15,6 +15,7 @@ import { CustomTaskPipe } from '../pipes/custom-task.pipe'; import { SessionStore } from 'src/app/store/session.service'; import { EventsService } from './events.service'; import { SortService } from './functions/sort.service'; +import { customTask } from '../models/dailyworktask.model'; @Injectable({ providedIn: 'root' @@ -66,6 +67,11 @@ export class TaskService { this.updateCount() this.updateAllProcess() } + + + this.updateAllProcess() + this.updateCount() + } @@ -153,12 +159,10 @@ export class TaskService { async LoadTask() { - - let expedientes; this.showLoader = true try { - expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise() + await this.loadExpedientes() this.loadCount = true; this.showLoader = false; } catch(error) { @@ -167,7 +171,31 @@ export class TaskService { } this.loadNum++; + await this.loadDespachos(); + + + + await this.loadPedidos() + await this.loadPendestes() + + await this.loadDiplomas() + + await this.loadEventosParaAprovacao() + this.loadCount = true + } + + async loadDespachos() { + let despachos = await this.despachoRule.getList({ updateStore: true }) + if (despachos) { + this.despachoStore.reset(despachos) + } + } + + async loadExpedientes() { + let expedientes; + expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise() + expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active") expedientes = expedientes.filter((item) => { @@ -177,13 +205,9 @@ export class TaskService { expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element)); this.expedientegbstore.reset(expedientes); + } - - let despachos = await this.despachoRule.getList({ updateStore: true }) - if (despachos) { - this.despachoStore.reset(despachos) - } - + async loadPedidos() { let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise(); let pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise(); @@ -201,59 +225,20 @@ export class TaskService { return this.customTaskPipe.transform(element) })); + } + + async loadPendestes() { let pendentes = await this.processesbackend.GetPendingTasks(false).toPromise(); this.pendentesstore.count = Object.keys(pendentes).length; pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element)) this.pendentesstore.reset(pendentes); - - let depachoAPI = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise(); - - - if(SessionStore.user.Profile != 'PR') { - - let depacho: any = depachoAPI.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); - depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == "Active"); - - depacho = depacho.map((e)=> this.customTaskPipe.transform(e)) - - this.despachoprstore.reset(depacho) - - } else if(SessionStore.user.Profile == 'PR') { - - let depacho: any = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active") - depacho = depacho.map((e)=> this.customTaskPipe.transform(e)) - this.despachoprstore.reset(depacho) - - } - - this.runCallback(); - - let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma"); - - 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 this.customTaskPipe.transform(element) - })) - - - let diplomasAssinar: any = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma"); - diplomasAssinar = diplomasAssinar.map((element) => this.expedienteTaskPipe.transform(element)) - this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar) - - let diplomasAssinados: any = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado"); - diplomasAssinados = diplomasAssinados.map((element) => this.expedienteTaskPipe.transform(element)) - this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados) - + async loadEventosParaAprovacao() { for(let calendar of this.eventService.calendarNamesAry) { if(calendar == 'Meu calendario') { // color @@ -279,24 +264,66 @@ export class TaskService { this.eventoaprovacaostore.save(calendar.OwnerUserId, eventsList) } } - // let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise(); - // let eventsMDGPRList = mdEventsOficial - - // eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento') - - // this.eventoaprovacaostore.countMd = eventsMDGPRList.length - // this.eventoaprovacaostore.resetmd(eventsMDGPRList); - // this.updateAllProcess() - - // let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise(); - // let eventsPRList = prEventsOficial - // eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento') - - // this.eventoaprovacaostore.countPr = eventsPRList.length - // this.eventoaprovacaostore.resetpr(eventsPRList); - - - this.loadCount = true } + + + async loadDiplomas() { + + let depachoAPI = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise(); + + + if(SessionStore.user.Profile != 'PR') { + + let depacho: any = depachoAPI.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); + depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == "Active"); + + depacho = depacho.map((e)=> this.customTaskPipe.transform(e)) + + this.despachoprstore.reset(depacho) + + } else if(SessionStore.user.Profile == 'PR') { + + let depacho: any = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active") + depacho = depacho.map((e)=> this.customTaskPipe.transform(e)) + this.despachoprstore.reset(depacho) + + } + + + let gerarDiploma = depachoAPI.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma"); + let diplomasList = [] + + gerarDiploma.forEach(element => { + let task: customTask = this.customTaskPipe.transform(element); + diplomasList.push(task); + }); + + this.sortService.sortDate(diplomasList, 'CreateDate') + this.deplomasStore.resetDiplomaGerar(diplomasList); + + + let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma"); + + 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 this.customTaskPipe.transform(element) + })) + + + let diplomasAssinar: any = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma"); + diplomasAssinar = diplomasAssinar.map((element) => this.expedienteTaskPipe.transform(element)) + this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar) + + let diplomasAssinados: any = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado"); + diplomasAssinados = diplomasAssinados.map((element) => this.expedienteTaskPipe.transform(element)) + this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados) + } } diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html index f3befe870..ead7b4e5a 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html @@ -6,7 +6,7 @@
-
+
@@ -91,13 +91,13 @@
-
+
- +
@@ -156,13 +156,13 @@
Lista vazia
-
+
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 701a4af2b..7ed5a61b1 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 @@ -25,6 +25,8 @@ export class AllProcessesPage implements OnInit { fields: ['Folio', 'Senders'], // fields to index for full-text search idField: 'DocId' }) + + AllProcess = [] constructor( private router: Router, @@ -55,16 +57,36 @@ export class AllProcessesPage implements OnInit { this.TaskService.registerCallback({ id: import.meta.url, funx:() => { - + this.dynamicSearch() } }) } - openSearch() {} - async closeSearch() {} - async basicSearch() {} - async dynamicSearch() {} + openSearch() { + this.dynamicSearch() + } + async closeSearch() { + this.searchSubject = '' + this.dynamicSearch() + } + async basicSearch() { + this.dynamicSearch() + } + + async dynamicSearch() { + + if(this.showSearch && this.searchSubject) { + + this.AllProcess = this.TaskService.AllProcess.filter((task) => { + let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject + subject = subject.toLowerCase(); + return subject.includes(this.searchSubject.toLowerCase()) + }) + } else { + this.AllProcess = this.TaskService.AllProcess + } + } checkFilter() { if(this.router.url.includes('ForToDay')) { diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts index f5804ddeb..50e797d7d 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -9,6 +9,7 @@ import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { SortService } from 'src/app/services/functions/sort.service'; import { SessionStore } from 'src/app/store/session.service'; import { environment } from 'src/environments/environment'; +import { TaskService } from 'src/app/services/task.service' @Component({ selector: 'app-despachos-pr', @@ -30,6 +31,7 @@ constructor ( private authService: AuthService, private router: Router, private sortService: SortService, + public TaskService: TaskService, ) { this.loggeduser = SessionStore.user; @@ -55,29 +57,7 @@ constructor ( async LoadList() { this.skeletonLoader = true; - - let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - let despachoList = []; - - let despachosPr; - - if(this.loggeduser.Profile != 'PR') { - despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); - } else if(this.loggeduser.Profile == 'PR') { - despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho"); - } - - despachosPr = despachosPr.filter(data => data.workflowInstanceDataFields.Status == "Active"); - - despachosPr.forEach( (element, index) => { - - let task: customTask = this.customTaskPipe.transform(element); - - despachoList.push(task); - }); - - despachoList = this.sortService.sortDate(despachoList, 'CreateDate') - this.despachosprstore.reset(despachoList); + await this.TaskService.loadDiplomas() this.skeletonLoader = false; } 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 21156038b..68103c257 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 @@ -70,19 +70,8 @@ export class DiplomasAssinarPage implements OnInit { this.skeletonLoader = true - let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - this.diplomasList = new Array(); + await this.TaskService.loadDiplomas() this.skeletonLoader = false - - let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma"); - - this.diplomasList = diplomasAssinar.map(element => { - return this.customTaskPipe.transform(element) - }); - - this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate') - - this.deplomasStore.resetDiplomasParaAssinar(this.diplomasList); } } diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts index d7cb35473..85ff01e24 100644 --- a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts @@ -60,21 +60,9 @@ export class DiplomasGerarPage implements OnInit { this.skeletonLoader = true - let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - this.diplomasList = new Array(); + this.TaskService.loadDiplomas() this.skeletonLoader = false; - - let gerarDiploma = diplomas.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma"); - - gerarDiploma.forEach(element => { - let task: customTask = this.customTaskPipe.transform(element); - this.diplomasList.push(task); - }); - - this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate') - - this.deplomasStore.resetDiplomaGerar(this.diplomasList); } } diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index 1303fb96b..c70c2578f 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -66,59 +66,12 @@ export class DiplomasPage implements OnInit { async LoadList() { this.skeletonLoader = true; - let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - - this.diplomasList = []; - - // let diplomasReview = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado"); - - let diplomasList = diplomas.map(element => { - return this.pipeTask(element) - }); - - diplomasList = diplomasList.filter(data => data.activityInstanceName == "Revisar Diploma"); - - this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate') - - this.deplomasStore.resetDiplomasReview(this.diplomasList) - - let diplomasAssinados = diplomas.reverse().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(this.diplomasAssinadoList) + await this.TaskService.loadDiplomas() 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, - "Deadline": element.deadline, - "TaskStartDate": element.taskStartDate, - "TaskStatus": element.taskStatus, - "TaskReceiveDate": element.taskReceiveDate - } - } - async refreshing() { setTimeout(() => { this.LoadList(); diff --git a/version/git-version.ts b/version/git-version.ts index 594e60bc4..31e6a9bd0 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "15276dfc1", - "SHA": "15276dfc1a04fd46c5acb95f0c4df5c80cd97e35", + "shortSHA": "47dd1b2bc", + "SHA": "47dd1b2bc84906c09e286e745cfc1fef3441133e", "branch": "feature/gabineteLabels", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Apr 19 12:34:28 2023 +0100'", - "lastCommitMessage": "add search", - "lastCommitNumber": "4923", + "lastCommitTime": "'Thu Apr 20 11:45:46 2023 +0100'", + "lastCommitMessage": "add seach button", + "lastCommitNumber": "4924", "change": "", - "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pipes/evento-approve.pipe.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.scss\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts", + "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" 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", "changeAuthor": "peter.maquiran" } \ No newline at end of file