Merge pull request #7559 from IgniteUI/nrobakova/fix-issue-7055-82

Fix not ending while in generateDateRange method

Author: rkaraivanov

projects/igniteui-angular/src/lib/calendar/calendar-base.ts

@@ -375,7 +375,7 @@ export class IgxCalendarBase implements ControlValueAccessor {
         const result = [];
         start = this.getDateOnly(start);
         end = this.getDateOnly(end);
-        while (start.getTime() !== end.getTime()) {
+        while (start.getTime() < end.getTime()) {
             start = this.calendarModel.timedelta(start, 'day', 1);
             result.push(start);
         }

projects/igniteui-angular/src/lib/calendar/calendar.component.spec.ts

@@ -1056,8 +1056,9 @@ describe('IgxCalendar', () => {
         const fixture = TestBed.createComponent(IgxCalendarDisabledSpecialDatesComponent);
         fixture.detectChanges();
         const calendar = fixture.componentInstance.calendar;
-        expect(calendar.specialDates).toEqual([{type: DateRangeType.Between, dateRange: [new Date(2017, 5, 1), new Date(2017, 5, 6)]}]);
-        expect(calendar.disabledDates).toEqual([{type: DateRangeType.Between, dateRange: [new Date(2017, 5, 23), new Date(2017, 5, 29)]}]);
+        expect(calendar.specialDates).toEqual([{ type: DateRangeType.Between, dateRange: [new Date(2017, 5, 1), new Date(2017, 5, 6)] }]);
+        expect(calendar.disabledDates)
+            .toEqual([{ type: DateRangeType.Between, dateRange: [new Date(2017, 5, 23), new Date(2017, 5, 29)] }]);
         let specialDates = calendar.daysView.dates.toArray().filter(d => {
             const dateTime = getDate(d).getTime();
             return (dateTime >= new Date(2017, 5, 1).getTime() &&
@@ -1080,13 +1081,13 @@ describe('IgxCalendar', () => {
         });
 
         // change Inputs
-        fixture.componentInstance.disabledDates = [{type: DateRangeType.Before, dateRange: [new Date(2017, 5, 10)]}];
-        fixture.componentInstance.specialDates = [{type: DateRangeType.After, dateRange: [new Date(2017, 5, 19)]}];
+        fixture.componentInstance.disabledDates = [{ type: DateRangeType.Before, dateRange: [new Date(2017, 5, 10)] }];
+        fixture.componentInstance.specialDates = [{ type: DateRangeType.After, dateRange: [new Date(2017, 5, 19)] }];
         fixture.detectChanges();
 
-        expect(calendar.disabledDates).toEqual([{type: DateRangeType.Before, dateRange: [new Date(2017, 5, 10)]}]);
-        expect(calendar.specialDates).toEqual([{type: DateRangeType.After, dateRange: [new Date(2017, 5, 19)]}]);
-         specialDates = calendar.daysView.dates.toArray().filter(d => {
+        expect(calendar.disabledDates).toEqual([{ type: DateRangeType.Before, dateRange: [new Date(2017, 5, 10)] }]);
+        expect(calendar.specialDates).toEqual([{ type: DateRangeType.After, dateRange: [new Date(2017, 5, 19)] }]);
+        specialDates = calendar.daysView.dates.toArray().filter(d => {
             const dateTime = getDate(d).getTime();
             return (dateTime >= new Date(2017, 5, 20).getTime());
         });
@@ -2068,8 +2069,8 @@ export class IgxCalendaRangeComponent {
 export class IgxCalendarDisabledSpecialDatesComponent {
     public model: Date | Date[] = new Date(2017, 5, 23);
     public viewDate = new Date(2017, 5, 13);
-    public specialDates = [{type: DateRangeType.Between, dateRange: [new Date(2017, 5, 1), new Date(2017, 5, 6)]}];
-    public disabledDates = [{type: DateRangeType.Between, dateRange: [new Date(2017, 5, 23), new Date(2017, 5, 29)]}];
+    public specialDates = [{ type: DateRangeType.Between, dateRange: [new Date(2017, 5, 1), new Date(2017, 5, 6)] }];
+    public disabledDates = [{ type: DateRangeType.Between, dateRange: [new Date(2017, 5, 23), new Date(2017, 5, 29)] }];
     @ViewChild(IgxCalendarComponent, { static: true }) public calendar: IgxCalendarComponent;
 }