diff --git a/src/app/scheduling/daterangepicker/daterangepicker-mode/daterangepicker-mode.scss b/src/app/scheduling/daterangepicker/daterangepicker-mode/daterangepicker-mode.scss index 9472b3df13..959c0d29d4 100644 --- a/src/app/scheduling/daterangepicker/daterangepicker-mode/daterangepicker-mode.scss +++ b/src/app/scheduling/daterangepicker/daterangepicker-mode/daterangepicker-mode.scss @@ -2,4 +2,5 @@ display: block; padding: 1rem; max-width: 600px; + --ig-size: var(--ig-size-small); } diff --git a/src/app/scheduling/daterangepicker/daterangepicker-range-buttons/daterangepicker-range-buttons.html b/src/app/scheduling/daterangepicker/daterangepicker-range-buttons/daterangepicker-range-buttons.html index 424393f66d..ef641f89a1 100644 --- a/src/app/scheduling/daterangepicker/daterangepicker-range-buttons/daterangepicker-range-buttons.html +++ b/src/app/scheduling/daterangepicker/daterangepicker-range-buttons/daterangepicker-range-buttons.html @@ -1,11 +1,9 @@
- - - - +
diff --git a/src/app/scheduling/daterangepicker/daterangepicker-range-buttons/daterangepicker-range-buttons.scss b/src/app/scheduling/daterangepicker/daterangepicker-range-buttons/daterangepicker-range-buttons.scss index 18f53573f8..07f01f81f8 100644 --- a/src/app/scheduling/daterangepicker/daterangepicker-range-buttons/daterangepicker-range-buttons.scss +++ b/src/app/scheduling/daterangepicker/daterangepicker-range-buttons/daterangepicker-range-buttons.scss @@ -2,27 +2,5 @@ display: block; padding: 1rem; max-width: 600px; - - ::ng-deep { - igx-calendar-container { - display: flex; - flex-direction: row-reverse; - } - - #actions { - display: flex; - flex-direction: column; - justify-content: flex-end; - margin: 0 10px; - - button { - margin: 6px 0; - } - - button:last-of-type { - margin: 24px 0 18px 0; - } - } - } + --ig-size: var(--ig-size-small); } - \ No newline at end of file diff --git a/src/app/scheduling/daterangepicker/daterangepicker-range-buttons/daterangepicker-range-buttons.ts b/src/app/scheduling/daterangepicker/daterangepicker-range-buttons/daterangepicker-range-buttons.ts index 0f56ccea9e..da5c15c390 100644 --- a/src/app/scheduling/daterangepicker/daterangepicker-range-buttons/daterangepicker-range-buttons.ts +++ b/src/app/scheduling/daterangepicker/daterangepicker-range-buttons/daterangepicker-range-buttons.ts @@ -1,5 +1,5 @@ import { Component, ElementRef, OnInit, ViewChild, inject } from '@angular/core'; -import { DateRange, IgxDateRangePickerComponent, OverlaySettings, IgxPickerActionsDirective, IgxButtonDirective } from 'igniteui-angular'; +import { DateRange, IgxDateRangePickerComponent, OverlaySettings, IgxPickerActionsDirective, IgxButtonDirective, IChangeCheckboxEventArgs, CustomDateRange } from 'igniteui-angular'; import { FormsModule } from '@angular/forms'; @Component({ @@ -19,16 +19,26 @@ export class DateRangePickerRangeButtonsComponent { end: new Date(new Date().setDate(new Date().getDate() + 2)) }; + public today = new Date(); + + public nextSeven = new Date( + this.today.getFullYear(), + this.today.getMonth(), + this.today.getDate() + 7 + ); + + public customRanges: CustomDateRange[] = [ + { + label: 'Next 7 days', + dateRange: { + start: this.today, + end: this.nextSeven + } + } + ]; + public overlaySettings: OverlaySettings = { outlet: this.element, modal: true }; - - public selectDays(count: number) { - const today: Date = new Date(); - this.range = { - start: new Date(new Date().setDate(today.getDate() - count + 1)), - end: today - }; - } }