diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index 6f5813bf9..ef1b57221 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -140,6 +140,7 @@ export class NotificationsService { this.eventtrigger.publishSomeData({ notification: "recive" }) + } ); @@ -174,6 +175,7 @@ export class NotificationsService { console.log(result); + this.storageService.store("Notifications", result) diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 0b0b23e3b..d6ef06ae1 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -311,9 +311,9 @@ export class TaskService { async loadEventosParaAprovacao() { this.showLoaderNum++ - + console.log('PR') // PR dont have event to approve - if(this.SessionStore.user.Profile != 'PR') { + /* if(this.SessionStore.user.Profile != 'PR') { */ try { for(let calendar of this.eventService.calendarNamesAry) { if(calendar == 'Meu calendario') { @@ -345,7 +345,7 @@ export class TaskService { } catch (error) { } - } + /* } */ this.showLoaderNum-- diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index 7332bfed3..0514803d9 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -96,9 +96,9 @@ export class EventListPage implements OnInit { async LoadToApproveEvents() { - if(SessionStore.user.Profile == 'PR') { + /* if(SessionStore.user.Profile == 'PR') { return false - } + } */ this.showLoader = true; diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 0af966ca9..302c8cc42 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -77,7 +77,7 @@ export class HeaderPage implements OnInit { async ngOnInit() { this.hideSearch(); - this.notificationLengthData(); + /* this.notificationLengthData(); */ this.getProfilpicture(); } @@ -115,7 +115,7 @@ export class HeaderPage implements OnInit { await this.storageservice.get("Notifications").then((value) => { - /* var data = JSON.parse(value); */ + this.notificationLength = value.length; }).catch((error) => { diff --git a/version/git-version.ts b/version/git-version.ts index 42503e6cf..1239062c1 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "1f2d76d89", - "SHA": "1f2d76d8955bd430aba5094d9b567428bf8600aa", + "shortSHA": "3d986e864", + "SHA": "3d986e864cc30706b5022aa59325cfe2b8c466ab", "branch": "developer-prod", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Mon Aug 28 17:28:09 2023 +0100'", - "lastCommitMessage": "profile picture click added", - "lastCommitNumber": "5221", + "lastCommitTime": "'Tue Aug 29 16:05:32 2023 +0100'", + "lastCommitMessage": "profile picture done", + "lastCommitNumber": "5230", "change": "", - "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 5 and 8 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/document-detail/document-detail.page.scss\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.ts\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.scss\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.scss\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.scss\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.scss\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/services/agenda/list-box.service.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.scss\n\tmodified: src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss\n\tmodified: src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.scss\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.scss\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified: src/global.scss\n\tmodified: src/theme/variables.scss\n\tmodified: tsconfig.json\n\tmodified: workspace.code-workspace", + "changeStatus": "On branch developer-prod\nYour branch is behind 'origin/developer-prod' by 4 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/header/header.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file