Merge branch 'feature/date-range' into develop

app/Http/Controllers/HomeController.php

@@ -8,7 +8,7 @@ use Preferences;
 use Redirect;
 use Session;
 use URL;
-
+use Input;
 /**
  * Class HomeController
  *
@@ -24,6 +24,14 @@ class HomeController extends Controller
     {
     }
 
+    public function dateRange() {
+        $start = new Carbon(Input::get('start'));
+        $end = new Carbon(Input::get('end'));
+
+        Session::put('start',$start);
+        Session::put('end',$end);
+    }
+
     /**
      * @return \Illuminate\Http\RedirectResponse
      */
@@ -76,49 +84,5 @@ class HomeController extends Controller
         return view('index', compact('count', 'title', 'subTitle', 'mainTitleIcon', 'transactions'));
     }
 
-    /**
-     * @param string $range
-     *
-     * @return mixed
-     */
-    public function rangeJump($range)
-    {
-
-        $valid = ['1D', '1W', '1M', '3M', '6M', '1Y',];
-
-        if (in_array($range, $valid)) {
-            Preferences::set('viewRange', $range);
-            Session::forget('range');
-        }
-
-        return Redirect::to(URL::previous());
-    }
-
-    /**
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function sessionNext()
-    {
-        $range = Session::get('range');
-        $start = Session::get('start');
-
-        Session::put('start', Navigation::jumpToNext($range, clone $start));
-
-        return Redirect::to(URL::previous());
-
-    }
-
-    /**
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function sessionPrev()
-    {
-        $range = Session::get('range');
-        $start = Session::get('start');
-
-        Session::put('start', Navigation::jumpToPrevious($range, clone $start));
-
-        return Redirect::to(URL::previous());
-    }
 
 }

app/Http/Middleware/Range.php

@@ -6,9 +6,9 @@ namespace FireflyIII\Http\Middleware;
 use Carbon\Carbon;
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
-use Navigation;
 use Preferences;
 use Session;
+use Navigation;
 
 /**
  * Class SessionFilter
@@ -46,25 +46,20 @@ class Range
     public function handle($request, Closure $theNext)
     {
         if ($this->auth->check()) {
-            // user's view range comes from preferences, gets set in session:
-            /** @var \FireflyIII\Models\Preference $viewRange */
-            $viewRange = Preferences::get('viewRange', '1M');
 
+            // ignore preference. set the range to be the current month:
+            if (!Session::has('start') && !Session::has('end')) {
 
-            // the start and end date are checked and stored:
+                /** @var \FireflyIII\Models\Preference $viewRange */
-            $start  = Session::has('start') ? Session::get('start') : new Carbon;
+                $viewRange = Preferences::get('viewRange', '1M');
-            $start  = Navigation::updateStartDate($viewRange->data, $start);
+                $start     = Session::has('start') ? Session::get('start') : new Carbon;
-            $end    = Navigation::updateEndDate($viewRange->data, $start);
+                $start     = Navigation::updateStartDate($viewRange->data, $start);
-            $period = Navigation::periodName($viewRange->data, $start);
+                $end       = Navigation::updateEndDate($viewRange->data, $start);
-            $prev   = Navigation::jumpToPrevious($viewRange->data, clone $start);
+
-            $next   = Navigation::jumpToNext($viewRange->data, clone $start);
+                Session::put('start', $start);
+                Session::put('end', $end);
+            }
 
-            Session::put('range', $viewRange->data);
-            Session::put('start', $start);
-            Session::put('end', $end);
-            Session::put('period', $period);
-            Session::put('prev', Navigation::periodName($viewRange->data, $prev));
-            Session::put('next', Navigation::periodName($viewRange->data, $next));
 
         }
 

app/Http/routes.php

