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

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "9aa7928d8",
+  "shortSHA": "2ae96bda0",
-  "SHA": "9aa7928d897f10ae0aad37dc9d7ec111590e7d0d",
+  "SHA": "2ae96bda02a39833995bc6005d5107a70d720b08",
   "branch": "developer-prod",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Aug 21 19:09:55 2023 +0100'",
+  "lastCommitTime": "'Tue Aug 22 08:35:44 2023 +0100'",
-  "lastCommitMessage": "hide timeline events",
+  "lastCommitMessage": "fix date picker",
-  "lastCommitNumber": "5190",
+  "lastCommitNumber": "5191",
   "change": "",
-  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" 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"
 }