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/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 1915b3bd8..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; @@ -269,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) @@ -290,12 +292,12 @@ export class GabineteDigitalPage implements OnInit, DoCheck { 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) { @@ -321,7 +323,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { (thedate.getMonth() + 1) + "/" + thedate.getFullYear(); } - + getCustomHours(thedate: Date) { return thedate.getHours() + ":" + thedate.getMinutes(); @@ -498,8 +500,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck { allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Diploma Assinado') } - console.log('allProcessesList', allProcessesList); - this.addProcessToDB(allProcessesList) this.skeletonLoader = true; @@ -529,8 +529,8 @@ export class GabineteDigitalPage implements OnInit, DoCheck { } this.allProcessesList.push(task); - this.allProcessesList = removeDuplicate(this.allProcessesList) - this.allProcessesList = this.sortArrayISODate(this.allProcessesList).reverse(); + this.allProcessesList = removeDuplicate(this.allProcessesList); + this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate') }); @@ -562,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"); @@ -581,7 +582,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck { 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); @@ -616,23 +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(); if (event) { setTimeout(() => {