awing-library 2.1.163-dev → 2.1.164-dev

package/lib/ACM-AXN/ScheduleCompletionRate/Filter.js

@@ -158,7 +158,12 @@ function Filter(props) {
                             className: classes.outlinedInput,
                         }, callback: handleChangeDateRange, isDayBlocked: function (day) {
                             var now = (0, moment_1.default)().endOf('day').valueOf();
-                            return now < day.valueOf();
+                            if (now < day.valueOf()) {
+                                return true;
+                            }
+                            else {
+                                return false;
+                            }
                         } }) }), (0, jsx_runtime_1.jsx)(SearchCampaign_1.default, { filter: filter, campaigns: campaigns, onUpdateFilter: onUpdateFilter }), (0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", color: "primary", onClick: function () {
                         handleChangeQueryInput(dateRangeInput);
                     }, style: { height: '40px' }, children: t('Common.View') }), (0, jsx_runtime_1.jsx)(material_1.Button, { variant: "contained", title: t('Common.Download'), onClick: handleChangeExportInput, color: "inherit", disabled: isLoadings, style: {

package/lib/AWING/DateRangePicker/component.js

@@ -235,36 +235,54 @@ var DateRangePickerWrapper = function (props) {
         onDatesChange(daterange);
         // setFocusedInput(null);
     };
+    var getDataSet = function (moment) {
+        return moment.set({
+            hour: 0,
+            minute: 0,
+            second: 0,
+            millisecond: 0,
+        });
+    };
+    var resetDate = function () {
+        setStartDate(initialStartDate);
+        setEndDate(initialEndDate);
+        setInputValue("".concat(moment(initialStartDate).format('DD/MM/YYYY'), " - ").concat(moment(initialEndDate).format('DD/MM/YYYY')));
+        callback({
+            startDate: getDataSet(moment(initialStartDate, 'DD/MM/YYYY')),
+            endDate: getDataSet(moment(initialEndDate, 'DD/MM/YYYY')),
+        });
+    };
     var handleChangeInput = function (e) {
         var fieldValue = e.target.value;
         setInputValue(fieldValue);
         var fieldValueArr = (fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.split(' - ')) || [];
         var year1900 = moment('1900-01-01');
         var momentStartDate = moment(fieldValueArr[0], 'DD/MM/YYYY');
+        var momentEndDate = moment(fieldValueArr[1], 'DD/MM/YYYY');
+        if (isDayBlocked && isDayBlocked(momentStartDate)) {
+            setIsValid(true);
+            resetDate();
+            return;
+        }
+        if (isDayBlocked && isDayBlocked(momentEndDate)) {
+            setIsValid(true);
+            resetDate();
+            return;
+        }
         if (momentStartDate.isValid() && momentStartDate.diff(year1900) >= 0) {
             setStartDate(momentStartDate);
         }
-        var momentEndDate = moment(fieldValueArr[1], 'DD/MM/YYYY');
         if (momentEndDate.isValid() && momentEndDate.diff(year1900) >= 0) {
             setEndDate(momentEndDate);
         }
         if (moment(fieldValueArr[0], 'DD/MM/YYYY', true).isValid() &&
             moment(fieldValueArr[1], 'DD/MM/YYYY', true).isValid() &&
             momentEndDate.diff(momentStartDate) >= 0) {
-            momentStartDate.set({
-                hour: 0,
-                minute: 0,
-                second: 0,
-                millisecond: 0,
-            });
-            momentEndDate.set({
-                hour: 0,
-                minute: 0,
-                second: 0,
-                millisecond: 0,
-            });
-            callback({ startDate: momentStartDate, endDate: momentEndDate });
             setIsValid(true);
+            callback({
+                startDate: getDataSet(momentStartDate),
+                endDate: getDataSet(momentEndDate),
+            });
         }
         else
             setIsValid(false);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "awing-library",
-    "version": "2.1.163-dev",
+    "version": "2.1.164-dev",
     "description": "",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",