diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index fb586715de..df4557a824 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -360,7 +360,7 @@ class AccountController extends Controller * @return \Illuminate\Http\JsonResponse * @throws FireflyException */ - public function specificPeriod(Account $account, string $date) + public function period(Account $account, string $date) { try { $start = new Carbon($date); diff --git a/public/js/ff/accounts/show-by-date.js b/public/js/ff/accounts/show-by-date.js deleted file mode 100644 index 4e1768daf4..0000000000 --- a/public/js/ff/accounts/show-by-date.js +++ /dev/null @@ -1,95 +0,0 @@ -/* - * 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. - */ - -// 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"; - - lineChart(periodUri, 'period-specific-account'); - - pieChart(incomeCategoryUri, 'account-cat-in'); - pieChart(expenseCategoryUri, 'account-cat-out'); - pieChart(expenseBudgetUri, 'account-budget-out'); - - - // 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(' '); - } - } - ).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); - }); -} diff --git a/public/js/ff/accounts/show.js b/public/js/ff/accounts/show.js index 5875c0da90..e981faeb55 100644 --- a/public/js/ff/accounts/show.js +++ b/public/js/ff/accounts/show.js @@ -1,7 +1,13 @@ -/* global $, lineChart, accountID, token, incomeByCategoryUri, expenseByCategoryUri, expenseByBudgetUri */ +/* + * show.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ - -// Return a helper with preserved width of cells var fixHelper = function (e, tr) { "use strict"; var $originals = tr.children(); @@ -15,7 +21,7 @@ var fixHelper = function (e, tr) { $(function () { "use strict"; - lineChart(singleUri, 'overview-chart'); + lineChart(chartUri, 'overview-chart'); pieChart(incomeCategoryUri, 'account-cat-in'); pieChart(expenseCategoryUri, 'account-cat-out'); pieChart(expenseBudgetUri, 'account-budget-out'); diff --git a/resources/views/accounts/show-by-date.twig b/resources/views/accounts/show-by-date.twig index fbe746b110..e342b62344 100644 --- a/resources/views/accounts/show-by-date.twig +++ b/resources/views/accounts/show-by-date.twig @@ -26,7 +26,7 @@
- +
@@ -94,7 +94,7 @@ var dateString = "{{ date|escape }}"; // uri's for charts: - var periodUri = '{{ route('chart.account.single', [account.id, date]) }}'; + var chartUri = '{{ route('chart.account.period', [account.id, date]) }}'; var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; @@ -105,6 +105,6 @@ - + {% endblock %} diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig index 9826d1f358..ddc6034b04 100644 --- a/resources/views/accounts/show.twig +++ b/resources/views/accounts/show.twig @@ -123,7 +123,7 @@