Fix missing loader

src/app/pages/agenda/agenda.page.ts

@@ -184,25 +184,27 @@ export class AgendaPage implements OnInit {
 
   ngOnInit() {
 
-    // const loader = this.toastService.loading()
-
     this.profile = "mdgpr";
 
     const pathname = window.location.pathname
 
-    let rrealoadCounter = 0
+    let realoadCounter = 0
 
     this.router.events.forEach((event) => {
 
       if(event instanceof NavigationEnd && event.url == pathname ) {
+
         if (this.segment == null) {
           this.segment = "Combinado";
         }
-        else if ( rrealoadCounter != 0) {
+        if ( realoadCounter != 0) {
+
           this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
-          rrealoadCounter++;
+          
         }
+        realoadCounter++;
       }
+
     });
 
     window.onresize = (event) => {
@@ -463,8 +465,6 @@ export class AgendaPage implements OnInit {
 
   loadRangeEvents(startTime: Date, endTime: Date){
           
-    console.log('==========================================================')
-
     this.eventSelectedDate = new Date(startTime);
 
     this.showLoader = true;
@@ -835,6 +835,11 @@ export class AgendaPage implements OnInit {
               this.showLoader = false;
             }
            
+        }).finally(()=>{
+          counter++;
+          if(counter==2) {
+            this.showLoader = false;
+          }
         })
 
         this.eventService.getAllSharedEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((response:any) => {
@@ -882,6 +887,11 @@ export class AgendaPage implements OnInit {
           this.showLoader = false;
         }
 
+        }).finally(()=>{
+          counter++;
+          if(counter==2) {
+            this.showLoader = false;
+          }
         })
 
 
@@ -956,20 +966,33 @@ export class AgendaPage implements OnInit {
         endTime: event.end
       })
 
+      // console.log(event.end.toISOString() ==  endDate.toISOString())
+      
       const day = (((new Date (event.start)).getDate())).toString().padStart(2,'0')
       
       event.manyDays = false
 
+
+      event.todayOnly = new Date(event.start).toLocaleDateString() == new Date(event.end).toLocaleDateString()
+
+     
+
       if(!days.hasOwnProperty(day)) {
         days[day] = []
       }
 
+      if (new Date(startDate).toLocaleDateString() != new Date(endDate).toLocaleDateString()) {
+        
+        console.log(new Date(startDate).toLocaleDateString(),'!=' , new Date(endDate).toLocaleDateString())
+        
         // difference
         const diffTime = Math.abs(endDate - startDate);
         const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24)); 
 
         if (diffDays <= 150 && !event.event.IsAllDayEvent  ) {
 
+          console.log(event)
+
           if (diffDays >= 1) {
             
             const StartEvent =  Object.assign({}, {
@@ -1081,6 +1104,10 @@ export class AgendaPage implements OnInit {
 
         }
 
+      } 
+
+      days[day].push(event)
+
     })
 
     setTimeout(()=>{

src/app/pages/agenda/new-event/new-event.page.html

@@ -196,7 +196,7 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
         </div>
-        <div  class="ion-input-class-no-height">
+        <div  class="ion-input-class-no-height" [class.input-error]="Form?.get('participantes')?.invalid  && validateFrom ">
           <div class="list-people">
             <ion-item lines="none">
               <ion-list>

src/app/pages/agenda/new-event/new-event.page.ts

@@ -213,9 +213,9 @@ export class NewEventPage implements OnInit {
       IsRecurring: new FormControl(this.postEvent.IsRecurring, [
         Validators.required
       ]),
-      // participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
+      participantes: new FormControl(this.taskParticipants, [
-      //   Validators.required
+        Validators.required
-      // ]),
+      ]),
 
     })
   }

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts

@@ -45,7 +45,7 @@ export class ApproveEventModalPage implements OnInit {
     private toastService: ToastService,
   ) {
 
-
+    alert('54321')
     this.activatedRoute.paramMap.subscribe(paramMap =>
     {
       if (!paramMap.has("serialNumber")){

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts

@@ -58,6 +58,7 @@ export class ApproveEventPage implements OnInit {
         this.caller = params["params"].caller;
       }
     });
+
   }
 
   ngOnInit() {
@@ -188,7 +189,6 @@ export class ApproveEventPage implements OnInit {
   }
   
   async getAttachments(instanceId:string) {
-    const loader = this.toastService.loading()
 
     try {
       this.loadedAttachments = await this.attachmentsService.getAttachmentsById(instanceId).toPromise();

src/app/services/events.service.ts

@@ -178,7 +178,6 @@ export class EventsService {
   }
 
   async getAllMdEvents(startdate:string, enddate:string) {
-    console.log('md once')
     let prO = await this.getAllMdOficialEvents(startdate, enddate).toPromise();
     let prP = await this.getAllMdPessoalEvents(startdate, enddate).toPromise();
     const resFinal = prO.concat(prP);
@@ -189,7 +188,6 @@ export class EventsService {
   }
 
   async getAllSharedEvents(startdate:string, enddate:string) {
-    console.log('pr once')
     let prO = await this.getAllSharedOficialEvents(startdate, enddate).toPromise();
     let prP = await this.getAllSharedPessoalEvents(startdate, enddate).toPromise();
     const resFinal = prO.concat(prP);

src/app/shared/agenda/approve-event/approve-event.page.ts

@@ -48,6 +48,7 @@ export class ApproveEventPage implements OnInit {
     private toastService: ToastService
   ) {
     // Event to approve list
+    alert('123')
 
   }