@datarailsshared/datarailsshared 1.3.49 → 1.3.50

package/bundles/datarailsshared-datarailsshared.umd.js

@@ -2516,22 +2516,23 @@
             this.timeframeSelection = false;
             this.periodMonthLabel = '';
             this.periodYearLabel = '';
-            _calendar.stateChanges
-                .pipe(operators.takeUntil(this._destroyed))
-                .subscribe(function () { return cdr.markForCheck(); });
+            _calendar.stateChanges.pipe(operators.takeUntil(this._destroyed)).subscribe(function () { return _this.setPeriodLabels(); });
             this.datePickerService.format
                 .pipe(operators.take(1))
                 .subscribe(function (value) {
                 _this.selectedTimeframe = _this.timeframeOptions.filter(function (option) { return option.format == value; })[0].value;
             });
+            _calendar.viewChanged.pipe(operators.takeUntil(this._destroyed)).subscribe(function () { return _this.setPeriodLabels(); });
         }
         DrDatePickerCustomHeaderComponent.prototype.ngOnDestroy = function () {
             this._destroyed.next();
             this._destroyed.complete();
         };
-        DrDatePickerCustomHeaderComponent.prototype.setPeriodLabels = function (currentTimeframeOption) {
+        DrDatePickerCustomHeaderComponent.prototype.setPeriodLabels = function () {
+            var _this = this;
+            var currentTimeframeOption = this.timeframeOptions.filter(function (option) { return option.value === _this._calendar.currentView; })[0];
             var fullPeriodLabel = currentTimeframeOption.periodLabel();
-            if (this.selectedTimeframe === 'month') {
+            if (this._calendar.currentView === 'month') {
                 this.periodMonthLabel = fullPeriodLabel.slice(0, 3);
                 this.periodYearLabel = fullPeriodLabel.slice(4);
             }
@@ -2539,13 +2540,13 @@
                 this.periodMonthLabel = '';
                 this.periodYearLabel = fullPeriodLabel;
             }
+            this.cdr.markForCheck();
         };
         DrDatePickerCustomHeaderComponent.prototype.setTimeframe = function () {
             var _this = this;
             this.timeframeSelection = false;
             this._calendar.currentView = this.selectedTimeframe;
             var chosenTimeframeOption = this.timeframeOptions.filter(function (option) { return option.value === _this.selectedTimeframe; })[0];
-            this.setPeriodLabels(chosenTimeframeOption);
             this.datePickerService.format.next(chosenTimeframeOption.format);
             this.datePickerService.setTimeframe(chosenTimeframeOption.format);
             if (this.selectedTimeframe == 'none') {
@@ -2571,13 +2572,11 @@
             this.datePickerService.calendarInstance.close();
         };
         DrDatePickerCustomHeaderComponent.prototype.pagingClicked = function (forward) {
-            this.pagingSetup[this.selectedTimeframe] && this.pagingSetup[this.selectedTimeframe](forward);
+            this.pagingSetup[this._calendar.currentView] && this.pagingSetup[this._calendar.currentView](forward);
         };
         DrDatePickerCustomHeaderComponent.prototype.pagingDateChange = function (actionCall, amount, forward) {
-            var _this = this;
             this._calendar.activeDate = this._dateAdapter[actionCall](this._calendar.activeDate, forward ? amount : -amount);
-            var chosenTimeframeOption = this.timeframeOptions.filter(function (option) { return option.value === _this.selectedTimeframe; })[0];
-            this.setPeriodLabels(chosenTimeframeOption);
+            this.setPeriodLabels();
         };
         return DrDatePickerCustomHeaderComponent;
     }());
@@ -2586,7 +2585,7 @@
                     selector: 'dr-date-picker_custom-header.component',
                     template: "<div class=\"dr-datepicker__timeframe-select__wrapper\">\r\n    <dr-select \r\n        class=\"dr-datepicker__timeframe-select\"\r\n        [(ngModel)]=\"selectedTimeframe\"\r\n        [items]=\"timeframeOptions\"\r\n        bindLabel=\"title\"\r\n        bindValue=\"value\"\r\n        (ngModelChange)=\"setTimeframe()\">\r\n    </dr-select>\r\n</div>\r\n\r\n<div class=\"dr-date-paging\">\r\n    <div class=\"dr-date-paging flip-page-button\"\r\n        (click)=\"pagingClicked(false)\">\r\n            <i class=\"dr-icon-arrow-left presentation_buttons-navigate_input\"></i>    \r\n    </div>\r\n    <span class=\"example-header-label\">\r\n        <span (click)=\"switchViewOnClickOnPeriodLabel('year')\">{{periodMonthLabel + ' '}}</span> \r\n        <span (click)=\"switchViewOnClickOnPeriodLabel('multi-year')\">{{periodYearLabel}}</span>\r\n    </span>\r\n    <div class=\"dr-date-paging flip-page-button\"\r\n        (click)=\"pagingClicked(true)\">\r\n            <i class=\"dr-icon-arrow-right presentation_buttons-navigate_input\"></i>\r\n    </div>\r\n</div>\r\n<div #quarterlyDatePicker class=\"dr-quarterly-datepicker\" *ngIf=\"currentViewIsQuater\">\r\n    <div *ngFor=\"let quarter of quarters\" \r\n        class=\"quarter-selector\" (click)=\"onSelectQuater(quarter)\"\r\n        [class]=\"quarter == selectedQuarter ? 'selected' : ''\"\r\n        >Q{{quarter}}</div>\r\n</div>\r\n\r\n",
                     changeDetection: i0.ChangeDetectionStrategy.OnPush,
