@datarailsshared/datarailsshared 1.4.69 → 1.4.72
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/datarailsshared-datarailsshared.umd.js +9 -3
- package/bundles/datarailsshared-datarailsshared.umd.js.map +1 -1
- package/datarailsshared-datarailsshared-1.4.72.tgz +0 -0
- package/datarailsshared-datarailsshared.metadata.json +1 -1
- package/esm2015/lib/dr-inputs/date-pickers/dr-date-picker/dr-date-picker.component.js +10 -5
- package/esm2015/lib/dr-inputs/date-pickers/dr-date-picker_custom-header/dr-date-picker_custom-header.component.js +3 -2
- package/esm2015/lib/dr-inputs/date-pickers/services/dr-date-picker.service.js +1 -1
- package/fesm2015/datarailsshared-datarailsshared.js +9 -3
- package/fesm2015/datarailsshared-datarailsshared.js.map +1 -1
- package/lib/dr-inputs/date-pickers/dr-date-picker/dr-date-picker.component.d.ts +1 -1
- package/lib/dr-inputs/date-pickers/services/dr-date-picker.service.d.ts +3 -2
- package/package.json +1 -1
- package/datarailsshared-datarailsshared-1.4.69.tgz +0 -0
|
@@ -3916,6 +3916,7 @@
|
|
|
3916
3916
|
}
|
|
3917
3917
|
});
|
|
3918
3918
|
_calendar.viewChanged.pipe(operators.takeUntil(this._destroyed)).subscribe(function () { return _this.setPeriodLabels(); });
|
|
3919
|
+
this.datePickerService.calendarInstance = _calendar;
|
|
3919
3920
|
}
|
|
3920
3921
|
DrDatePickerCustomHeaderComponent.prototype.ngOnDestroy = function () {
|
|
3921
3922
|
this._destroyed.next();
|
|
@@ -3961,7 +3962,7 @@
|
|
|
3961
3962
|
var unadaptedDate = this._dateAdapter.addCalendarMonths(this._calendar.activeDate, monthsInQuarter * (quarterNumber - this.selectedQuarter));
|
|
3962
3963
|
this._calendar.activeDate = unadaptedDate;
|
|
3963
3964
|
this.datePickerService.updatedQuarter$.next(moment$1(unadaptedDate));
|
|
3964
|
-
this.datePickerService.
|
|
3965
|
+
this.datePickerService.datePickerInstance.close();
|
|
3965
3966
|
};
|
|
3966
3967
|
DrDatePickerCustomHeaderComponent.prototype.pagingClicked = function (forward) {
|
|
3967
3968
|
this.pagingSetup[this._calendar.currentView] && this.pagingSetup[this._calendar.currentView](forward);
|
|
@@ -4054,7 +4055,7 @@
|
|
|
4054
4055
|
configurable: true
|
|
4055
4056
|
});
|
|
4056
4057
|
DrDatePickerComponent.prototype.ngAfterViewInit = function () {
|
|
4057
|
-
this.datePickerService.
|
|
4058
|
+
this.datePickerService.datePickerInstance = this.datePicker;
|
|
4058
4059
|
this.datePicker.startView = this.calendarViewsTimeframeMapping[this.datePickerService.timeframe];
|
|
4059
4060
|
};
|
|
4060
4061
|
DrDatePickerComponent.prototype.ngOnDestroy = function () {
|
|
@@ -4086,7 +4087,12 @@
|
|
|
4086
4087
|
}
|
|
4087
4088
|
};
|
|
4088
4089
|
DrDatePickerComponent.prototype.chosenPeriodHandler = function (chosenDate, timeframe) {
|
|
4089
|
-
if (this.datePickerService.timeframe === timeframe) {
|
|
4090
|
+
if (this.datePickerService.timeframe === exports.TimeframeOption.QUARTER && timeframe === exports.TimeframeOption.YEAR) {
|
|
4091
|
+
this.datePickerService.calendarInstance.currentView = exports.CalendarView.FOR_QUARTERS;
|
|
4092
|
+
this.datePickerService.calendarInstance.activeDate = chosenDate;
|
|
4093
|
+
this.cdr.detectChanges();
|
|
4094
|
+
}
|
|
4095
|
+
else if (this.datePickerService.timeframe === timeframe) {
|
|
4090
4096
|
this.setValueFromMoment(chosenDate);
|
|
4091
4097
|
this.datePicker.close();
|
|
4092
4098
|
}
|