Fixing calendar.

Author: renemadsen

eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-plannings-container/time-plannings-container.component.ts

@@ -74,6 +74,7 @@ export class TimePlanningsContainerComponent implements OnInit, OnDestroy {
 
   getPlannings() {
     const now = new Date();
+    now.setHours(0, 0, 0, 0);
     if (!this.dateFrom) {
       this.dateFrom = startOfWeek(now, { weekStartsOn: 1 });
       this.dateTo = endOfWeek(now, { weekStartsOn: 1 });
@@ -104,9 +105,9 @@ export class TimePlanningsContainerComponent implements OnInit, OnDestroy {
     const tempEndDate = new Date(this.dateTo);
     tempEndDate.setHours(0, 0, 0, 0);
 
-    let daysCount = Math.ceil((tempEndDate.getTime() - this.dateFrom.getTime()) / (1000 * 3600 * 24)) * -1;
-    this.dateFrom = this.addDays(this.dateFrom, -7);
-    this.dateTo = this.addDays(this.dateTo, -7);
+    let daysCount = (Math.floor((tempEndDate.getTime() - this.dateFrom.getTime()) / (1000 * 3600 * 24)) * -1) -1;
+    this.dateFrom = this.addDays(this.dateFrom, daysCount);
+    this.dateTo = this.addDays(this.dateTo, daysCount);
     this.getPlannings();
   }
 
@@ -125,9 +126,9 @@ export class TimePlanningsContainerComponent implements OnInit, OnDestroy {
   goForward() {
     const tempEndDate = new Date(this.dateTo);
     tempEndDate.setHours(0, 0, 0, 0);
-    let daysCount = Math.ceil((tempEndDate.getTime() - this.dateFrom.getTime()) / (1000 * 3600 * 24));
-    this.dateFrom = this.addDays(this.dateFrom, +7);
-    this.dateTo = this.addDays(this.dateTo, +7);
+    let daysCount = Math.floor((tempEndDate.getTime() - this.dateFrom.getTime()) / (1000 * 3600 * 24)) +1;
+    this.dateFrom = this.addDays(this.dateFrom, daysCount);
+    this.dateTo = this.addDays(this.dateTo, daysCount);
     this.getPlannings();
   }
 

eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-plannings-table/time-plannings-table.component.ts

@@ -78,7 +78,8 @@ export class TimePlanningsTableComponent implements OnInit, OnChanges {
     const today = new Date();
     const tempEndDate = new Date(endDate);
     tempEndDate.setHours(0, 0, 0, 0);
-    let daysCount = Math.ceil((tempEndDate.getTime() - startDate.getTime()) / (1000 * 3600 * 24)) +1;
+    const diff = (tempEndDate.getTime() - startDate.getTime()) / (1000 * 3600 * 24);
+    let daysCount = Math.floor(diff) +1;
     let todayTranslated = this.translateService.stream('Today');
 
     this.tableHeaders = [