-                    styles: [":host{height:54px;align-items:center;font-family:\"Poppins\";font-style:normal;font-weight:600;font-size:14px;line-height:22px}.dr-datepicker__timeframe-select__wrapper{background-color:#f9faff;padding:16px 32px;border-radius:18px 18px 0 0}.dr-date-paging{display:flex;flex-direction:row;justify-content:space-between;align-items:center;padding:16px 8px;grid-gap:4px;gap:4px}.dr-date-paging.flip-page-button{width:20px;height:20px;padding:0;color:#4e566c}.dr-date-paging.flip-page-button:hover{border-radius:50%;background:#F2F2FB;color:#4646ce}.dr-quarterly-datepicker{display:flex;justify-content:space-between;padding:10px}.dr-quarterly-datepicker .quarter-selector{display:block;width:74px;height:40px;text-align:center;border-radius:40px;font-weight:400;padding-top:9px}.dr-quarterly-datepicker .quarter-selector:hover{background:#F2F2FB;color:#4646ce;font-weight:600;cursor:pointer}.dr-quarterly-datepicker .quarter-selector.selected{background-color:#4646ce;color:#f3f7ff;font-weight:600}\n"]
+                    styles: [":host{height:54px;align-items:center;font-family:\"Poppins\";font-style:normal;font-weight:600;font-size:14px;line-height:22px}.dr-datepicker__timeframe-select__wrapper{background-color:#f9faff;padding:16px 32px;border-radius:18px 18px 0 0}.dr-date-paging{display:flex;flex-direction:row;justify-content:space-between;align-items:center;padding:16px 8px;grid-gap:4px;gap:4px}.dr-date-paging.flip-page-button{width:20px;height:20px;padding:0;color:#4e566c}.dr-date-paging.flip-page-button:hover{border-radius:50%;background:#F2F2FB;color:#4646ce}.example-header-label{cursor:pointer}.dr-quarterly-datepicker{display:flex;justify-content:space-between;padding:10px}.dr-quarterly-datepicker .quarter-selector{display:block;width:74px;height:40px;text-align:center;border-radius:40px;font-weight:400;padding-top:9px}.dr-quarterly-datepicker .quarter-selector:hover{background:#F2F2FB;color:#4646ce;font-weight:600;cursor:pointer}.dr-quarterly-datepicker .quarter-selector.selected{background-color:#4646ce;color:#f3f7ff;font-weight:600}\n"]
                 },] }
     ];
     DrDatePickerCustomHeaderComponent.ctorParameters = function () { return [
@@ -2677,6 +2676,7 @@
             if (this.takeEndOfPeriod) {
                 normalizedRef.endOf(timeframe);
             }
+            normalizedRef.set('hour', 12);
         };
         Object.defineProperty(DrDatePickerComponent.prototype, "value", {
             get: function () {
@@ -2727,7 +2727,7 @@
             return value;
         };
         DrDatePickerComponent.prototype.chosenMonthHandler = function (normalizedMonth, datepicker) {
-            if (this.datePickerService.timeframe == 'month') {
+            if (this.datePickerService.timeframe === 'month') {
                 this.tryToNormalaizeTimeframe(normalizedMonth, 'month');
                 this.writeValue(normalizedMonth);
                 this.onChangeCallback(normalizedMonth);
@@ -2735,16 +2735,12 @@
             }
         };
         DrDatePickerComponent.prototype.chosenYearHandler = function (normalizedYear, datepicker) {
-            if (this.datePickerService.timeframe == 'year') {
+            if (this.datePickerService.timeframe === 'year') {
                 this.tryToNormalaizeTimeframe(normalizedYear, 'year');
                 this.writeValue(normalizedYear);
                 this.onChangeCallback(normalizedYear);
                 datepicker.close();
             }
-            else if (['quarter', 'day'].includes(this.datePickerService.timeframe)) {
-                this.writeValue(normalizedYear);
-                datepicker.close();
-            }
         };
         DrDatePickerComponent.prototype.pagingClicked = function (forward) {
             this.pagingSetup[this.datePickerService.timeframe] && this.pagingSetup[this.datePickerService.timeframe](forward);