diff --git a/package-lock.json b/package-lock.json index 878a7078f..a5beebb2b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2958,21 +2958,6 @@ "@types/cordova": "^0.0.34" } }, - "@ionic-native/crop": { - "version": "5.36.0", - "resolved": "https://registry.npmjs.org/@ionic-native/crop/-/crop-5.36.0.tgz", - "integrity": "sha512-wRO8J9oSHl4klvPMti7MTYjFCl6dYHYlbe56gzImf1pwfKQ7gmusskeedABfZggPV1NHruMBKUNALdatJf603A==", - "requires": { - "@types/cordova": "^0.0.34" - }, - "dependencies": { - "@types/cordova": { - "version": "0.0.34", - "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", - "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" - } - } - }, "@ionic-native/fcm": { "version": "5.36.0", "resolved": "https://registry.npmjs.org/@ionic-native/fcm/-/fcm-5.36.0.tgz", 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/app-routing.module.ts b/src/app/app-routing.module.ts index 701c78b64..77e583867 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -215,6 +215,10 @@ const routes = [ path: 'video-allowed', loadChildren: () => import('./modals/video-allowed/video-allowed.module').then( m => m.VideoAllowedPageModule) }, + { + path: 'preview-photo', + loadChildren: () => import('./modals/preview-photo/preview-photo.module').then( m => m.PreviewPhotoPageModule) + }, diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 1d0aaa047..b020696f7 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -1,6 +1,6 @@ /* eslint-disable */ /* tslint:disable */ -import { Component, OnInit, NgZone } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { Event } from '../models/event.model'; import { NotificationsService } from '../services/notifications.service'; /*import { WebNotificationsService } from '../services/webnotifications.service'; */ @@ -68,7 +68,6 @@ export class HomePage implements OnInit { status: string = ""; audioName: string = ""; constructor( - private zone: NgZone, private router: Router, public modalCtrl: AlertController, private notificationsService: NotificationsService, @@ -93,6 +92,7 @@ export class HomePage implements OnInit { this.router.events.subscribe((val) => { document.querySelectorAll('ion-modal').forEach((e: any) => e.remove()) + document.querySelectorAll('popover-viewport').forEach((e: any) => e.remove()) }); window['platform'] = platform @@ -100,6 +100,9 @@ export class HomePage implements OnInit { if (window.location.pathname != '/inactivity') { + document.querySelectorAll('ion-modal').forEach((e: any) => e.remove()) + document.querySelectorAll('popover-viewport').forEach((e: any) => e.remove()) + const pathname = window.location.pathname SessionStore.setUrlBeforeInactivity(pathname) this.router.navigate(['/inactivity']); diff --git a/src/app/modals/preview-camera/preview-camera.page.html b/src/app/modals/preview-camera/preview-camera.page.html index bc40a9eab..53647d342 100644 --- a/src/app/modals/preview-camera/preview-camera.page.html +++ b/src/app/modals/preview-camera/preview-camera.page.html @@ -27,32 +27,32 @@ - + - + - + - + - + diff --git a/src/app/modals/preview-camera/preview-camera.page.scss b/src/app/modals/preview-camera/preview-camera.page.scss index de3ee420c..e8333bcdf 100644 --- a/src/app/modals/preview-camera/preview-camera.page.scss +++ b/src/app/modals/preview-camera/preview-camera.page.scss @@ -8,14 +8,20 @@ ion-slides { .redla{ color: rgb(250, 248, 248); - background-color: rgb(255, 187, 0); + background-color: rgb(255, 238, 0); border-radius: 120px; width: 30px; height: 30px; } +.blacking{ + background-color: rgb(168, 41, 41); +} .cardconteudo { - background: rgba(255,255,255,0.5); + background: rgb(8, 8, 8); + display: flex; + flex-wrap: wrap; + } .whiter{ diff --git a/src/app/modals/preview-camera/preview-camera.page.ts b/src/app/modals/preview-camera/preview-camera.page.ts index 477e5eda0..2766fc583 100644 --- a/src/app/modals/preview-camera/preview-camera.page.ts +++ b/src/app/modals/preview-camera/preview-camera.page.ts @@ -80,6 +80,10 @@ async getIconGallery(){ openChat(){ + } + + openChatVideo(){ + } } diff --git a/src/app/modals/preview-photo/preview-photo-routing.module.ts b/src/app/modals/preview-photo/preview-photo-routing.module.ts new file mode 100644 index 000000000..6a8d5e20c --- /dev/null +++ b/src/app/modals/preview-photo/preview-photo-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { PreviewPhotoPage } from './preview-photo.page'; + +const routes: Routes = [ + { + path: '', + component: PreviewPhotoPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class PreviewPhotoPageRoutingModule {} diff --git a/src/app/modals/preview-photo/preview-photo.module.ts b/src/app/modals/preview-photo/preview-photo.module.ts new file mode 100644 index 000000000..56980fefd --- /dev/null +++ b/src/app/modals/preview-photo/preview-photo.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { PreviewPhotoPageRoutingModule } from './preview-photo-routing.module'; + +import { PreviewPhotoPage } from './preview-photo.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + PreviewPhotoPageRoutingModule + ], + declarations: [PreviewPhotoPage] +}) +export class PreviewPhotoPageModule {} diff --git a/src/app/modals/preview-photo/preview-photo.page.html b/src/app/modals/preview-photo/preview-photo.page.html new file mode 100644 index 000000000..7d321438a --- /dev/null +++ b/src/app/modals/preview-photo/preview-photo.page.html @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/app/modals/preview-photo/preview-photo.page.scss b/src/app/modals/preview-photo/preview-photo.page.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/modals/preview-photo/preview-photo.page.spec.ts b/src/app/modals/preview-photo/preview-photo.page.spec.ts new file mode 100644 index 000000000..5bb31b8c1 --- /dev/null +++ b/src/app/modals/preview-photo/preview-photo.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { PreviewPhotoPage } from './preview-photo.page'; + +describe('PreviewPhotoPage', () => { + let component: PreviewPhotoPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ PreviewPhotoPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(PreviewPhotoPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modals/preview-photo/preview-photo.page.ts b/src/app/modals/preview-photo/preview-photo.page.ts new file mode 100644 index 000000000..e91170d93 --- /dev/null +++ b/src/app/modals/preview-photo/preview-photo.page.ts @@ -0,0 +1,33 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController, NavParams } from '@ionic/angular'; + + +@Component({ + selector: 'app-preview-photo', + templateUrl: './preview-photo.page.html', + styleUrls: ['./preview-photo.page.scss'], +}) +export class PreviewPhotoPage implements OnInit { + + constructor(private modalController: ModalController, + private navParams:NavParams) { } + + ngOnInit() { + } + + image: any; + + exit( ){ this.modalController.dismiss() + + } + save(img){ + var canvas = document.createElement('canvas'); + var ctx = canvas.getContext('2d'); + canvas.width=300 + canvas.height=234 + ctx.drawImage(img.attachments[0].image_url, 0, 0, 300, 234); + document.body.appendChild(canvas); +} + + +} diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index d585e8d37..926fe61f9 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -10,6 +10,7 @@ import { NotificationsService } from '../../services/notifications.service'; import { SessionStore } from 'src/app/store/session.service'; import { EventTrigger } from '../../services/eventTrigger.service'; import { ThemeService } from 'src/app/services/theme.service' +import { SortService } from 'src/app/services/functions/sort.service'; @Component({ selector: 'app-profile', @@ -41,7 +42,8 @@ export class ProfilePage implements OnInit { private notificationservice: NotificationsService, private platform: Platform, private eventtrigger: EventTrigger, - public ThemeService: ThemeService + public ThemeService: ThemeService, + private sortService: SortService, ) { this.loggeduser = authService.ValidatedUser; diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index b1f719324..51936512e 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -39,8 +39,9 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { /* @ViewChild('messageContainer') messageContainer: ElementRef; */ @ViewChild('rectangle') private rectangle: ElementRef; + canvas: any + ctx: any loggedUser: any; - message = ''; messages:any; userPresence=''; @@ -635,6 +636,7 @@ touchStart(card) { card.el.style['z-index'] = 11; } + async openPreview(msg) { const modal = await this.modalController.create({ component: PreviewCameraPage, @@ -658,6 +660,16 @@ touchStart(card) { ctx.drawImage(img.attachments[0].image_url, 0, 0, 300, 234); document.body.appendChild(canvas); } + +getPicture(img){ + var canvas = document.createElement('canvas'); + var ctx = canvas.getContext('2d'); + canvas.width=300 + canvas.height=234 + ctx.drawImage(img.attachments[0].image_url, 0, 0, 300, 234); + document.body.appendChild(canvas); + + } } diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 3080ac852..74d7d9e3c 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -402,8 +402,8 @@ ion-toolbar{ display: flex; justify-content: space-between; align-items: center; - background-color: transparent !important; - --background: transparent !important; + background-color: transparent; + --background: transparent; .schedule-time{ margin-right: 10px; .time-start{ 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/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 96aa9f284..2d701a46d 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -29,6 +29,7 @@ import { ThemeService } from 'src/app/services/theme.service' import { SqliteService } from '../../services/sqlite.service'; import { Platform } from '@ionic/angular'; import { BackgroundService } from 'src/app/services/background.service'; +import { SortService } from 'src/app/services/functions/sort.service'; @Component({ selector: 'app-gabinete-digital', @@ -130,7 +131,8 @@ export class GabineteDigitalPage implements OnInit, DoCheck { private platform: Platform, private changeProfileService: ChangeProfileService, private backgroundservice: BackgroundService, - public ThemeService: ThemeService + public ThemeService: ThemeService, + private sortService: SortService, ) { this.loggeduser = authService.ValidatedUser; @@ -146,10 +148,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck { }; this.checkRoutes(); - - // this.eventoaprovacaostore.resetmd([]) - // this.eventoaprovacaostore.resetpr([]) - } ngDoCheck(): void { @@ -209,64 +207,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { } async loadAllProcesses() { - - this.processesbackend.GetTasksList("", false).subscribe(async res => { - - let allProcessesList = await this.processesbackend.GetTasksList("", false).toPromise(); - - allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento') - - if (!this.p.userRole(['PR'])) { - allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Assinar Diplomas') - } else if (this.p.userRole(['PR'])) { - allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Diploma Assinado') - } - - console.log('allProcessesList', allProcessesList); - - this.addProcessToDB(allProcessesList) - this.skeletonLoader = true; - - this.allProcessesList = []; - - 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, - "DocumentsQty": element.totalDocuments, - "DocId": element.workflowInstanceDataFields.DispatchDocId, - "FolderID": element.workflowInstanceDataFields.FolderID, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - "Status": element.workflowInstanceDataFields.Status, - "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(); - - - - }); - - }, (error) => { - console.log('gabinete digital offline', error) - this.getAllProcessFromDB(); - }) - - this.skeletonLoader = false; - + this.LoadCounts(); } addProcessToDB(data) { @@ -330,7 +271,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.allProcessesList.push(task); this.allProcessesList = removeDuplicate(this.allProcessesList) - this.allProcessesList = this.sortArrayISODate(this.allProcessesList).reverse(); + this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate') }); console.log("All process from db ", allprocess) @@ -345,21 +286,18 @@ export class GabineteDigitalPage implements OnInit, DoCheck { setFormatDate(start: any, end: any, allday: boolean) { let customDate; - /* start = new Date(); - end= new Date("2021-08-04T18:01:04.753Z"); */ - //end = new Date("2021-09-04T18:01:04.753Z"); const totalSeconds = Math.floor((end - (start)) / 1000);; const totalMinutes = Math.floor(totalSeconds / 60); const totalHours = Math.floor(totalMinutes / 60); const totalDays = Math.floor(totalHours / 24); - const hours = totalHours - (totalDays * 24); - const minutes = totalMinutes - (totalDays * 24 * 60) - (hours * 60); - const seconds = totalSeconds - (totalDays * 24 * 60 * 60) - (hours * 60 * 60) - (minutes * 60); + //const hours = totalHours - (totalDays * 24); + //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; + // let diffDays = totalDays; + // let diffMinutes = minutes; if (totalDays == 0) { if (allday) { @@ -385,6 +323,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { (thedate.getMonth() + 1) + "/" + thedate.getFullYear(); } + getCustomHours(thedate: Date) { return thedate.getHours() + ":" + thedate.getMinutes(); @@ -551,8 +490,49 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.showLoader = true; let allPreocesses_ = await this.processesbackend.GetTasksList("", false).toPromise(); - let count_all_processes = Object.keys(allPreocesses_).length; + let allProcessesList = allPreocesses_; + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento') + + if (!this.p.userRole(['PR'])) { + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Assinar Diplomas') + } else if (this.p.userRole(['PR'])) { + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Diploma Assinado') + } + + this.addProcessToDB(allProcessesList) + this.skeletonLoader = true; + + this.allProcessesList = []; + + 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, + "DocumentsQty": element.totalDocuments, + "DocId": element.workflowInstanceDataFields.DispatchDocId, + "FolderID": element.workflowInstanceDataFields.FolderID, + "WorkflowName": element.workflowDisplayName, + "activityInstanceName": element.activityInstanceName, + "Status": element.workflowInstanceDataFields.Status, + "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.sortService.sortDate(this.allProcessesList, 'CreateDate') + + }); let expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise(); expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active") @@ -582,6 +562,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { let despachospr = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise(); let despachosPr; + switch (this.loggeduser.Profile) { case 'MDGPR': despachosPr = despachospr.filter(data => data.activityInstanceName == "Tarefa de Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active"); @@ -595,23 +576,18 @@ export class GabineteDigitalPage implements OnInit, DoCheck { break; } - let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); const eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); this.eventoaprovacaostore.countMd = eventsMDGPRList.length this.eventoaprovacaostore.resetmd(eventsMDGPRList); - - let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise(); let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise(); const eventsPRList = prEventsOficial.concat(prEventsPessoal); this.eventoaprovacaostore.countPr = eventsPRList.length this.eventoaprovacaostore.resetpr(eventsPRList); - - let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma"); this.count_dip_pv = Object.keys(diplomasValidar).length; this.deplomasStore.resetDiplomasReview(diplomasValidar) @@ -622,7 +598,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.deplomasStore.resetDiplomasList(diplomasAssinar) - let diplomasAssinados = despachospr.filter(data => data.activityInstanceName == "Diploma Assinado"); this.count_dip_as_pr = Object.keys(diplomasAssinados).length; this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados) @@ -641,22 +616,8 @@ export class GabineteDigitalPage implements OnInit, DoCheck { doRefresh(event) { console.log(event); - - // this.closeAllDesktopComponents(); - /* switch(this.loggeduser.Profile){ - case 'MDGPR': - this.selectedElement='Correspondence'; - this.showExpedients = true; - this.expedientesPage.doRefresh(); - break; - case 'PR': - this.selectedElement='ExpedientesPr'; - this.showExpedientesPr = true; - break; - } */ - this.LoadCounts(); - this.loadAllProcesses(); - //this.refreshExpedientes(); + + this.LoadCounts(); if (event) { setTimeout(() => { 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/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 8fd4fb4de..5fb46c486 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -108,6 +108,7 @@ export class NewPublicationPage implements OnInit { allowEditing: false, resultType: CameraResultType.Uri, source: CameraSource.Camera // Camera, Photos or Prompt! + }); if (image) { @@ -116,12 +117,13 @@ export class NewPublicationPage implements OnInit { } + imageSize(image){ var canvas = document.createElement('canvas'); var ctx = canvas.getContext('2d'); - canvas.width=300 - canvas.height=234 - ctx.drawImage(image, 0, 0, 300, 234); + canvas.width=100 + canvas.height=34 + ctx.drawImage(image, 0, 0, 100, 34); document.body.appendChild(canvas); } diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index f1c15bcad..6d802fcb7 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -77,7 +77,6 @@ - console.log('new image path is: ' + newImage), // error => console.error('Error cropping image', error) // ); - - } diff --git a/src/app/pages/publications/view-publications/view-publications.page.scss b/src/app/pages/publications/view-publications/view-publications.page.scss index e4c1a0dd2..77534f9d2 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.scss +++ b/src/app/pages/publications/view-publications/view-publications.page.scss @@ -126,7 +126,7 @@ } .post-img{ width: 100%; - //height: 400px; + height: 400px; margin: 0 auto; border-radius: 0px!important; overflow: hidden; diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts index ed18982c3..8070c3a21 100644 --- a/src/app/services/agenda/list-box.service.ts +++ b/src/app/services/agenda/list-box.service.ts @@ -160,14 +160,12 @@ export class ListBoxService { } - push(event: any, selectedDate: Date) { - - console.log(new Date(event.start).getDate(), selectedDate.getDate(), new Date(event.start).getDate() >= selectedDate.getDate()) + push(event: any, selectedDate: Date) { - return new Date(event.start).getMonth() == selectedDate.getMonth() && - new Date(event.start).getFullYear() == selectedDate.getFullYear() && - new Date(event.start).getDate() >= selectedDate.getDate() - } + return new Date(event.start).getMonth() == selectedDate.getMonth() && + new Date(event.start).getFullYear() == selectedDate.getFullYear() && + new Date(event.start).getDate() >= selectedDate.getDate() + } encapsulation(eventsList:EventListStore[], profile): CustomCalendarEvent[] { 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/file.service.ts b/src/app/services/functions/file.service.ts index 843b12bb1..146f8cb91 100644 --- a/src/app/services/functions/file.service.ts +++ b/src/app/services/functions/file.service.ts @@ -240,7 +240,6 @@ export class FileService { //this.capturedImage = this.capturedImage; - } @@ -250,7 +249,7 @@ export class FileService { quality: 50, // allowEditing: true, resultType: CameraResultType.Uri, - source: CameraSource.Photos + source: CameraSource.Camera }); 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/services/webnotifications.service.ts b/src/app/services/webnotifications.service.ts index db0818093..f67bdcd3e 100644 --- a/src/app/services/webnotifications.service.ts +++ b/src/app/services/webnotifications.service.ts @@ -24,8 +24,7 @@ export class WebNotificationsService { private animationController: AnimationController, private platform: Platform, private router: Router, - private toastService: ToastService, - private zone: NgZone) { } + private toastService: ToastService) { } webconnection() { 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..409e85bf9 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -50,7 +50,7 @@ export class PedidosPage implements OnInit { public ThemeService: ThemeService ) { this.profile = 'mdgpr'; - } + } ngOnInit() { @@ -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