merge

src/app/modals/profile/profile.page.html

@@ -55,6 +55,7 @@
       </ion-buttons>
     </div>
     <div class="line"></div>
+    <ion-progress-bar type="indeterminate" *ngIf="isloading"></ion-progress-bar>
     <ion-label (click)="asyncNotification()" *ngIf="notificationdata">{{notificationStatus}}</ion-label>
   </div>
 </ion-header>
@@ -80,8 +81,8 @@
               <p *ngIf = "item.Service == 'agenda'">{{item.dateEnd}}</p>
             </div>
             <div class="approve-event-detail">
-              <p *ngIf = "item.Service == 'agenda'">{{item.Location}}</p>
               <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>
             </div>
           </div>

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
       })
 
 

src/app/pages/agenda/agenda.page.html

@@ -196,7 +196,7 @@
             </ion-row>
 
             <div style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Combinado')" [class.active]="segment == 'Combinado' ">
-              Todas
+              Todos...
             </div>
             <div style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer"  (click)="changeSegment('Pessoal')" [class.active]="segment == 'Pessoal' ">
               Pessoais