Last minute bug fixes.

Signed-off-by: James Cole <thegrumpydictator@gmail.com>

app/Http/Controllers/AccountController.php

@@ -268,7 +268,7 @@ class AccountController extends Controller
         $range    = Preferences::get('viewRange', '1M')->data;
         $start    = Navigation::startOfPeriod($carbon, $range);
         $end      = Navigation::endOfPeriod($carbon, $range);
-        $subTitle = $account->name;
+        $subTitle = $account->name . ' (' . Navigation::periodShow($start, $range) . ')';
         $page     = intval(Input::get('page'));
         $pageSize = Preferences::get('transactionPageSize', 50)->data;
         $offset   = ($page - 1) * $pageSize;
@@ -276,9 +276,9 @@ class AccountController extends Controller
         $count    = $set->count();
         $subSet   = $set->splice($offset, $pageSize);
         $journals = new LengthAwarePaginator($subSet, $count, $pageSize, $page);
-        $journals->setPath('categories/show/' . $account->id . '/' . $date);
+        $journals->setPath('accounts/show/' . $account->id . '/' . $date);
 
-        return view('accounts.show_with_date', compact('category', 'journals', 'subTitle', 'carbon'));
+        return view('accounts.show_with_date', compact('category', 'date', 'account', 'journals', 'subTitle', 'carbon'));
     }
 
     /**

app/Http/Controllers/Chart/AccountController.php

@@ -12,13 +12,17 @@ declare(strict_types = 1);
 namespace FireflyIII\Http\Controllers\Chart;
 
 use Carbon\Carbon;
+use Exception;
 use FireflyIII\Crud\Account\AccountCrudInterface;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
+use Log;
+use Navigation;
 use Preferences;
 use Response;
 use Steam;
@@ -231,4 +235,57 @@ class AccountController extends Controller
         return Response::json($data);
     }
 
+
+    /**
+     * @param Account $account
+     * @param string  $date
+     *
+     * @return \Illuminate\Http\JsonResponse
+     * @throws FireflyException
+     */
+    public function specificPeriod(Account $account, string $date)
+    {
+        try {
+            $start = new Carbon($date);
+        } catch (Exception $e) {
+            Log::error($e->getMessage());
+            throw new FireflyException('"' . e($date) . '" does not seem to be a valid date. Should be in the format YYYY-MM-DD');
+        }
+        $range = Preferences::get('viewRange', '1M')->data;
+        $end   = Navigation::endOfPeriod($start, $range);
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('frontpage');
+        $cache->addProperty('specificPeriod');
+        $cache->addProperty($account->id);
+        if ($cache->has()) {
+            return Response::json($cache->get());
+        }
+
+        $format    = (string)trans('config.month_and_day');
+        $range     = Steam::balanceInRange($account, $start, $end);
+        $current   = clone $start;
+        $previous  = array_values($range)[0];
+        $labels    = [];
+        $chartData = [];
+
+        while ($end >= $current) {
+            $theDate = $current->format('Y-m-d');
+            $balance = $range[$theDate] ?? $previous;
+
+            $labels[]    = $current->formatLocalized($format);
+            $chartData[] = $balance;
+            $previous    = $balance;
+            $current->addDay();
+        }
+
+
+        $data = $this->generator->single($account, $labels, $chartData);
+        $cache->store($data);
+
+        return Response::json($data);
+    }
+
 }

app/Http/breadcrumbs.php

@@ -62,14 +62,23 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'accounts.show', function (BreadCrumbGenerator $breadcrumbs, Account $account) {
-
     $what = config('firefly.shortNamesByFullName.' . $account->accountType->type);
-
-
     $breadcrumbs->parent('accounts.index', $what);
     $breadcrumbs->push(e($account->name), route('accounts.show', [$account->id]));
 }
 );
