fix(week-view): handle excluding non consecutive days

Fixes #973

Author: mattlewis92

projects/angular-calendar/src/modules/common/util.ts

@@ -147,24 +147,25 @@ export function getWeekViewPeriod(
   let viewStart = daysInWeek
     ? dateAdapter.startOfDay(viewDate)
     : dateAdapter.startOfWeek(viewDate, { weekStartsOn });
-  if (excluded.indexOf(dateAdapter.getDay(viewStart)) > -1) {
-    viewStart = dateAdapter.subDays(
-      addDaysWithExclusions(dateAdapter, viewStart, 1, excluded),
-      1
-    );
+  const endOfWeek = dateAdapter.endOfWeek(viewDate, { weekStartsOn });
+  while (
+    excluded.indexOf(dateAdapter.getDay(viewStart)) > -1 &&
+    viewStart < endOfWeek
+  ) {
+    viewStart = dateAdapter.addDays(viewStart, 1);
   }
   if (daysInWeek) {
     const viewEnd = dateAdapter.endOfDay(
       addDaysWithExclusions(dateAdapter, viewStart, daysInWeek - 1, excluded)
     );
     return { viewStart, viewEnd };
   } else {
-    let viewEnd = dateAdapter.endOfWeek(viewDate, { weekStartsOn });
-    if (excluded.indexOf(dateAdapter.getDay(viewEnd)) > -1) {
-      viewEnd = dateAdapter.addDays(
-        addDaysWithExclusions(dateAdapter, viewEnd, -1, excluded),
-        1
-      );
+    let viewEnd = endOfWeek;
+    while (
+      excluded.indexOf(dateAdapter.getDay(viewEnd)) > -1 &&
+      viewEnd > viewStart
+    ) {
+      viewEnd = dateAdapter.subDays(viewEnd, 1);
     }
     return { viewStart, viewEnd };
   }

projects/angular-calendar/test/calendar-week-view.component.spec.ts

@@ -99,6 +99,28 @@ describe('calendarWeekView component', () => {
     fixture.destroy();
   });
 
+  it('should support excluding non consecutive days', () => {
+    const fixture: ComponentFixture<
+      CalendarWeekViewComponent
+    > = TestBed.createComponent(CalendarWeekViewComponent);
+    fixture.componentInstance.viewDate = new Date('2016-06-29');
+    fixture.componentInstance.excludeDays = [4, 6];
+    fixture.componentInstance.ngOnChanges({ viewDate: {} });
+    expect(fixture.componentInstance.days.length).to.equal(5);
+    fixture.destroy();
+  });
+
+  it('should support excluding all but 1 day', () => {
+    const fixture: ComponentFixture<
+      CalendarWeekViewComponent
+    > = TestBed.createComponent(CalendarWeekViewComponent);
+    fixture.componentInstance.viewDate = new Date('2016-06-29');
+    fixture.componentInstance.excludeDays = [0, 1, 2, 3, 4, 5];
+    fixture.componentInstance.ngOnChanges({ viewDate: {} });
+    expect(fixture.componentInstance.days.length).to.equal(1);
+    fixture.destroy();
+  });
+
   it('should generate the week view with default colors for events', () => {
     const fixture: ComponentFixture<
       CalendarWeekViewComponent