-
+
Gabinete Digital
@@ -147,7 +147,7 @@
-
+
@@ -258,7 +258,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 6d15e1c62..0ff591126 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { ProcessesService } from 'src/app/services/processes.service'; import { ModalController } from '@ionic/angular'; import {NavigationEnd, NavigationExtras, Router } from '@angular/router'; @@ -102,6 +102,11 @@ export class GabineteDigitalPage implements OnInit { AllProcess = [] ordinance: string = 'old' + + refresh = true + + @ViewChild('scroll') scroll: ElementRef; + constructor( private processesbackend: ProcessesService, private modalController: ModalController, @@ -191,7 +196,7 @@ export class GabineteDigitalPage implements OnInit { reorderList(orderBy: string) { - + this.changeTab() this.ordinance = orderBy; this.dynamicSearch(); @@ -256,9 +261,31 @@ export class GabineteDigitalPage implements OnInit { }); this.hideRefreshButton(); + + // console.log(' this.scroll', this.scroll) + // this.scroll.nativeElement.addEventListener("scroll", ()=> { + // console.log('123') + // }); } + ngAfterViewInit(): void { + // We can access the TestComponent now that this portion of the view tree has been initiated. + const element = this.scroll.nativeElement + this.scroll.nativeElement.addEventListener("scroll", (e)=> { + this.changeTab() + }); + } + + changeTab() { + const element = this.scroll.nativeElement + if(element.scrollTop == 0 ) { + this.refresh = true + } else { + this.refresh = false + } + } + checkFilter() { diff --git a/src/app/services/events/attendees/attendees.page.html b/src/app/services/events/attendees/attendees.page.html index 9570c6f0d..a3ff11683 100644 --- a/src/app/services/events/attendees/attendees.page.html +++ b/src/app/services/events/attendees/attendees.page.html @@ -85,7 +85,7 @@ diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 1d7f6672d..d2cc70fd5 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -239,9 +239,7 @@ export class TaskService { this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => { return this.customTaskPipe.transform(element) })); - } catch (error) { - - } + } catch (error) {} } @@ -274,7 +272,7 @@ export class TaskService { let genericEvents = await this.processesbackend.GetTasksList('Agendar Evento', false).toPromise(); let eventsList try { - eventsList = this.sortService.sortArrayByDate(genericEvents).reverse(); + eventsList = genericEvents } catch (error) { eventsList = []; } @@ -285,7 +283,7 @@ export class TaskService { let allEvents = await this.processesbackend.eventsToApprove(calendar.OwnerUserId, 'againete page').toPromise() let eventsList try { - eventsList = this.sortService.sortArrayByDate(allEvents).reverse(); + eventsList = allEvents } catch(error) { eventsList = [] } @@ -335,7 +333,7 @@ export class TaskService { diplomasList.push(task); }); - diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate').reverse() + diplomasList = diplomasList this.deplomasStore.resetDiplomaGerar(diplomasList); @@ -356,13 +354,10 @@ 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') - diplomasAssinar = this.sortService.sortArrayISODate(diplomasAssinar) this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar) let diplomasAssinados: any = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado"); diplomasAssinados = diplomasAssinados.map((element) => this.expedienteTaskPipe.transform(element)) - diplomasAssinados = this.sortService.sortArrayISODate(diplomasAssinados) this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados) } catch (error) { diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html index f9e36e2ab..b022d92fb 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -87,7 +87,7 @@ diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index f01dee117..bd5d15481 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -33,11 +33,7 @@ export class DespachosPage implements OnInit { this.router.events.forEach((event) => { if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital?despachos=true')) { - if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.LoadList() - } else { - this.LoadList() - } + this.LoadList() } }); 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 1d1e42989..f7d8bf85e 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 @@ -43,11 +43,7 @@ export class DiplomasAssinarPage implements OnInit { this.router.events.forEach((event) => { if (event instanceof NavigationStart && '/home/gabinete-digital?diplomasassinar=true'.startsWith(event.url)) { - if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.LoadList() - } else { - this.LoadList() - } + this.LoadList() } }); @@ -118,6 +114,7 @@ export class DiplomasAssinarPage implements OnInit { this.skeletonLoader = true await this.TaskService.loadDiplomas() + this.dynamicSearch() this.skeletonLoader = false } 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 531474ecb..a1c226981 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 @@ -77,7 +77,8 @@ export class DiplomasGerarPage implements OnInit { this.skeletonLoader = true - this.TaskService.loadDiplomas() + await this.TaskService.loadDiplomas() + this.dynamicSearch() this.skeletonLoader = false; } diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index f8543c344..f032b281f 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -54,7 +54,9 @@ export class ExpedientesPrPage implements OnInit { if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital?expedientespr=true') || event instanceof NavigationStart && - event.url.startsWith('/home/gabinete-digital?expedientes-pr=true')) { + event.url.startsWith('/home/gabinete-digital?expedientes-pr=true' ) || + event instanceof NavigationStart && + event.url.startsWith('/home/gabinete-digital?expedientes=true' )) { if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { this.refreshing() diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index a125a65d5..527d9241e 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -58,11 +58,7 @@ export class ExpedientsPage implements OnInit { this.router.events.forEach((event) => { if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital?expedientes=true')) { - if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.LoadList() - } else { - this.LoadList() - } + this.LoadList() } }); diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 4ef01b369..ae3320bb0 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -139,7 +139,7 @@ export class PedidosPage implements OnInit { async LoadList() { - this.skeletonLoader = true; + if(this.segment == 'parecer') { this.taskType = "Pedido de Parecer"; @@ -147,6 +147,8 @@ export class PedidosPage implements OnInit { let parecer = []; let parecerPr = []; + this.skeletonLoader = true; + try { parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise(); parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise(); @@ -174,6 +176,7 @@ export class PedidosPage implements OnInit { } else if(this.segment == 'deferimento') { this.taskType = "Pedido de Deferimento"; + this.skeletonLoader = true; this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => { this.skeletonLoader = false @@ -194,7 +197,7 @@ export class PedidosPage implements OnInit { this.skeletonLoader = false }); } - this.skeletonLoader = false + } doRefresh(event) { diff --git a/version/git-version.ts b/version/git-version.ts index 99a4a8254..f3b2f3337 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "9470de530", - "SHA": "9470de5307453466d052581c315d4283d921d3be", + "shortSHA": "05265f244", + "SHA": "05265f24426a97111f90220e42cefe9b3e6356f0", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Thu Jun 8 16:04:00 2023 +0100'", - "lastCommitMessage": "chnages and changes", - "lastCommitNumber": "4963", + "lastCommitTime": "'Fri Jun 9 13:55:32 2023 +0100'", + "lastCommitMessage": "changes from peter", + "lastCommitNumber": "4966", "change": "", - "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 10 and 4 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts", + "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 11 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/forward/forward.page.html\n\tmodified: src/app/pages/events/attendees/attendees.page.html\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\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/services/events/attendees/attendees.page.html\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.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/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file