diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index c569b3348..b1a22e222 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -281,22 +281,15 @@ export class GabineteDigitalPage implements OnInit { checkFilter() { - const params: any = new Proxy(new URLSearchParams(window.location.search), { - get: (searchParams: any, prop: any) => searchParams.get(prop), - }); - const filter = params.filter - - if(filter == 'ForToDay') { + if(this.router.url.includes('ForToDay')) { this.filterName = 'Para hoje' - } else if (filter == 'OverdueTasks') { + } else if (this.router.url.includes('OverdueTasks')) { this.filterName = 'OverdueTasks' - } else if (filter == 'New') { + } else if (this.router.url.includes('New')) { this.filterName = 'Novos' - } else if (filter == 'unread') { + } else if (this.router.url.includes('unread')) { this.filterName = 'Não lidos' - } else { - console.log('filter', filter) } } @@ -443,7 +436,7 @@ export class GabineteDigitalPage implements OnInit { checkRoutes() { this.closeAllDesktopComponents(); - if (this.router.url == '/home/gabinete-digital?processes=true') { + if (this.router.url == 'processes=true') { this.openAllProcessesPage(); this.selectedElement = 'allProcessesTag'; } diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 76677bef6..79d25185d 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -70,7 +70,7 @@ export class TaskService { } overdueTask(isoDateString:string) { - return (new Date()).getTime() < (new Date(isoDateString)).getTime() + return (new Date()).getTime() > (new Date(isoDateString)).getTime() } lessThen24Hours(isoDateString:string) { diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html index fe4582e46..39db70c98 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html @@ -43,7 +43,7 @@ - + { - if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) { - if (window.location.pathname.startsWith('/home/gabinete-digital')) { - this.refreshing(); - this.checkFilter(); - } + if (event instanceof NavigationEnd && event.url.includes('/home/gabinete-digital')) { + this.refreshing(); + this.checkFilter(); } }); + + } checkFilter() { - const params: any = new Proxy(new URLSearchParams(window.location.search), { - get: (searchParams: any, prop: any) => searchParams.get(prop), - }); - - const filter = params.filter - if(filter == 'ForToDay') { + console.log(this.router.url) + if(this.router.url.includes('ForToDay')) { this.filterName = 'Para hoje' - } else if (filter == 'OverdueTasks') { + } else if (this.router.url.includes('OverdueTasks')) { this.filterName = 'OverdueTasks' - } else if (filter == 'New') { + } else if (this.router.url.includes('New')) { this.filterName = 'Novos' - } else if (filter == 'unread') { + } else if (this.router.url.includes('unread')) { this.filterName = 'Não lidos' } else { - console.log('filter', filter) + console.log('else uiuuiu') } - } + doRefresh(event) { if (event) { setTimeout(() => { diff --git a/version/git-version.ts b/version/git-version.ts index c85eaa75a..19063e787 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "955640e42", - "SHA": "955640e42e17fade6bd2f63de39dbed382529913", + "shortSHA": "bd13431c6", + "SHA": "bd13431c6a721b71bebe7c9d362de827240d8ccc", "branch": "feature/gabineteLabels", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Apr 17 16:00:30 2023 +0100'", - "lastCommitMessage": "centralize service", - "lastCommitNumber": "4912", - "change": "", - "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.html", + "lastCommitTime": "'Mon Apr 17 16:40:17 2023 +0100'", + "lastCommitMessage": "fix agenda", + "lastCommitNumber": "4913", + "change": "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\nindex 8e8a91b87..0012d26fc 100644\n--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n@@ -61,8 +61,6 @@ export class AllProcessesPage implements OnInit {\n \n \n checkFilter() {\n-\n- console.log(this.router.url)\n if(this.router.url.includes('ForToDay')) {\n this.filterName = 'Para hoje'\n } else if (this.router.url.includes('OverdueTasks')) {\n@@ -71,8 +69,6 @@ export class AllProcessesPage implements OnInit {\n this.filterName = 'Novos'\n } else if (this.router.url.includes('unread')) {\n this.filterName = 'Não lidos'\n- } else {\n- console.log('else uiuuiu')\n }\n }", + "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file