Merge branch 'develop_bitOut' into consoleCle

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

@@ -398,12 +398,6 @@ export class AgendaPage implements OnInit {
         const profile_ = element.profile == 'md' ? 'mdgpr' : 'pr';
         const eventtype = element.event.CalendarName;
 
-
-        // if (startTimeSamp < endTimeSamp && endDay == 29  && (endMinutes + endHours) == 0) {
-        //   // 
-        //   classs.push(`calendar-event-border`);
-        // }
-
         classs.push(`calendar-event-border calendar-${profile_}-event-type-${eventtype}`);
 
       });
@@ -497,14 +491,37 @@ export class AgendaPage implements OnInit {
 
   }
 
+  loadRequest: any = {}
+  loadRequestHistory: any = {}
+
   loadRangeEvents(startTime: Date, endTime: Date) {
     this.array = [];
+    this.rangeStartDate = startTime
+    this.rangeEndDate = endTime
+    this.showLoader = true;
 
+    const index = `${startTime}${endTime}`
+    if(!this.loadRequest[index]) {
+      this.loadRequest[index] = {startTime, endTime}
+      this.loadRequestHistory[index] = {lastTimeUpdate: new Date()}
+
+      this.loadRangeEventRun(startTime, endTime)
+    } else {
+      // console.log('dont call')
+    }
+  }
+
+  deleteLoadRangeEvent(startTime: Date, endTime: Date) {
+    const index = `${startTime}${endTime}`
+    delete this.loadRequest[index]
+  }
+
+  loadRangeEventRun(startTime: Date, endTime: Date) {
+    this.array = [];
     this.rangeStartDate = startTime
     this.rangeEndDate = endTime
 
     this.showLoader = true;
-
     if (window.innerWidth < 800) {
 
       if (this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
@@ -535,6 +552,7 @@ export class AgendaPage implements OnInit {
             this.getFromDB();
           }).finally(() => {
             this.showLoader = false;
+            this.deleteLoadRangeEvent(startTime, endTime)
           })
 
       }
@@ -562,6 +580,7 @@ export class AgendaPage implements OnInit {
           this.getFromDB()
         })
         .finally(() => {
+          this.deleteLoadRangeEvent(startTime, endTime)
           this.showLoader = false;
         })
 
@@ -594,6 +613,7 @@ export class AgendaPage implements OnInit {
             this.getFromDB()
           })
           .finally(() => {
+            this.deleteLoadRangeEvent(startTime, endTime)
             this.showLoader = false;
           })
       } else if (this.loggeduser.Profile != 'PR' && this.loggeduser.Profile != 'MDGPR'){
@@ -627,6 +647,7 @@ export class AgendaPage implements OnInit {
             console.error(error)
             this.getFromDB();
           }).finally(() => {
+            this.deleteLoadRangeEvent(startTime, endTime)
             this.showLoader = false;
           })
 
@@ -652,6 +673,7 @@ export class AgendaPage implements OnInit {
             console.error(error)
             this.getFromDB()
           }).finally(() => {
+            this.deleteLoadRangeEvent(startTime, endTime)
             this.showLoader = false;
           })
 
@@ -693,6 +715,7 @@ export class AgendaPage implements OnInit {
           console.error(error)
           this.getFromDB()
         }).finally(() => {
+          this.deleteLoadRangeEvent(startTime, endTime)
           counter++;
           if (counter == 2) {
             this.showLoader = false;
@@ -728,6 +751,7 @@ export class AgendaPage implements OnInit {
         }).catch((error) => {
           this.getFromDB()
         }).finally(() => {
+          this.deleteLoadRangeEvent(startTime, endTime)
             counter++;
           if (counter == 2) {
             this.showLoader = false;
@@ -765,6 +789,7 @@ export class AgendaPage implements OnInit {
             console.error(error)
             this.getFromDB()
           }).finally(() => {
+            this.deleteLoadRangeEvent(startTime, endTime)
             this.showLoader = false;
           })
         } else {
@@ -803,6 +828,7 @@ export class AgendaPage implements OnInit {
             console.error(error)
             this.getFromDB()
           }).finally(() => {
+            this.deleteLoadRangeEvent(startTime, endTime)
             counter++;
             if (counter == 2) {
               this.showLoader = false;
@@ -851,6 +877,7 @@ export class AgendaPage implements OnInit {
             this.getFromDB()
           })
             .finally(() => {
+              this.deleteLoadRangeEvent(startTime, endTime)
               counter++;
               if (counter == 2) {
                 this.showLoader = false;
@@ -970,7 +997,7 @@ export class AgendaPage implements OnInit {
         this.showTimeline = true;
       })
     } else {
-      this.sqliteservice.getAllEvents().then((events: any[]) => {
+      this.sqliteservice.getAllEvents().then((events: any[] = []) => {
         
         let eventArray = [];
 
@@ -992,22 +1019,20 @@ export class AgendaPage implements OnInit {
 
   getEventsFromDB () {
 
-    new Promise((resolve, reject)=>{
+    new Promise((resolve, reject) => {
       if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
         this.storage.get('agendaResponse').then((events) => {
           resolve(events)
         })
       } else {
-        this.sqliteservice.getAllEvents().then((events: any[]) => {
+        this.sqliteservice.getAllEvents().then((events: any[] = []) => {
           resolve(events)
-  
         })
       }
     }).catch ((error) => {
       console.error(error);
     });
     
-
   }
 
   updateEventListBox() {
@@ -1209,20 +1234,26 @@ export class AgendaPage implements OnInit {
 
   openAddEventDismiss(data) {
 
-    let postEvent: Event = data;
-    if (postEvent.Subject != null) {
-      // this.eventSource.push({
-      //   title: postEvent.Subject,
-      //   startTime: new Date(postEvent.StartDate),
-      //   endTime: new Date(postEvent.EndDate),
-      //   allDay: false,
-      //   event: postEvent
-      // });
-      this.myCal.update();
-      this.myCal.loadEvents();
-      this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+    try {
+    
+      let postEvent: Event = data;
+      if (postEvent.Subject != null) {
+        // this.eventSource.push({
+        //   title: postEvent.Subject,
+        //   startTime: new Date(postEvent.StartDate),
+        //   endTime: new Date(postEvent.EndDate),
+        //   allDay: false,
+        //   event: postEvent
+        // });
+        this.myCal.update();
+        this.myCal.loadEvents();
+        this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+      }
+    } catch (error)  {
+
     }
 
+
     this.cloneAllmobileComponent();
   }
 

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

@@ -103,6 +103,11 @@ export class NewEventPage implements OnInit {
     this.selectedDate = this.navParams.get('eventSelectedDate');
     this.taskParticipants = this.navParams.get('attendees');
 
+
+    if(this.eventService.calendarNamesAry['Meu calendario']) {
+      this.CalendarName = 'Meu calendario'
+    }
+
   }
 
   ngOnInit() {

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

@@ -143,7 +143,7 @@ export class ViewEventPage implements OnInit {
           resolve(events)
         })
       } else {
-        this.sqliteservice.getAllEvents().then((events: any[]) => {
+        this.sqliteservice.getAllEvents().then((events: any[] = []) => {
           resolve(events)
   
         })