diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html index d1367e163..926e82416 100644 --- a/src/app/modals/profile/profile.page.html +++ b/src/app/modals/profile/profile.page.html @@ -55,6 +55,7 @@
+ {{notificationStatus}} @@ -80,8 +81,8 @@

{{item.dateEnd}}

-

{{item.Location}}

{{item.title}}

+

{{item.Location}}

{{item.body}}

diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index 3172432d5..4afecfd00 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -38,6 +38,7 @@ export class ProfilePage implements OnInit { environment = environment taskExist = true; taskNotExist = false; + isloading = false; SessionStore = SessionStore; @@ -189,6 +190,7 @@ export class ProfilePage implements OnInit { console.log(index, i) if(Service === "agenda") { + this.isloading = true this.eventsService.getEvent(IdObject).subscribe((task) => { if (Service === "agenda" && IdObject.length > 10) { @@ -201,13 +203,15 @@ export class ProfilePage implements OnInit { } this.deleteNotification(index); + this.isloading = false }, (error) => { this.notificationdata[i].read = true; + this.isloading = false }) } else if (Service === "gabinete-digital") { - + this.isloading = true this.processesService.GetTask(IdObject).subscribe((task) => { if (Service === "gabinete-digital" && Object === "expedientes") { @@ -228,9 +232,11 @@ export class ProfilePage implements OnInit { } this.deleteNotification(index); + this.isloading = false }, (error) => { this.notificationdata[i].read = true; + this.isloading = false }) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 75eaa0a5f..f728f63fa 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -196,7 +196,7 @@
- Todas + Todos...
Pessoais diff --git a/src/assets/images/ministro.png b/src/assets/images/ministro.png index 74f15e1d7..286fa3d72 100644 Binary files a/src/assets/images/ministro.png and b/src/assets/images/ministro.png differ diff --git a/src/assets/images/presidente.png b/src/assets/images/presidente.png index 4049a501f..4ff72d771 100644 Binary files a/src/assets/images/presidente.png and b/src/assets/images/presidente.png differ diff --git a/version/git-version.ts b/version/git-version.ts index 2bda589b1..f8181e39e 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "9aa7928d8", - "SHA": "9aa7928d897f10ae0aad37dc9d7ec111590e7d0d", + "shortSHA": "2ae96bda0", + "SHA": "2ae96bda02a39833995bc6005d5107a70d720b08", "branch": "developer-prod", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Aug 21 19:09:55 2023 +0100'", - "lastCommitMessage": "hide timeline events", - "lastCommitNumber": "5190", + "lastCommitTime": "'Tue Aug 22 08:35:44 2023 +0100'", + "lastCommitMessage": "fix date picker", + "lastCommitNumber": "5191", "change": "", - "changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/publications/edit-action/edit-action.page.ts\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts", + "changeStatus": "On branch developer-prod\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/assets/images/ministro.png\n\tmodified: src/assets/images/presidente.png", "changeAuthor": "peter.maquiran" } \ No newline at end of file