Fix new Date() Error in js

yousetme · Aug 29, 2015 · 803d402 · 803d402
1 parent 2901819
commit 803d402
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/main/webapp/resources/scripts/index.js b/src/main/webapp/resources/scripts/index.js
@@ -32,8 +32,8 @@ $(function () {
 function loadChartsData() {
     $.ajax({
         type: "POST", url: "loadTopData", dataType: "json", data: {
-            "invokeDateFrom": new Date($('#invokeDateFrom').val() + ' 00:00:00'),
-            "invokeDateTo": new Date($('#invokeDateTo').val() + ' 23:59:59'),
+            "invokeDateFrom": new Date($('#invokeDateFrom').val().replace(new RegExp("-","gm"),"/") + ' 00:00:00'),
+            "invokeDateTo": new Date($('#invokeDateTo').val().replace(new RegExp("-","gm"),"/") + ' 23:59:59'),
             "type": 'provider'
         }, error: function (req, status, err) {
             alert('Failed reason: ' + err);

diff --git a/src/main/webapp/resources/scripts/service/charts.js b/src/main/webapp/resources/scripts/service/charts.js
@@ -33,8 +33,8 @@ function loadChartsData() {
     $.ajax({
         type: "POST", url: "services/charts/loadChartsData", dataType: "json", data: {
             "service": $('#invokeSearchService').val(),
-            "invokeDateFrom": new Date($('#invokeDateFrom').val() + ' 00:00:00'),
-            "invokeDateTo": new Date($('#invokeDateTo').val() + ' 23:59:59')
+            "invokeDateFrom": new Date($('#invokeDateFrom').val().replace(new RegExp("-","gm"),"/") + ' 00:00:00'),
+            "invokeDateTo": new Date($('#invokeDateTo').val().replace(new RegExp("-","gm"),"/") + ' 23:59:59')
         }, error: function (req, status, err) {
             alert('Failed reason: ' + err);
         }, success: function (data) {

diff --git a/src/main/webapp/resources/scripts/service/statistics.js b/src/main/webapp/resources/scripts/service/statistics.js
@@ -18,13 +18,13 @@ $(function () {
             'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
         }, format: dateFormat
     }).on('apply.daterangepicker', function (ev, picker) {
-        dateFrom.val(new Date(picker.startDate.format(dateFormat) + ' 00:00:00'));
-        dateTo.val(new Date(picker.endDate.format(dateFormat) + ' 23:59:59'));
+        dateFrom.val(new Date(picker.startDate.format(dateFormat).replace(new RegExp("-","gm"),"/") + ' 00:00:00'));
+        dateTo.val(new Date(picker.endDate.format(dateFormat).replace(new RegExp("-","gm"),"/") + ' 23:59:59'));
         //rangeSpan.text(dateFrom.val() + ' ~ ' + dateTo.val());
         $("#statisticsSearchForm").submit();
     });
-    dateFrom.val(new Date(moment().format(dateFormat) + ' 00:00:00'));
-    dateTo.val(new Date(moment().format(dateFormat) + ' 23:59:59'));
+    dateFrom.val(new Date(moment().format(dateFormat).replace(new RegExp("-","gm"),"/") + ' 00:00:00'));
+    dateTo.val(new Date(moment().format(dateFormat).replace(new RegExp("-","gm"),"/") + ' 23:59:59'));
     //rangeSpan.text(dateFrom.val() + ' ~ ' + dateTo.val());
     rangeSpan.text("Choose Count Period");
 });