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 4f57e977a..768e4222a 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 @@ -20,7 +20,7 @@ import { SessionStore } from 'src/app/store/session.service'; }) export class AllProcessesPage implements OnInit { - skeletonLoader = true; + skeletonLoader = false; allProcessesList: any[] = []; loggeduser: LoginUserRespose; @@ -47,11 +47,11 @@ export class AllProcessesPage implements OnInit { // this.loadAllProcesses(); this.updateAllProcess() + this.router.events.forEach((event) => { if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) { - if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { + if (window.location.pathname.startsWith('/home/gabinete-digital')) { this.refreshing(); - this.updateAllProcess() } else { // this.loadAllProcesses(); } @@ -62,14 +62,14 @@ export class AllProcessesPage implements OnInit { doRefresh() { setTimeout(() => { - + this.updateAllProcess(); }, 1000); } refreshing() { setTimeout(() => { - // this.loadAllProcesses(); + this.updateAllProcess(); }, 1000); } diff --git a/version/git-version.ts b/version/git-version.ts index 9c78769c9..86109465c 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "0144b306a", - "SHA": "0144b306a87b09f30811af394d85fd2c3942e894", + "shortSHA": "e9de468b9", + "SHA": "e9de468b9b5dfd61c4b34a30e59de77c2a432953", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes InĂ¡cio'", - "lastCommitTime": "'Wed Jan 18 17:07:25 2023 +0100'", - "lastCommitMessage": "Text change to doneIT", - "lastCommitNumber": "4652", + "lastCommitTime": "'Thu Jan 19 09:51:21 2023 +0100'", + "lastCommitMessage": "pull of Peter changes", + "lastCommitNumber": "4657", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 4 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: .gitignore\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tnew file: src/app/pages/gabinete-digital/list.worker.js\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/attachments.service.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/chat/chat-methods.service.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/rochet-chat-connector.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/contacts.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/organic-entity.service.ts\n\tmodified: src/app/services/publications.service.ts\n\tmodified: src/app/services/search.service.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/environments/environment.prod.ts\n\tnew file: version/git-static-version.ts", + "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 3 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file