mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 13:26:08 +00:00
loader added to notifications
This commit is contained in:
@@ -55,6 +55,7 @@
|
|||||||
</ion-buttons>
|
</ion-buttons>
|
||||||
</div>
|
</div>
|
||||||
<div class="line"></div>
|
<div class="line"></div>
|
||||||
|
<ion-progress-bar type="indeterminate" *ngIf="isloading"></ion-progress-bar>
|
||||||
<ion-label (click)="asyncNotification()" *ngIf="notificationdata">{{notificationStatus}}</ion-label>
|
<ion-label (click)="asyncNotification()" *ngIf="notificationdata">{{notificationStatus}}</ion-label>
|
||||||
</div>
|
</div>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
@@ -80,8 +81,8 @@
|
|||||||
<p *ngIf = "item.Service == 'agenda'">{{item.dateEnd}}</p>
|
<p *ngIf = "item.Service == 'agenda'">{{item.dateEnd}}</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="approve-event-detail">
|
<div class="approve-event-detail">
|
||||||
<p *ngIf = "item.Service == 'agenda'">{{item.Location}}</p>
|
|
||||||
<h3 id="profile-title">{{item.title}}</h3>
|
<h3 id="profile-title">{{item.title}}</h3>
|
||||||
|
<p *ngIf = "item.Service == 'agenda'">{{item.Location}}</p>
|
||||||
<p id="profile-title" *ngIf = "item.Service != 'agenda'">{{item.body}}</p>
|
<p id="profile-title" *ngIf = "item.Service != 'agenda'">{{item.body}}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ export class ProfilePage implements OnInit {
|
|||||||
environment = environment
|
environment = environment
|
||||||
taskExist = true;
|
taskExist = true;
|
||||||
taskNotExist = false;
|
taskNotExist = false;
|
||||||
|
isloading = false;
|
||||||
|
|
||||||
|
|
||||||
SessionStore = SessionStore;
|
SessionStore = SessionStore;
|
||||||
@@ -189,6 +190,7 @@ export class ProfilePage implements OnInit {
|
|||||||
console.log(index, i)
|
console.log(index, i)
|
||||||
|
|
||||||
if(Service === "agenda") {
|
if(Service === "agenda") {
|
||||||
|
this.isloading = true
|
||||||
this.eventsService.getEvent(IdObject).subscribe((task) => {
|
this.eventsService.getEvent(IdObject).subscribe((task) => {
|
||||||
|
|
||||||
if (Service === "agenda" && IdObject.length > 10) {
|
if (Service === "agenda" && IdObject.length > 10) {
|
||||||
@@ -201,13 +203,15 @@ export class ProfilePage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.deleteNotification(index);
|
this.deleteNotification(index);
|
||||||
|
this.isloading = false
|
||||||
|
|
||||||
}, (error) => {
|
}, (error) => {
|
||||||
this.notificationdata[i].read = true;
|
this.notificationdata[i].read = true;
|
||||||
|
this.isloading = false
|
||||||
})
|
})
|
||||||
|
|
||||||
} else if (Service === "gabinete-digital") {
|
} else if (Service === "gabinete-digital") {
|
||||||
|
this.isloading = true
|
||||||
this.processesService.GetTask(IdObject).subscribe((task) => {
|
this.processesService.GetTask(IdObject).subscribe((task) => {
|
||||||
|
|
||||||
if (Service === "gabinete-digital" && Object === "expedientes") {
|
if (Service === "gabinete-digital" && Object === "expedientes") {
|
||||||
@@ -228,9 +232,11 @@ export class ProfilePage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.deleteNotification(index);
|
this.deleteNotification(index);
|
||||||
|
this.isloading = false
|
||||||
|
|
||||||
}, (error) => {
|
}, (error) => {
|
||||||
this.notificationdata[i].read = true;
|
this.notificationdata[i].read = true;
|
||||||
|
this.isloading = false
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 53 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 67 KiB |
@@ -1,12 +1,12 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "68c849d0e",
|
"shortSHA": "dd1ba46b0",
|
||||||
"SHA": "68c849d0ee02f2a0c171db7d67c953e919c90167",
|
"SHA": "dd1ba46b0d1ee7bf71b440bc76657ab208659ba4",
|
||||||
"branch": "developer-prod",
|
"branch": "developer-prod",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"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",
|
"lastCommitMessage": "replicate contact function",
|
||||||
"lastCommitNumber": "5177",
|
"lastCommitNumber": "5187",
|
||||||
"change": "",
|
"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",
|
"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 <file>...\" 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": "peter.maquiran"
|
"changeAuthor": "eudes.inacio"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user