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/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 f3076a18c..294d65f80 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "68c849d0e", - "SHA": "68c849d0ee02f2a0c171db7d67c953e919c90167", + "shortSHA": "dd1ba46b0", + "SHA": "dd1ba46b0d1ee7bf71b440bc76657ab208659ba4", "branch": "developer-prod", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Aug 21 12:22:19 2023 +0100'", + "lastCommitTime": "'Mon Aug 21 12:27:17 2023 +0100'", "lastCommitMessage": "replicate contact function", - "lastCommitNumber": "5177", + "lastCommitNumber": "5187", "change": "", - "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: android/app/src/main/AndroidManifest.xml\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.scss\n\tmodified: src/app/tiny-mce/tiny-mce.page.html\n\tnew file: src/assets/images/md.webp\n\tnew file: src/assets/images/ministro.png\n\tnew file: src/assets/images/presidente.png\n\tnew file: src/assets/images/secretaria_geral.png\n\tnew file: src/assets/images/sg.jpeg\n\tmodified: version/git-version.ts", - "changeAuthor": "peter.maquiran" + "changeStatus": "On branch developer-prod\nYour branch is behind 'origin/developer-prod' by 1 commit, 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/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/assets/images/ministro.png\n\tmodified: src/assets/images/presidente.png", + "changeAuthor": "eudes.inacio" } \ No newline at end of file