Use moment and parseInputDate to load existing dates into date picker

3 files changed, 24 insertions, 6 deletions

diff --git a/app/Http/Controllers/StatsController.php b/app/Http/Controllers/StatsController.php
index 715710d..1ddebd8 100644
--- a/app/Http/Controllers/StatsController.php
+++ b/app/Http/Controllers/StatsController.php
@@ -73,8 +73,8 @@ class StatsController extends Controller {
             'country_stats' => $country_stats,
             'referer_stats' => $referer_stats,
 
-            'left_bound' => ($user_left_bound ?: ''),
-            'right_bound' => ($user_right_bound ?: ''),
+            'left_bound' => ($user_left_bound ?: $left_bound->toDateTimeString()),
+            'right_bound' => ($user_right_bound ?: $right_bound->toDateTimeString()),
 
             'no_div_padding' => true
         ]);
diff --git a/public/js/StatsCtrl.js b/public/js/StatsCtrl.js
index 07e5fc3..d1dfaf9 100644
--- a/public/js/StatsCtrl.js
+++ b/public/js/StatsCtrl.js
@@ -1,3 +1,7 @@
+var parseInputDate = function (inputDate) {
+    return moment(inputDate);
+};
+
 polr.controller('StatsCtrl', function($scope, $compile) {
     $scope.dayChart = null;
     $scope.refererChart = null;
@@ -98,8 +102,17 @@ polr.controller('StatsCtrl', function($scope, $compile) {
     };
 
     $scope.initDatePickers = function () {
-        $('#left-bound-picker').datetimepicker();
-        $('#right-bound-picker').datetimepicker();
+        var $leftPicker = $('#left-bound-picker');
+        var $rightPicker = $('#right-bound-picker');
+
+        $leftPicker.datetimepicker();
+        $rightPicker.datetimepicker();
+
+        $leftPicker.data("DateTimePicker").parseInputDate(parseInputDate);
+        $rightPicker.data("DateTimePicker").parseInputDate(parseInputDate);
+
+        $leftPicker.data("DateTimePicker").date(datePickerLeftBound, Date, moment, null);
+        $rightPicker.data("DateTimePicker").date(datePickerRightBound, Date, moment, null);
     }
 
     $scope.init = function () {
diff --git a/resources/views/link_stats.blade.php b/resources/views/link_stats.blade.php
index 7257e58..121e0b6 100644
--- a/resources/views/link_stats.blade.php
+++ b/resources/views/link_stats.blade.php
@@ -28,7 +28,7 @@
                 <form action="" method="GET">
                     <div class="form-group">
                         <div class='input-group date' id='left-bound-picker'>
-                            <input type="text" class="form-control" name="left_bound" value="{{ e($left_bound) }}">
+                            <input type="text" class="form-control" name="left_bound">
                             <span class="input-group-addon">
                                 <span class="glyphicon glyphicon-calendar"></span>
                             </span>
@@ -36,7 +36,7 @@
                     </div>
                     <div class="form-group">
                         <div class='input-group date' id='right-bound-picker'>
-                            <input type="text" class="form-control" name="right_bound" value="{{ e($right_bound) }}">
+                            <input type="text" class="form-control" name="right_bound">
                             <span class="input-group-addon">
                                 <span class="glyphicon glyphicon-calendar"></span>
                             </span>
@@ -93,9 +93,14 @@
 @section('js')
 {{-- Load data --}}
 <script>
+// Load data
 var dayData = JSON.parse('{!! json_encode($day_stats) !!}');
 var refererData = JSON.parse('{!! json_encode($referer_stats) !!}');
 var countryData = JSON.parse('{!! json_encode($country_stats) !!}');
+
+// Load datepicker dates
+var datePickerLeftBound = '{{ $left_bound }}';
+var datePickerRightBound = '{{ $right_bound }}';
 </script>
 
 {{-- Include extra JS --}}