@@ -148,9 +148,7 @@ Route::group(
     ['middleware' => ['auth', 'range']], function () {
     Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']);
     Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']);
-    Route::get('/prev', ['uses' => 'HomeController@sessionPrev', 'as' => 'sessionPrev']);
+    Route::post('/daterange',['uses' => 'HomeController@dateRange','as' => 'daterange']);
-    Route::get('/next', ['uses' => 'HomeController@sessionNext', 'as' => 'sessionNext']);
-    Route::get('/jump/{range}', ['uses' => 'HomeController@rangeJump', 'as' => 'rangeJump']);
     Route::get('/flush', ['uses' => 'HomeController@flush', 'as' => 'flush']);
     /**
      * Account Controller

public/css/daterangepicker-bs3.css

@@ -0,0 +1,319 @@
+/*!
+ * Stylesheet for the Date Range Picker, for use with Bootstrap 3.x
+ *
+ * Copyright 2013-2015 Dan Grossman ( http://www.dangrossman.info )
+ * Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
+ *
+ * Built for http://www.improvely.com
+ */
+
+ .daterangepicker.dropdown-menu {
+  max-width: none;
+  z-index: 3000;
+}
+
+.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
+  float: left;
+  margin: 4px;
+}
+
+.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar,
+.daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar {
+  float: right;
+  margin: 4px;
+}
+
+.daterangepicker.single .ranges, .daterangepicker.single .calendar {
+  float: none;
+}
+
+.daterangepicker .ranges {
+  width: 160px;
+  text-align: left;
+}
+
+.daterangepicker .ranges .range_inputs>div {
+  float: left;
+}
+
+.daterangepicker .ranges .range_inputs>div:nth-child(2) {
+  padding-left: 11px;
+}
+
+.daterangepicker .calendar {
+  display: none;
+  max-width: 270px;
+}
+
+.daterangepicker.show-calendar .calendar {
+    display: block;
+}
+
+.daterangepicker .calendar.single .calendar-date {
+  border: none;
+}
+
+.daterangepicker .calendar th, .daterangepicker .calendar td {
+  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  white-space: nowrap;
+  text-align: center;
+  min-width: 32px;
+}
+
+.daterangepicker .daterangepicker_start_input label,
+.daterangepicker .daterangepicker_end_input label {
+  color: #333;
+  display: block;
+  font-size: 11px;
+  font-weight: normal;
+  height: 20px;
+  line-height: 20px;
+  margin-bottom: 2px;
+  text-shadow: #fff 1px 1px 0px;
+  text-transform: uppercase;
+  width: 74px;
+}
+
+.daterangepicker .ranges input {
+  font-size: 11px;
+}
+
+.daterangepicker .ranges .input-mini {
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  color: #555;
+  display: block;
+  font-size: 11px;
+  height: 30px;
+  line-height: 30px;
+  vertical-align: middle;
+  margin: 0 0 10px 0;
+  padding: 0 6px;
+  width: 74px;
+}
+
+.daterangepicker .ranges ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.daterangepicker .ranges li {
+  font-size: 13px;
+  background: #f5f5f5;
+  border: 1px solid #f5f5f5;
+  color: #08c;
+  padding: 3px 12px;
+  margin-bottom: 8px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  cursor: pointer;
+}
+
+.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
+  background: #08c;
+  border: 1px solid #08c;
+  color: #fff;
+}
+
+.daterangepicker .calendar-date {
+  border: 1px solid #ddd;
+  padding: 4px;
+  border-radius: 4px;
+  background: #fff;
+}
+
+.daterangepicker .calendar-time {
+  text-align: center;
+  margin: 8px auto 0 auto;
+  line-height: 30px;
+}
+
+.daterangepicker {
+  position: absolute;
+  background: #fff;
+  top: 100px;
+  left: 20px;
+  padding: 4px;
+  margin-top: 1px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+
+.daterangepicker.opensleft:before {
+  position: absolute;
+  top: -7px;
+  right: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensleft:after {
+  position: absolute;
+  top: -6px;
+  right: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.openscenter:before {
+  position: absolute;
+  top: -7px;
+  left: 0;  
+  right: 0;
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.openscenter:after {
+  position: absolute;
+  top: -6px;
+  left: 0;  
+  right: 0;  
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.opensright:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensright:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker table {
+  width: 100%;
+  margin: 0;
+}
+
+.daterangepicker td, .daterangepicker th {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+.daterangepicker td.off {
+  color: #999;
+}
+
+.daterangepicker td.disabled, .daterangepicker option.disabled {
+  color: #999;
+}
+
+.daterangepicker td.available:hover, .daterangepicker th.available:hover {
+  background: #eee;
+}
+
+.daterangepicker td.in-range {
+  background: #ebf4f8;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+
+.daterangepicker td.start-date {
+  -webkit-border-radius: 4px 0 0 4px;
+  -moz-border-radius: 4px 0 0 4px;
+  border-radius: 4px 0 0 4px;
+}
+
+.daterangepicker td.end-date {
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
+}
+
+.daterangepicker td.start-date.end-date {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+
+.daterangepicker td.active, .daterangepicker td.active:hover {
+  background-color: #357ebd;
+  border-color: #3071a9;
+  color: #fff;
+}
+
+.daterangepicker td.week, .daterangepicker th.week {
+  font-size: 80%;
+  color: #ccc;
+}
+
+.daterangepicker select.monthselect, .daterangepicker select.yearselect {
+  font-size: 12px;
+  padding: 1px;
+  height: auto;
+  margin: 0;
+  cursor: default;
+}
+
+.daterangepicker select.monthselect {
+  margin-right: 2%;
+  width: 56%;
+}
+
+.daterangepicker select.yearselect {
+  width: 40%;
+}
+
+.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
+  width: 50px;
+  margin-bottom: 0;
+}
+
+.daterangepicker_start_input {
+  float: left;
+}
+
+.daterangepicker_end_input {
+  float: left; 
+  padding-left: 11px
+}
+
+.daterangepicker th.month {
+  width: auto;
+}

public/css/firefly.css

@@ -0,0 +1 @@
+#daterange {cursor:pointer;}

public/js/firefly.js

@@ -1,6 +1,38 @@
 $(function () {
 
-    $('.currencySelect').click(currencySelect)
+    $('.currencySelect').click(currencySelect);
+
+        $('#daterange').daterangepicker(
+            {
+                ranges: {
+                    'This Month': [moment().startOf('month'), moment().endOf('month')],
+                    'Last Month': [moment().subtract('month', 1).startOf('month'), moment().subtract('month', 1).endOf('month')],
+                    'Next Month': [moment().add('month', 1).startOf('month'), moment().add('month', 1).endOf('month')]
+                },
+                opens: 'left',
+
+                format: 'DD-MM-YYYY',
+                startDate: start,
+                endDate: end
+            },
+            function(start, end, label) {
+
+                // send post.
+                $.post(dateRangeURL, {
+                    start: start.format('YYYY-MM-DD'),
+                    end: end.format('YYYY-MM-DD'),
+                    _token: token
+                }).success(function() {
+                    window.location.reload(true);
+                }).fail(function() {
+                    alert('Could not change date range');
+
+                });
+
+                //alert('A date range was chosen: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));
+            }
+
+        );
 
 });
 
@@ -21,4 +53,5 @@ function currencySelect(e) {
 
 
     return false;
-}
+}
+

resources/views/layouts/default.blade.php

@@ -16,15 +16,17 @@
     </title>
 
     <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" type="text/css" media="all" />
-    <!-- <link rel="stylesheet" href="css/metisMenu.min.css" type="text/css" media="all" /> -->
-    <!-- new css for SB admin -->
     <link rel="stylesheet" href="css/metisMenu.min.css" type="text/css" media="all" />
     <link rel="stylesheet" href="css/sb-admin-2.css" type="text/css" media="all" />
-
-
-
     <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css" type="text/css" media="all" />
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto2" type="text/css" media="all" />
+
+    <!-- date range -->
+    <link rel="stylesheet" href="css/daterangepicker-bs3.css" type="text/css" media="all" />
+
+    <link rel="stylesheet" href="css/firefly.css" type="text/css" media="all" />
+
+
     @yield('styles')
 
     <!--[if lt IE 9]>
@@ -112,19 +114,23 @@
 
 <script type="text/javascript" src="js/jquery-2.1.3.min.js"></script>
 <script type="text/javascript" src="bootstrap/js/bootstrap.min.js"></script>
-<!-- <script type="text/javascript" src="js/jquery.metisMenu.min.js"></script> -->
-<!-- <script type="text/javascript" src="js/sb-admin-2.js"></script>-->
-
-<!-- new js for sb admin -->
-
 <script type="text/javascript" src="js/metisMenu.min.js"></script>
 <script type="text/javascript" src="js/sb-admin-2.js"></script>
-
-
-
-
-
 <script type="text/javascript" src="js/help.js"></script>
+
+<!-- date range stuff -->
+<script type="text/javascript" src="js/moment.min.js"></script>
+<script type="text/javascript" src="js/daterangepicker.js"></script>
+
+<script type="text/javascript">
+    var start = "{{Session::get('start')->format('d-m-Y')}}";
+    var end = "{{Session::get('end')->format('d-m-Y')}}";
+    var titleString = "{{Session::get('start')->format('j M Y')}} - {{Session::get('end')->format('j M Y')}}";
+    var dateRangeURL = "{{route('daterange')}}";
+    var token = "{{csrf_token()}}";
+    $('#daterange span').text(titleString);
+</script>
+
 <script type="text/javascript" src="js/firefly.js"></script>
 @yield('scripts')
 </body>

resources/views/partials/date_nav.blade.php

@@ -1,3 +1,5 @@
+{{--
+
 <div class="panel panel-default">
     <div class="panel-heading">
         <i class="fa fa-clock-o fa-fw"></i>
@@ -26,3 +28,4 @@
         </div>
     </div>
 </div>
+--}}

resources/views/partials/menu.blade.php

@@ -36,7 +36,7 @@
 
 
     </ul>
-
+    <p class="navbar-text navbar-right" id="daterange"><span>&nbsp;</span> <b class="caret"></b> </p>
 
 
     <!-- /.navbar-top-links -->