diff --git a/src/app/Rules/despacho.service.ts b/src/app/Rules/despacho.service.ts index 3dade3928..43dc35115 100644 --- a/src/app/Rules/despacho.service.ts +++ b/src/app/Rules/despacho.service.ts @@ -253,11 +253,8 @@ export class DespachoService { }); - console.log(despachoList); - - - despachoList = this.sortService.sortArrayISODate(despachoList).reverse(); - + despachoList = this.sortService.sortDate(despachoList, 'CreateDate') + if(updateStore) { this.despachoStore.reset(despachoList); } 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 80fa3d4be..a237e0c7e 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 @@ -157,8 +157,9 @@ export class DespachosPrPage implements OnInit { } this.despachoList.push(task); - console.log(this.despachoList); }); + + this.despachoList = this.sortService.sortDate(this.despachoList, 'CreateDate') this.listToPresent = this.despachoList }, (error) => { 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 e9cfdf5ca..564ea7b51 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 @@ -80,13 +80,14 @@ export class DiplomasAssinarPage implements OnInit { let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); this.diplomasList = []; - let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma"); - diplomasAssinar = this.sortService.sortArrayISODate(diplomasAssinar); + let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma"); diplomasAssinar.forEach(element => { let task: customTask = this.customTaskPipe.transform(element) this.diplomasList.push(task); }); + this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate') + this.skeletonLoader = false this.showLoader = false; diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html index b5b84d976..2fb25a676 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html @@ -16,10 +16,10 @@ - Por validar + Por validar ... - Assinados PR + Assinados PR ... diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index 49a5df6e8..5f49173e7 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -182,7 +182,6 @@ export class DiplomasPage implements OnInit, OnDestroy { this.skeletonLoader = false this.showLoader = false; - let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma"); let diplomasList = []; diplomasValidar.forEach(async element => { @@ -191,18 +190,19 @@ export class DiplomasPage implements OnInit, OnDestroy { diplomasList.push(task); }); - this.diplomasList = this.sortService.sortArrayISODate(diplomasList.reverse()); + + this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate'); + let diplomasAssinados = diplomas.filter(data => data.activityInstanceName == "Diploma Assinado"); + let diplomasAssinadoList = []; - let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado"); - let diplomasAssinadoList = [] diplomasAssinados.forEach(async element => { let task = this.pipeTask(element); diplomasAssinadoList.push(task); }); - console.log('diplomasAssinados', diplomasAssinados) - this.diplomasAssinadoList = this.sortService.sortArrayISODate(diplomasAssinadoList).reverse(); + + this.diplomasAssinadoList = this.sortService.sortDate(diplomasAssinadoList, 'CreateDate') }, (error) => { this.getFromDb() @@ -220,21 +220,21 @@ export class DiplomasPage implements OnInit, OnDestroy { let task = this.pipeTaskOffline(element) diplomasList.push(task); + }); - }); - console.log(diplomasList); + console.log(diplomasList); + this.diplomasList = this.sortService.sortDate(diplomasList, 'taskStartDate'); - this.diplomasList = this.sortService.sortArrayISODate(diplomasList).reverse(); - - let diplomasAssinados = process.reverse().filter(data => data.activityInstanceName == "Diploma Assinado"); + let diplomasAssinados = process.filter(data => data.activityInstanceName == "Diploma Assinado"); let diplomasAssinadoList = [] diplomasAssinados.forEach(async element => { - let task = this.pipeTaskOffline(element) - diplomasAssinadoList.push(task); - }); - console.log('diplomasAssinados', diplomasAssinados) - this.diplomasAssinadoList = this.sortService.sortArrayISODate(diplomasAssinadoList).reverse(); + let task = this.pipeTaskOffline(element) + diplomasAssinadoList.push(task); + }); + + console.log('diplomasAssinados', diplomasAssinados) + this.diplomasAssinadoList = this.sortService.sortDate(diplomasAssinadoList, 'taskStartDate') }) } diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 444e0e291..aa7a02372 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -84,14 +84,13 @@ export class EventListPage implements OnInit { this.platform.ready().then(() => { this.sqliteservice.getListOfEventAprove('Agenda Oficial MDGPR', 'Agenda Pessoal MDGPR').then((event: any[]) => { - this.eventsMDGPRList = this.sortService.sortArrayByDate(event).reverse() + this.eventsMDGPRList = this.sortService.sortDate(event, 'taskStartDate') - console.log("All evento to aprove from db ", event) }) this.sqliteservice.getListOfEventAprove('Agenda Oficial PR', 'Agenda Pessoal PR').then((event: any[]) => { - this.eventsPRList = this.sortService.sortArrayByDate(event).reverse() - console.log("All evento to aprove from db ", event) + this.eventsPRList = this.sortService.sortDate(event, 'taskStartDate') + }) }) console.log('Offlineee') @@ -111,14 +110,14 @@ export class EventListPage implements OnInit { let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); - this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList).reverse() + this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate') this.eventaprovacaostore.resetmd(this.sortService.sortArrayByDate(this.eventsMDGPRList).reverse()); } else if (this.segment == 'PR') { let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise(); let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise(); this.eventsPRList = prEventsOficial.concat(prEventsPessoal); - this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList).reverse(); + this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate') this.eventaprovacaostore.resetpr(this.sortService.sortArrayByDate(this.eventsPRList).reverse()); } this.showLoader = false; diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 3f165a4a1..fbb867aa7 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -8,7 +8,7 @@ import { SqliteService } from 'src/app/services/sqlite.service'; import { Platform } from '@ionic/angular'; import { BackgroundService } from '../../../services/background.service'; import { ThemeService } from 'src/app/services/theme.service' - +import { SortService } from 'src/app/services/functions/sort.service'; @Component({ selector: 'app-expediente', @@ -38,7 +38,8 @@ export class ExpedientePage implements OnInit { public platform: Platform, private sqliteservice: SqliteService, private backgroundservice: BackgroundService, - public ThemeService: ThemeService + public ThemeService: ThemeService, + private sortService: SortService, ) { } ngOnInit() { @@ -70,7 +71,7 @@ export class ExpedientePage implements OnInit { const result = res this.taskslist = new Array(); - let ress = result.reverse().filter((data: any) => data.workflowInstanceDataFields.Status == "Active"); + let ress = result.filter((data: any) => data.workflowInstanceDataFields.Status == "Active"); ress.forEach((element: any) => { @@ -78,7 +79,7 @@ export class ExpedientePage implements OnInit { this.taskslist.push(task); this.addProcessTODb(task); }); - this.listToPresent = this.taskslist + this.listToPresent = this.sortService.sortDate(this.taskslist, 'taskStartDate') console.log('expediente list', this.listToPresent) this.skeletonLoader = false; diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 590200750..9ce1fd431 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -12,7 +12,7 @@ import { Location } from '@angular/common' import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; import { ThemeService } from 'src/app/services/theme.service' - +import { SortService } from 'src/app/services/functions/sort.service'; @Component({ selector: 'app-expedientes-pr', @@ -41,7 +41,8 @@ export class ExpedientesPrPage implements OnInit { private authService: AuthService, private router: Router, private location: Location, - public ThemeService: ThemeService + public ThemeService: ThemeService, + private sortService: SortService, ) { this.loggeduser = authService.ValidatedUser; } @@ -80,6 +81,8 @@ export class ExpedientesPrPage implements OnInit { this.taskslist.push(task); }); console.log(this.taskslist); + + this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate') this.expedienteGdStore.reset(this.taskslist); this.skeletonLoader = false }) diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index 81e1b863b..0f115b020 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -164,7 +164,7 @@ export class PedidosPage implements OnInit { }); this.addPedidoToDb(this.parecerList); - this.listToPresentparecerList = this.sortService.sortArrayISODate(this.parecerList); + this.listToPresentparecerList = this.sortService.sortDate(this.parecerList, 'CreateDate') this.pedidosstorage.resetparecer(this.listToPresentparecerList); } @@ -205,7 +205,7 @@ export class PedidosPage implements OnInit { }); }); this.addPedidoToDb(this.deferimentoList); - this.listToPresentdeferimentoList = this.sortService.sortArrayISODate(this.deferimentoList); + this.listToPresentdeferimentoList = this.sortService.sortDate(this.deferimentoList, 'CreateDate') this.pedidosstorage.resetdeferimento(this.listToPresentdeferimentoList); } diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index a9ecba812..c06053412 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -102,7 +102,7 @@ export class PendentesPage implements OnInit { }); pendentesList = removeDuplicate(pendentesList) - pendentesList = this.sortService.sortArrayISODate(pendentesList); + pendentesList = this.sortService.sortDate(pendentesList, 'CreateDate'); this.listToPresent = pendentesList; this.skeletonLoader = false; @@ -138,7 +138,7 @@ export class PendentesPage implements OnInit { } }); - pendingList = pendingList; + pendingList = this.sortService.sortDate(pendingList, 'CreateDate'); this.listToPresent = pendingList; console.log('pendentes', pendingList) diff --git a/src/app/services/date.service.ts b/src/app/services/date.service.ts index 2895fea2d..c1c98e440 100644 --- a/src/app/services/date.service.ts +++ b/src/app/services/date.service.ts @@ -7,7 +7,6 @@ export class DateService { constructor() { } - deferenceBetweenDays(start: any, end: any) { const diffTime = Math.abs(end - start); return Math.ceil(diffTime / (1000 * 60 * 60 * 24)); diff --git a/src/app/services/functions/object.service.spec.ts b/src/app/services/functions/object.service.spec.ts new file mode 100644 index 000000000..ed7a3d76a --- /dev/null +++ b/src/app/services/functions/object.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ObjectService } from './object.service'; + +describe('ObjectService', () => { + let service: ObjectService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ObjectService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/functions/object.service.ts b/src/app/services/functions/object.service.ts new file mode 100644 index 000000000..9b52713c8 --- /dev/null +++ b/src/app/services/functions/object.service.ts @@ -0,0 +1,25 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class ObjectService { + + constructor() { } + + + deepFind(obj, path) { + var paths = path.split('.') + , current = obj + , i; + + for (i = 0; i < paths.length; ++i) { + if (current[paths[i]] == undefined) { + return undefined; + } else { + current = current[paths[i]]; + } + } + return current; + } +} diff --git a/src/app/services/functions/sort.service.ts b/src/app/services/functions/sort.service.ts index 9d580897b..c248ff958 100644 --- a/src/app/services/functions/sort.service.ts +++ b/src/app/services/functions/sort.service.ts @@ -1,11 +1,12 @@ import { Injectable } from '@angular/core'; +import { ObjectService } from './object.service'; @Injectable({ providedIn: 'root' }) export class SortService { - constructor() { } + constructor(private ObjectService: ObjectService) { } sortArrayISODate(myArray: any) { if(myArray.length > 0){ @@ -14,6 +15,7 @@ export class SortService { }); } } + sortArrayByDate(myArray: any) { console.log(myArray[0].taskStartDate); if(myArray.length > 0){ @@ -22,4 +24,15 @@ export class SortService { }); } } + + sortDate(array = [], path: string) { + + return array.sort( (a,b)=> { + + return new Date(this.ObjectService.deepFind(b, path)).getTime() - + new Date(this.ObjectService.deepFind(a, path)).getTime() + + }) + + } } 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 612988024..e41d4bd93 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 @@ -75,14 +75,11 @@ export class AllProcessesPage implements OnInit { 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, @@ -95,10 +92,11 @@ export class AllProcessesPage implements OnInit { "Agenda": element.workflowInstanceDataFields.Agenda, "customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent), } + this.allProcessesList.push(task); this.allProcessesList = removeDuplicate(this.allProcessesList) - //this.allProcessesList = this.sortArrayISODate(this.allProcessesList).reverse(); - this.allProcessesList = this.sortService.sortArrayISODate(this.allProcessesList).reverse(); + + this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate'); }); 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 1da06551a..c5a97201e 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 @@ -74,7 +74,7 @@ constructor ( despachoList.push(task); }); - despachoList = this.sortService.sortArrayISODate(despachoList).reverse() + despachoList = this.sortService.sortDate(despachoList, 'CreateDate') this.despachosprstore.reset(despachoList); 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 247e6e8f2..047ba3e66 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 @@ -76,6 +76,9 @@ export class DiplomasAssinarPage implements OnInit { this.diplomasList.push(task); }); + this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate') + + this.deplomasStore.resetDiplomasList(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 53a5fdeb1..452d7a033 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -8,6 +8,7 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { DeplomasStore } from 'src/app/store/deplomas.service'; import { ThemeService } from 'src/app/services/theme.service' +import { SortService } from 'src/app/services/functions/sort.service'; @Component({ selector: 'app-diplomas', @@ -34,10 +35,9 @@ constructor( private alertService: AlertService, private router: Router, private activatedRoute: ActivatedRoute, - public ThemeService: ThemeService - ) { - - } + public ThemeService: ThemeService, + private sortService: SortService, + ) {} ngOnInit() { // update list @@ -82,7 +82,7 @@ constructor( diplomasList.push(task); }); - this.diplomasList = this.sortArrayISODate(diplomasList).reverse(); + this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate') this.deplomasStore.resetDiplomasList(this.diplomasList) let diplomasAssinadoList = [] @@ -93,7 +93,7 @@ constructor( diplomasAssinadoList.push(task); }); - this.diplomasAssinadoList = this.sortArrayISODate(diplomasAssinadoList).reverse(); + this.diplomasAssinadoList = this.sortService.sortDate(diplomasAssinadoList, 'CreateDate') this.deplomasStore.resetDiplomasAssinadoList(this.diplomasAssinadoList) this.showLoader = false; @@ -120,12 +120,6 @@ constructor( } } - sortArrayISODate(myArray: any) { - return myArray.sort(function(a, b) { - return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); - }); - } - async refreshing() { setTimeout(() => { this.LoadList(); diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index e04bf0a86..93a20876d 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -69,13 +69,14 @@ export class EventsToApprovePage implements OnInit { this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); console.log(this.sortService.sortArrayByDate(this.eventsMDGPRList)); - this.eventaprovacaostore.resetmd(this.sortService.sortArrayByDate(this.eventsMDGPRList).reverse()); + this.eventaprovacaostore.resetmd(this.sortService.sortDate(this.eventsMDGPRList, 'CreateDate')); } else if(this.segment == 'PR'){ let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise(); let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise(); this.eventsPRList = prEventsOficial.concat(prEventsPessoal); - this.eventaprovacaostore.resetpr(this.sortService.sortArrayByDate(this.eventsPRList).reverse()); + + this.eventaprovacaostore.resetpr(this.sortService.sortDate(this.eventsPRList, 'CreateDate')); } this.showLoader = 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 d89169481..fc6b10e54 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 @@ -10,6 +10,7 @@ import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; import { ThemeService } from 'src/app/services/theme.service' +import { SortService } from 'src/app/services/functions/sort.service'; @Component({ @@ -35,7 +36,8 @@ export class ExpedientesPrPage implements OnInit { private alertService: AlertService, private authService: AuthService, private router: Router, - public ThemeService: ThemeService + public ThemeService: ThemeService, + private sortService: SortService, ) { this.loggeduser = authService.ValidatedUser; } @@ -75,7 +77,8 @@ export class ExpedientesPrPage implements OnInit { let task = this.expedienteTaskPipe.transform(element); this.taskslist.push(task); }); - console.log(this.taskslist); + + this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate') this.expedienteGdStore.reset(this.taskslist); this.skeletonLoader = false; diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 2f0237c92..84d2baad5 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -5,6 +5,7 @@ import { AlertService } from 'src/app/services/alert.service'; import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; import { ThemeService } from 'src/app/services/theme.service' +import { SortService } from 'src/app/services/functions/sort.service'; @Component({ selector: 'app-expedients', @@ -27,7 +28,8 @@ export class ExpedientsPage implements OnInit { private processes:ProcessesService, private alertService: AlertService, private router: Router, - public ThemeService: ThemeService + public ThemeService: ThemeService, + private sortService: SortService, ) { this.profile = 'mdgpr'; @@ -67,13 +69,14 @@ export class ExpedientsPage implements OnInit { this.taskslist = []; this.skeletonLoader = false - let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); + let res = result.filter(data => data.workflowInstanceDataFields.Status == "Active"); res.forEach(element => { let task = this.expedienteTaskPipe.transform(element) this.taskslist.push(task); }); + this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate') this.expedientegbstore.reset(this.taskslist); }); } diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 785392167..6c6dd30ee 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -96,7 +96,8 @@ export class PedidosPage implements OnInit { let task: customTask = this.customTaskPipe.transform(element); this.parecerList.push(task); }); - this.pedidosstore.resetparecer(this.sortService.sortArrayISODate(this.parecerList)); + + this.pedidosstore.resetparecer(this.sortService.sortDate(this.parecerList, 'CreateDate')); } else if(this.segment == 'deferimento') { @@ -112,7 +113,9 @@ export class PedidosPage implements OnInit { let task: customTask = this.customTaskPipe.transform(element); this.deferimentoList.push(task); }); - this.pedidosstore.resetdeferimento(this.sortService.sortArrayISODate(this.deferimentoList)); + + + this.pedidosstore.resetdeferimento(this.sortService.sortDate(this.deferimentoList, 'CreateDate')); }); } diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index cc20a4a26..c74f98171 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -62,7 +62,7 @@ export class PendentesPage implements OnInit { }); pendentesList = removeDuplicate( pendentesList) - pendentesList = this.sortService.sortArrayISODate(pendentesList); + pendentesList = this.sortService.sortDate(pendentesList, 'CreateDate') this.pendentesstore.reset(pendentesList); this.skeletonLoader = false; diff --git a/src/global.scss b/src/global.scss index e59d967e6..9ffcd6fda 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1336,10 +1336,10 @@ ngx-mat-datetime-content{ .ldio-rpinwye8j0b div { box-sizing: content-box; } .transparent-modal { - --background: #0000005c; + --background: #000000; ion-content { - --background:#2e2121e7; + --background:#2e2121; } } @@ -1351,11 +1351,7 @@ ngx-mat-datetime-content{ .transparentblack-modal{ --background: #000000e7; - ion-content { - --background:transparent; - - } .transparent-modal .modal-wrapper { - --background: rgba(44, 39, 45, 0.7); + --background: rgb(44, 39, 45); } } \ No newline at end of file