@optimiser/common 1.0.330 → 1.0.331
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/dist/lib/utility.js +2 -2
- package/package.json +1 -1
package/dist/lib/utility.js
CHANGED
|
@@ -5117,11 +5117,11 @@ exports.CheckConditionalField = CheckConditionalField;
|
|
|
5117
5117
|
function CheckExpressionOnDateField(record, fieldName, range, startDate, endDate) {
|
|
5118
5118
|
try {
|
|
5119
5119
|
if (range == 'Custom') {
|
|
5120
|
-
return (record[fieldName] && (moment_1.default(record[fieldName]).isBetween(moment_1.default(startDate, _settingData.DateFormat).startOf('day'), moment_1.default(endDate, _settingData.DateFormat).endOf('day')) || moment_1.default(record[fieldName]).isSame(moment_1.default(startDate, _settingData.DateFormat).startOf('day')) || moment_1.default(record[fieldName]).isSame(moment_1.default(endDate, _settingData.DateFormat).endOf('day')))) ? true : false;
|
|
5120
|
+
return (record[fieldName] && (moment_1.default.utc(record[fieldName]).isBetween(moment_1.default.utc(startDate, _settingData.DateFormat).startOf('day'), moment_1.default.utc(endDate, _settingData.DateFormat).endOf('day')) || moment_1.default.utc(record[fieldName]).isSame(moment_1.default.utc(startDate, _settingData.DateFormat).startOf('day')) || moment_1.default.utc(record[fieldName]).isSame(moment_1.default.utc(endDate, _settingData.DateFormat).endOf('day')))) ? true : false;
|
|
5121
5121
|
}
|
|
5122
5122
|
else {
|
|
5123
5123
|
var _a = helper_1.GetDateRangeFromOperatorValue(range, _settingData.FiscalMonth, _settingData.FiscalFrom), startDate_1 = _a.startDate, endDate_1 = _a.endDate;
|
|
5124
|
-
return (record[fieldName] && (moment_1.default(record[fieldName]).isBetween(moment_1.default(startDate_1, _settingData.DateFormat).startOf('day'), moment_1.default(endDate_1, _settingData.DateFormat).endOf('day')) || moment_1.default(record[fieldName]).isSame(moment_1.default(startDate_1, _settingData.DateFormat).startOf('day')) || moment_1.default(record[fieldName]).isSame(moment_1.default(endDate_1, _settingData.DateFormat).endOf('day')))) ? true : false;
|
|
5124
|
+
return (record[fieldName] && (moment_1.default.utc(record[fieldName]).isBetween(moment_1.default.utc(startDate_1, _settingData.DateFormat).startOf('day'), moment_1.default.utc(endDate_1, _settingData.DateFormat).endOf('day')) || moment_1.default.utc(record[fieldName]).isSame(moment_1.default.utc(startDate_1, _settingData.DateFormat).startOf('day')) || moment_1.default.utc(record[fieldName]).isSame(moment_1.default.utc(endDate_1, _settingData.DateFormat).endOf('day')))) ? true : false;
|
|
5125
5125
|
}
|
|
5126
5126
|
}
|
|
5127
5127
|
catch (error) {
|