Fix date format on DatePicker of FilterItem #1387

metasfresh · Jan 16, 2018 · 179cb4d · 179cb4d
1 parent 531ed51
commit 179cb4d
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/src/components/filters/FiltersItem.js b/src/components/filters/FiltersItem.js
@@ -72,23 +72,28 @@ class FiltersItem extends Component {
     }
   };
 
+  parseDateToReadable = value => {
+    if (value) {
+      return new Date(value);
+    }
+  };
+
   mergeData = (property, value, valueTo) => {
+    const DATE_FIELD = "DateDoc";
     this.setState(prevState => ({
       filter: Object.assign({}, prevState.filter, {
         parameters: prevState.filter.parameters.map(param => {
           if (param.parameterName === property) {
-            return Object.assign(
-              {},
-              param,
-              valueTo
-                ? {
-                    value,
-                    valueTo
-                  }
-                : {
-                    value
-                  }
-            );
+            return Object.assign({}, param, {
+              value:
+                DATE_FIELD === property
+                  ? this.parseDateToReadable(value)
+                  : value,
+              valueTo:
+                DATE_FIELD === property
+                  ? this.parseDateToReadable(valueTo)
+                  : valueTo
+            });
           } else {
             return param;
           }