@datarailsshared/datarailsshared 1.4.518 → 1.4.530

package/bundles/datarailsshared-datarailsshared.umd.js

@@ -419,6 +419,7 @@
     /* BEFORE MERGE INTO MASTER YOU MUST CONSULT WITH ARTEM LAZIUK !!!*/
     // @ts-ignore
     var moment$9 = require('moment');
+    var FORECAST_DEFAULT_DATE_FORMAT = 'MM/DD/yyyy';
     var ForecastTagComponent = /** @class */ (function (_super) {
         __extends(ForecastTagComponent, _super);
         function ForecastTagComponent() {
@@ -442,6 +443,7 @@
                 { value: 11, label: '11+1', disabled: false }
             ];
             _this.initDateValue = null;
+            _this.firstDayMonthOfYear = '01';
             return _this;
         }
         ForecastTagComponent.prototype.ngOnChanges = function (changes) {
@@ -453,22 +455,17 @@
             var dateVal = this.defaultValue ? moment$9.unix(this.defaultValue) : moment$9();
             var fiscal_year_starts_from = this.fiscalYearStartsFrom || 1;
             this.forecastValue = this.getFiscalMonthFromDate(dateVal, fiscal_year_starts_from) - 1;
-            this.updateYear(dateVal.year(), this.forecastValue);
+            this.forecastYear = moment$9
+                .utc(this.firstDayMonthOfYear + "/" + this.firstDayMonthOfYear + "/" + this.getFiscalYearFromDate(dateVal, fiscal_year_starts_from, this.fiscalYearBack), FORECAST_DEFAULT_DATE_FORMAT)
+                .unix();
             this.updateLockedDate();
             if (!this.initDateValue) {
                 this.initDateValue = _.cloneDeep(this.dateObj.date);
             }
         };
-        ForecastTagComponent.prototype.updateYear = function (fiscalYear, month) {
-            var DATE_TIME = '12:00:00';
-            var MONTH_DIFF = 1;
-            this.dateObj.date = fiscalYear
-                ? moment$9.utc((month + MONTH_DIFF || '01') + "/01/" + fiscalYear + " " + DATE_TIME, 'MM/DD/YYYY hh:mm:ss').unix()
-                : moment$9.utc().unix();
-        };
         ForecastTagComponent.prototype.updateLockedDate = function () {
             var _this = this;
-            var year = moment$9.unix(this.dateObj.date).year();
+            var year = moment$9.unix(this.forecastYear).year();
             this.forecastTags = this.forecastTags.map(function (forecastTag) {
                 forecastTag.disabled = _this.lockedDate.some(function (timestamp) {
                     var locked = moment$9.unix(timestamp);
@@ -520,12 +517,11 @@
             if (this.isDateEventHappened)
                 return;
             var month = this.forecastValue;
-            var year = moment$9.unix(this.dateObj.date).year();
+            var year = moment$9.unix(this.forecastYear);
             var fiscal_year_starts_from = this.fiscalYearStartsFrom || 1;
             var fiscal_year_back = this.fiscalYearBack || false;
-            var chosenDate = moment$9.unix(this.dateObj.date).unix();
             if (!Number.isNaN(month) && !Number.isNaN(year)) {
-                var date = new Date(year, month, 1, 12, 0, 0, 0);
+                var date = new Date(year.year(), month, 1, 12, 0, 0, 0);
                 if (fiscal_year_starts_from !== 1) {
                     if (!fiscal_year_back) {
                         date.setMonth(date.getMonth() - 13 + fiscal_year_starts_from);
@@ -534,19 +530,16 @@
                         date.setMonth(date.getMonth() - 1 + fiscal_year_starts_from);
                     }
                 }
-                this.updateYear(year, date.getMonth());
+                this.dateObj.date = moment$9(date).unix();
                 this.isDateEventHappened = true;
                 setTimeout(function () {
                     _this.isDateEventHappened = false;
                 });
             }
-            var calculatedDate = moment$9.unix(this.dateObj.date).year(this.getFiscalYearFromDate(moment$9.unix(this.dateObj.date), fiscal_year_starts_from, fiscal_year_back));
             var resultTag = {
                 name: this.name,
                 value: this.dateObj.date,
-                calculatedValue: calculatedDate.unix(),
-                chosenValue: chosenDate,
-                label: ((_a = _.find(this.forecastTags, { value: this.forecastValue })) === null || _a === void 0 ? void 0 : _a.label) + " (" + year + ")",
+                label: ((_a = _.find(this.forecastTags, { value: this.forecastValue })) === null || _a === void 0 ? void 0 : _a.label) + " (" + year.year() + ")",
                 locked: !this.dateFilter(moment$9.unix(this.dateObj.date)),
             };
             this.dateChange.emit(resultTag);
@@ -564,7 +557,7 @@
     }(AnyTagComponent));
     ForecastTagComponent.decorators = [
         { type: i0.Component, args: [{
-                    template: "<ng-container *ngIf=\"!tagAdditionalSettings?.showSplitInputs; else splitInputsTpl\">\n    <div class=\"forecast-tag__container\">\n        <div class=\"forecast-tag__forecast\">\n            <p class=\"tag__label\">Forecast</p>\n            <dr-select\n                placeholder=\"Select\"\n                [(ngModel)]=\"forecastValue\"\n                bindLabel=\"label\"\n                bindValue=\"value\"\n                [disabled]=\"disabled\"\n                [items]=\"forecastTags\"\n                (ngModelChange)=\"changeTagInputHandler()\"></dr-select>\n        </div>\n        <div class=\"forecast-tag__year\">\n            <p class=\"tag__label\">Year</p>\n            <dr-date-picker\n                format=\"year\"\n                [(ngModel)]=\"dateObj.date\"\n                [datepickerFilter]=\"dateFilter.bind(this)\"\n                [disabled]=\"disabled\"\n                (ngModelChange)=\"changeYearInputHandler()\"></dr-date-picker>\n        </div>\n    </div>\n</ng-container>\n\n<ng-template #splitInputsTpl>\n    <div class=\"forecast-tag__split-container\">\n        <p class=\"tag__label\">Period</p>\n        <div class=\"forecast-tag__split-dropdowns\">\n            <dr-date-picker\n                format=\"year\"\n                [(ngModel)]=\"dateObj.date\"\n                [datepickerFilter]=\"dateFilter.bind(this)\"\n                [disabled]=\"disabled\"\n                class=\"no-right-border-radius no-right-border\"\n                (ngModelChange)=\"changeYearInputHandler()\"></dr-date-picker>\n            <dr-select\n                placeholder=\"Select\"\n                [(ngModel)]=\"forecastValue\"\n                bindLabel=\"label\"\n                bindValue=\"value\"\n                [disabled]=\"disabled\"\n                [items]=\"forecastTags\"\n                no-left-border-radius\n                (ngModelChange)=\"changeTagInputHandler()\"></dr-select>\n        </div>\n    </div>\n</ng-template>\n",
+                    template: "<ng-container *ngIf=\"!tagAdditionalSettings?.showSplitInputs; else splitInputsTpl\">\n    <div class=\"forecast-tag__container\">\n        <div class=\"forecast-tag__forecast\">\n            <p class=\"tag__label\">Forecast</p>\n            <dr-select\n                placeholder=\"Select\"\n                [(ngModel)]=\"forecastValue\"\n                bindLabel=\"label\"\n                bindValue=\"value\"\n                [disabled]=\"disabled\"\n                [items]=\"forecastTags\"\n                (ngModelChange)=\"changeTagInputHandler()\"></dr-select>\n        </div>\n        <div class=\"forecast-tag__year\">\n            <p class=\"tag__label\">Year</p>\n            <dr-date-picker\n                format=\"year\"\n                [(ngModel)]=\"forecastYear\"\n                [datepickerFilter]=\"dateFilter.bind(this)\"\n                [disabled]=\"disabled\"\n                (ngModelChange)=\"changeYearInputHandler()\"></dr-date-picker>\n        </div>\n    </div>\n</ng-container>\n\n<ng-template #splitInputsTpl>\n    <div class=\"forecast-tag__split-container\">\n        <p class=\"tag__label\">Period</p>\n        <div class=\"forecast-tag__split-dropdowns\">\n            <dr-date-picker\n                format=\"year\"\n                [(ngModel)]=\"forecastYear\"\n                [datepickerFilter]=\"dateFilter.bind(this)\"\n                [disabled]=\"disabled\"\n                class=\"no-right-border-radius no-right-border\"\n                (ngModelChange)=\"changeYearInputHandler()\"></dr-date-picker>\n            <dr-select\n                placeholder=\"Select\"\n                [(ngModel)]=\"forecastValue\"\n                bindLabel=\"label\"\n                bindValue=\"value\"\n                [disabled]=\"disabled\"\n                [items]=\"forecastTags\"\n                no-left-border-radius\n                (ngModelChange)=\"changeTagInputHandler()\"></dr-select>\n        </div>\n    </div>\n</ng-template>\n",
                     selector: 'forecast-tag',
                     providers: [
                         {
@@ -1137,8 +1130,6 @@
                 id: this.tagConfig.id,
                 name: event.name,
                 value: event.value,
-                calculatedValue: event.calculatedValue,
-                chosenValue: event.chosenValue,
                 label: event.label,
                 locked: event.locked
             };
@@ -7332,14 +7323,11 @@
             return (valueFromConfig || currentValues[0]);
         };
         DrDynamicTagComponent.prototype.getParentValueKey = function () {
-            var _this = this;
             return _.map(this.connectedTags, function (connectedTag) {
                 if (_.isNumber(connectedTag.value)) {
                     var momentData = moment.unix(connectedTag.value);
                     // TODO: add input prop (selectedTimeDimension) or Format
-                    var convertedParentValue = _this.tagConfig.options.sub_type === TagsConfigSubType.FORECAST_CYCLE
-                        ? _this.getConvertedForecastPeriodValue(momentData)
-                        : momentData.get('year');
+                    var convertedParentValue = momentData.get('year');
                     if (momentData.isValid() && convertedParentValue) {
                         return convertedParentValue;
                     }
@@ -7347,11 +7335,6 @@
                 return connectedTag.value;
             }).join('__');
         };
-        DrDynamicTagComponent.prototype.getConvertedForecastPeriodValue = function (momentData) {
-            var month = ForecastTagService.getFiscalMonthFromDate(momentData, this.fiscalYearStartsFrom);
-            var year = ForecastTagService.getFiscalYearFromDate(momentData, this.fiscalYearStartsFrom, this.fiscalYearBack);
-            return ForecastTagService.getForecastLabel(month) + " (" + year + ")";
-        };
         return DrDynamicTagComponent;
     }());
     DrDynamicTagComponent.decorators = [