+
+Breadcrumbs::register(
+    'accounts.show.date', function (BreadCrumbGenerator $breadcrumbs, Account $account, Carbon $date) {
+    $breadcrumbs->parent('accounts.show', $account);
+
+    $range = Preferences::get('viewRange', '1M')->data;
+    $title = $account->name . ' (' . Navigation::periodShow($date, $range) . ')';
+
+    $breadcrumbs->push($title, route('accounts.show.date', [$account->id, $date->format('Y-m-d')]));
+}
+);
+
 Breadcrumbs::register(
     'accounts.delete', function (BreadCrumbGenerator $breadcrumbs, Account $account) {
     $breadcrumbs->parent('accounts.show', $account);

app/Http/routes.php

@@ -201,6 +201,7 @@ Route::group(
     Route::get('/chart/account/expense', ['uses' => 'Chart\AccountController@expenseAccounts']);
     Route::get('/chart/account/report/default/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\AccountController@report']);
     Route::get('/chart/account/{account}', ['uses' => 'Chart\AccountController@single']);
+    Route::get('/chart/account/{account}/{date}', ['uses' => 'Chart\AccountController@specificPeriod']);
 
 
     // bills:

public/js/ff/accounts/show_with_date.js

@@ -0,0 +1,98 @@
+/*
+ * show_with_date.js
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+/* global $, lineChart, dateString, accountID, token */
+
+
+// Return a helper with preserved width of cells
+var fixHelper = function (e, tr) {
+    "use strict";
+    var $originals = tr.children();
+    var $helper = tr.clone();
+    $helper.children().each(function (index) {
+        // Set helper cell sizes to match the original sizes
+        $(this).width($originals.eq(index).width());
+    });
+    return $helper;
+};
+
+$(function () {
+    "use strict";
+    if (typeof(lineChart) === "function" &&
+        typeof accountID !== 'undefined' &&
+        typeof dateString !== 'undefined'
+    ) {
+
+        lineChart('chart/account/' + accountID + '/' + dateString, 'period-specific-account');
+    }
+
+    // sortable!
+    if (typeof $(".sortable-table tbody").sortable !== "undefined") {
+        $(".sortable-table tbody").sortable(
+            {
+                helper: fixHelper,
+                items: 'tr:not(.ignore)',
+                stop: sortStop,
+                handle: '.handle',
+                start: function (event, ui) {
+                    // Build a placeholder cell that spans all the cells in the row
+                    var cellCount = 0;
+                    $('td, th', ui.helper).each(function () {
+                        // For each TD or TH try and get it's colspan attribute, and add that or 1 to the total
+                        var colspan = 1;
+                        var colspanAttr = $(this).attr('colspan');
+                        if (colspanAttr > 1) {
+                            colspan = colspanAttr;
+                        }
+                        cellCount += colspan;
+                    });
+
+                    // Add the placeholder UI - note that this is the item's content, so TD rather than TR
+                    ui.placeholder.html('<td colspan="' + cellCount + '">&nbsp;</td>');
+                }
+            }
+        ).disableSelection();
+    } else {
+        console.log('its null');
+    }
+
+});
+
+function sortStop(event, ui) {
+    "use strict";
+    var current = $(ui.item);
+    console.log('sort stop');
+    var thisDate = current.data('date');
+    var originalBG = current.css('backgroundColor');
+
+
+    if (current.prev().data('date') !== thisDate && current.next().data('date') !== thisDate) {
+        // animate something with color:
+        current.animate({backgroundColor: "#d9534f"}, 200, function () {
+            $(this).animate({backgroundColor: originalBG}, 200);
+        });
+
+        return false;
+    }
+
+    // do update
+    var list = $('tr[data-date="' + thisDate + '"]');
+    var submit = [];
+    $.each(list, function (i, v) {
+        var row = $(v);
+        var id = row.data('id');
+        submit.push(id);
+    });
+
+    // do extra animation when done?
+    $.post('transaction/reorder', {items: submit, date: thisDate, _token: token});
+
+    current.animate({backgroundColor: "#5cb85c"}, 200, function () {
+        $(this).animate({backgroundColor: originalBG}, 200);
+    });
+}

resources/views/accounts/show_with_date.twig

@@ -1,7 +1,8 @@
 {% extends "./layout/default.twig" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account) }}
+
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account, carbon) }}
 {% endblock %}
 
 {% block content %}
@@ -25,7 +26,7 @@
 
                 </div>
                 <div class="box-body">
-                    <canvas id="period-specific-period-account" style="width:100%;height:350px;" height="350"></canvas>
+                    <canvas id="period-specific-account" style="width:100%;height:350px;" height="350"></canvas>
                 </div>
             </div>
         </div>
@@ -51,11 +52,12 @@
 {% block scripts %}
     <script type="text/javascript">
         var accountID = {{ account.id }};
+        var dateString = "{{ date }}";
     </script>
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
     <script type="text/javascript" src="js/ff/charts.js"></script>
     <script src="js/lib/jquery-ui.min.js" type="text/javascript"></script>
     <script src="js/lib/jquery.color-2.1.2.min.js" type="text/javascript"></script>
-    <script src="js/ff/accounts/show.js" type="text/javascript"></script>
+    <script src="js/ff/accounts/show_with_date.js" type="text/javascript"></script>
     <script type="text/javascript" src="js/ff/transactions/list.js"></script>
 {% endblock %}