diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 6c3fcf1a9..e71f518e0 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -217,7 +217,7 @@

Diplomas por Validar

Diplomas por Assinar

-

{{ deplomasStore.deplomasReviewCount }} Documentos

+

{{ deplomasStore.deplomasReviewCount }} bug Documentos

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 9ae555f51..db593f0b1 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -618,6 +618,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { let diplomasAssinar = despachospr.filter(data => data.activityInstanceName == "Assinar Diploma"); this.count_dip_as = Object.keys(diplomasAssinar).length; + this.deplomasStore.resetDiplomasList(diplomasAssinar) diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts index 04066f1da..8c3948e42 100644 --- a/src/app/services/agenda/list-box.service.ts +++ b/src/app/services/agenda/list-box.service.ts @@ -8,8 +8,8 @@ import { DateService } from '../date.service'; export class ListBoxService { constructor( - private dateService: DateService - ){} + private dateService: DateService + ){} filterProfile(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all') { @@ -26,32 +26,34 @@ export class ListBoxService { }) } - filterSegment(eventSource: EventListStore[], segment): EventListStore[] { - return eventSource.filter( data => data.calendarName == segment) - } - + filterSegment(eventSource: EventListStore[], segment): EventListStore[] { + return eventSource.filter( data => data.calendarName == segment) + } daysBetween(){ } list(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all', rangeStartDate, randEndDate, {segment = 'Combinado', selectedDate= null}) { - // filter range - if(selectedDate) { - eventSource = eventSource.filter(data => - data.startTime.toLocaleDateString('pt')>= selectedDate.toLocaleDateString('pt') && - data.endTime.toLocaleDateString('pt')>= selectedDate.toLocaleDateString('pt') - ) - } + // console.log('eventSource', eventSource ,'rangeStartDate', new Date(rangeStartDate).toLocaleDateString('pt') , 'randEndDate', new Date(randEndDate).toLocaleDateString('pt')) - if(segment!='Combinado') { - eventSource = this.filterSegment(eventSource, segment) - } + // // filter range + // if(selectedDate) { + // eventSource = eventSource.filter(data => + // data.startTime.toLocaleDateString('pt') >= new Date(rangeStartDate).toLocaleDateString('pt') && + // data.startTime.toLocaleDateString('pt') <= new Date(rangeStartDate).toLocaleDateString('pt') + // ) + // } + + + if(segment!='Combinado') { + eventSource = this.filterSegment(eventSource, segment) + } if(profile != 'all') { eventSource = this.filterProfile(eventSource, profile) } - let newStracture:CustomCalendarEvent[]; + let newStracture:CustomCalendarEvent[]; if(profile == 'md') { newStracture = this.encapsulation(eventSource, 'mdgpr'); 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 2292ba298..247e6e8f2 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 @@ -31,7 +31,7 @@ export class DiplomasAssinarPage implements OnInit { private router: Router, private sortService: SortService, public ThemeService: ThemeService - ) { } + ) {} ngOnInit() { @@ -56,30 +56,27 @@ export class DiplomasAssinarPage implements OnInit { doRefresh() { setTimeout(() => { this.LoadList(); - //event.target.complete(); }, 1000); } async LoadList() { + + this.skeletonLoader = true let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); this.diplomasList = new Array(); this.skeletonLoader = false - console.log(diplomas); let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma"); - console.log(diplomasAssinar); diplomasAssinar.forEach(element => { - let task: customTask = this.customTaskPipe.transform(element) this.diplomasList.push(task); - this.deplomasStore.resetDiplomasList(this.sortService.sortArrayByDate(this.diplomasList)); - }); + this.deplomasStore.resetDiplomasList(this.diplomasList); } }