From 6a750a998fd5394e55e77925d00dd54dced5e0f7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 15 May 2016 16:13:05 +0200 Subject: [PATCH] Remove category chart from report controller. --- app/Crud/Split/Journal.php | 13 ++++ app/Crud/Split/JournalInterface.php | 6 ++ app/Export/Entry/Entry.php | 1 - .../Events/ConnectJournalToPiggyBank.php | 1 - app/Helpers/Csv/Data.php | 6 +- app/Helpers/Report/ReportHelper.php | 32 ---------- app/Helpers/Report/ReportHelperInterface.php | 9 --- .../Controllers/Chart/CategoryController.php | 53 ---------------- app/Http/Controllers/ReportController.php | 5 +- .../Transaction/SplitController.php | 5 +- .../Controllers/TransactionController.php | 7 +-- app/Http/routes.php | 1 - app/Models/Account.php | 2 +- .../ExportJob/ExportJobRepository.php | 3 - app/Repositories/Rule/RuleRepository.php | 2 +- .../Shared/ComponentRepository.php | 63 ------------------- app/Repositories/Tag/TagRepository.php | 2 - app/Rules/Triggers/FromAccountContains.php | 1 - app/Rules/Triggers/FromAccountEnds.php | 1 - app/Rules/Triggers/FromAccountIs.php | 1 - app/Rules/Triggers/FromAccountStarts.php | 1 - app/Rules/Triggers/ToAccountContains.php | 1 - app/Rules/Triggers/ToAccountEnds.php | 1 - app/Rules/Triggers/ToAccountIs.php | 1 - app/Rules/Triggers/ToAccountStarts.php | 1 - public/js/ff/boxes.js | 61 ------------------ public/js/ff/reports/default/year.js | 9 --- resources/views/accounts/index.twig | 1 - resources/views/accounts/show.twig | 1 - resources/views/accounts/show_with_date.twig | 1 - resources/views/bills/index.twig | 1 - resources/views/bills/show.twig | 1 - resources/views/budgets/index.twig | 21 ------- resources/views/categories/index.twig | 1 - resources/views/csv/column-roles.twig | 12 ---- resources/views/csv/download-config.twig | 6 -- resources/views/csv/index.twig | 12 ---- resources/views/csv/map.twig | 12 ---- resources/views/csv/process.twig | 6 -- resources/views/index.twig | 26 +------- resources/views/layout/default.twig | 1 - resources/views/piggy-banks/show.twig | 1 - resources/views/reports/default/year.twig | 26 -------- resources/views/rules/index.twig | 5 -- resources/views/split/journals/create.twig | 15 ----- resources/views/split/journals/edit.twig | 15 ----- resources/views/tags/index.twig | 8 --- resources/views/tags/show.twig | 3 - 48 files changed, 30 insertions(+), 434 deletions(-) delete mode 100644 app/Repositories/Shared/ComponentRepository.php delete mode 100644 public/js/ff/boxes.js diff --git a/app/Crud/Split/Journal.php b/app/Crud/Split/Journal.php index 192a829778..0a0664ac33 100644 --- a/app/Crud/Split/Journal.php +++ b/app/Crud/Split/Journal.php @@ -40,6 +40,19 @@ class Journal implements JournalInterface $this->user = $user; } + /** + * @param $journal + * + * @return bool + */ + public function markAsComplete(TransactionJournal $journal) + { + $journal->completed = 1; + $journal->save(); + + return true; + } + /** * @param array $data * diff --git a/app/Crud/Split/JournalInterface.php b/app/Crud/Split/JournalInterface.php index 709f0abd45..2f0727d8e1 100644 --- a/app/Crud/Split/JournalInterface.php +++ b/app/Crud/Split/JournalInterface.php @@ -21,6 +21,12 @@ use Illuminate\Support\Collection; */ interface JournalInterface { + /** + * @param $journal + * + * @return bool + */ + public function markAsComplete(TransactionJournal $journal); /** * @param array $data diff --git a/app/Export/Entry/Entry.php b/app/Export/Entry/Entry.php index d27480b67f..e12666657a 100644 --- a/app/Export/Entry/Entry.php +++ b/app/Export/Entry/Entry.php @@ -65,7 +65,6 @@ class Entry $entry->category = new EntryCategory($journal->categories->first()); $entry->bill = new EntryBill($journal->bill); - // TODO support split journals $sources = TransactionJournal::sourceAccountList($journal); $entry->sourceAccount = new EntryAccount($sources->first()); $destinations = TransactionJournal::destinationAccountList($journal); diff --git a/app/Handlers/Events/ConnectJournalToPiggyBank.php b/app/Handlers/Events/ConnectJournalToPiggyBank.php index 7ac02550ba..83089674cc 100644 --- a/app/Handlers/Events/ConnectJournalToPiggyBank.php +++ b/app/Handlers/Events/ConnectJournalToPiggyBank.php @@ -44,7 +44,6 @@ class ConnectJournalToPiggyBank $amount = TransactionJournal::amountPositive($journal); // if piggy account matches source account, the amount is positive - // TODO support split journals if ($piggyBank->account_id == TransactionJournal::sourceAccount($journal)->id) { $amount = bcmul($amount, '-1'); } diff --git a/app/Helpers/Csv/Data.php b/app/Helpers/Csv/Data.php index 781d8ee5cf..b799a6baef 100644 --- a/app/Helpers/Csv/Data.php +++ b/app/Helpers/Csv/Data.php @@ -72,7 +72,7 @@ class Data } /** - * FIXME may return null + * FIXxME may return null * * @return string */ @@ -92,7 +92,7 @@ class Data } /** - * FIXME may return null + * FIXxME may return null * * @return string */ @@ -112,7 +112,7 @@ class Data } /** - * FIXME may return null + * FIXxME may return null * * @return string */ diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index 9117ef8216..c551eef6cf 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -100,38 +100,6 @@ class ReportHelper implements ReportHelperInterface return $collection; } - /** - * Find all transactions and IF we have spent money in them - * with either transactions or journals. - * - * @param Carbon $start - * @param Carbon $end - * @param Collection $accounts - * - * @return Collection - */ - public function getCategoriesWithTransactions(Carbon $start, Carbon $end, Collection $accounts): Collection - { - /** @var CategoryRepositoryInterface $repository */ - $repository = app(CategoryRepositoryInterface::class); - $categories = $repository->getCategories(); - $return = new Collection; - foreach ($categories as $category) { - $lastUseDate = $repository->lastUseDate($category, $accounts); - if ($lastUseDate >= $start && $lastUseDate <= $end) { - $return->push($category); - } - } - - $return = $return->sortBy( - function (Category $category) { - return $category->name; - } - ); - - return $return; - } - /** * @param Carbon $start * @param Carbon $end diff --git a/app/Helpers/Report/ReportHelperInterface.php b/app/Helpers/Report/ReportHelperInterface.php index dd30dc7165..33be9fe4e8 100644 --- a/app/Helpers/Report/ReportHelperInterface.php +++ b/app/Helpers/Report/ReportHelperInterface.php @@ -32,15 +32,6 @@ interface ReportHelperInterface */ public function getBillReport(Carbon $start, Carbon $end, Collection $accounts): BillCollection; - /** - * @param Carbon $start - * @param Carbon $end - * @param Collection $accounts - * - * @return Collection - */ - public function getCategoriesWithTransactions(Carbon $start, Carbon $end, Collection $accounts): Collection; - /** * @param Carbon $start * @param Carbon $end diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index c2b9675ca5..872323b6cb 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -218,59 +218,6 @@ class CategoryController extends Controller } - /** - * @param Category $category - * @param Carbon $start - * @param Carbon $end - * @param Collection $accounts - * - * @return \Illuminate\Http\JsonResponse - */ - public function period(Category $category, Carbon $start, Carbon $end, Collection $accounts) - { - // chart properties for cache: - $cache = new CacheProperties(); - $cache->addProperty($start); - $cache->addProperty($end); - $cache->addProperty($accounts); - $cache->addProperty($category->id); - $cache->addProperty('category'); - $cache->addProperty('period'); - if ($cache->has()) { - return Response::json($cache->get()); - } - - /** @var CRI $repository */ - $repository = app(CRI::class); - $categoryCollection = new Collection([$category]); - // loop over period, add by users range: - $current = clone $start; - $viewRange = Preferences::get('viewRange', '1M')->data; - $format = strval(trans('config.month')); - $set = new Collection; - while ($current < $end) { - $currentStart = clone $current; - $currentEnd = Navigation::endOfPeriod($currentStart, $viewRange); - $spent = $repository->spentInPeriod($categoryCollection, $accounts, $currentStart, $currentEnd); - $earned = $repository->earnedInPeriod($categoryCollection, $accounts, $currentStart, $currentEnd); - - $entry = [ - $category->name, - $currentStart->formatLocalized($format), - $spent, - $earned, - - ]; - $set->push($entry); - $currentEnd->addDay(); - $current = clone $currentEnd; - } - $data = $this->generator->period($set); - $cache->store($data); - - return Response::json($data); - } - /** * @param CRI $repository * @param Category $category diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 24e318e979..da40deee89 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -314,9 +314,6 @@ class ReportController extends Controller // find the budgets we've spent money on this period with these accounts: $budgets = $this->budgetHelper->getBudgetsWithExpenses($start, $end, $accounts); - // find the categories we've spent money on this period with these accounts: - $categories = $this->helper->getCategoriesWithTransactions($start, $end, $accounts); - Session::flash('gaEventCategory', 'report'); Session::flash('gaEventAction', 'year'); Session::flash('gaEventLabel', $start->format('Y')); @@ -333,7 +330,7 @@ class ReportController extends Controller 'reports.default.year', compact( 'start', 'accountReport', 'incomes', 'reportType', 'accountIds', 'end', - 'expenses', 'incomeTopLength', 'expenseTopLength', 'tags', 'budgets', 'categories' + 'expenses', 'incomeTopLength', 'expenseTopLength', 'tags', 'budgets' ) ); } diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 46bd9577ae..896717c6e5 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -31,7 +31,6 @@ use View; * * @package FireflyIII\Http\Controllers\Transaction * - * TODO support piggy banks */ class SplitController extends Controller { @@ -132,9 +131,7 @@ class SplitController extends Controller $repository->storeTransaction($journal, $transaction); } - // TODO move to repository - $journal->completed = 1; - $journal->save(); + $repository->markAsComplete($journal); Session::flash('success', strval(trans('firefly.stored_journal', ['description' => e($journal->description)]))); Preferences::mark(); diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 0015bc99a6..31b6bf183d 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -18,6 +18,7 @@ use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Requests\JournalFormRequest; use FireflyIII\Http\Requests\MassDeleteJournalRequest; use FireflyIII\Http\Requests\MassEditJournalRequest; +use FireflyIII\Models\AccountType; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; @@ -165,13 +166,11 @@ class TransactionController extends Controller 'amount' => TransactionJournal::amountPositive($journal), ]; - // TODO support split withdrawal - if ($journal->isWithdrawal() && TransactionJournal::destinationAccountTypeStr($journal) == 'Cash account') { + if ($journal->isWithdrawal() && $destinationAccounts->first()->accountType->type == AccountType::CASH) { $preFilled['destination_account_name'] = ''; } - // TODO support split withdrawal - if ($journal->isDeposit() && TransactionJournal::sourceAccountTypeStr($journal) == 'Cash account') { + if ($journal->isDeposit() && $sourceAccounts->first()->accountType->type == AccountType::CASH) { $preFilled['source_account_name'] = ''; } diff --git a/app/Http/routes.php b/app/Http/routes.php index ede270be5f..a4411ff875 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -210,7 +210,6 @@ Route::group( // categories: Route::get('/chart/category/frontpage', ['uses' => 'Chart\CategoryController@frontpage']); - Route::get('/chart/category/period/{category}/default/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\CategoryController@period']); // these three charts are for reports: Route::get('/chart/category/multi-year/default/{start_date}/{end_date}/{accountList}/{categoryList}', ['uses' => 'Chart\CategoryController@multiYear']); diff --git a/app/Models/Account.php b/app/Models/Account.php index eaddfd0637..2c2b46f911 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -164,7 +164,7 @@ class Account extends Model } /** - * FIXME can return null + * FIxxME can return null * * @param $value * diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index a5d53b630b..5262926168 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -91,9 +91,6 @@ class ExportJobRepository implements ExportJobRepositoryInterface } /** - * - * FIXME this may return null - * * @param string $key * * @return ExportJob|null diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index a719b7e654..e9605021f3 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -64,7 +64,7 @@ class RuleRepository implements RuleRepositoryInterface } /** - * FIXME can return null + * FIxXME can return null * * @return RuleGroup */ diff --git a/app/Repositories/Shared/ComponentRepository.php b/app/Repositories/Shared/ComponentRepository.php deleted file mode 100644 index 683121338b..0000000000 --- a/app/Repositories/Shared/ComponentRepository.php +++ /dev/null @@ -1,63 +0,0 @@ -pluck('id')->toArray(); - $entry = $object->transactionjournals() - ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') - ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') - ->whereIn('accounts.id', $ids) - ->transactionTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::OPENING_BALANCE]) - ->before($end) - ->after($start) - ->first([DB::raw('SUM(`transactions`.`amount`) as `journalAmount`')]); - $amount = $entry->journalAmount ?? '0'; - - // all balances based on individual transactions (at the moment, it's an "or or"): - $entry = $object - ->transactions() - // left join journals to get some meta-information. - ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - // also left join transaction types so we can do the same type of filtering. - ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id') - // need to do these manually. - ->whereIn('transaction_types.type', [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::OPENING_BALANCE]) - ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00')) - ->where('transaction_journals.date', '<=', $end->format('Y-m-d 00:00:00')) - ->whereIn('transactions.account_id', $ids) - ->first([DB::raw('SUM(`transactions`.`amount`) as `journalAmount`')]); - - // sum of amount: - $extraAmount = $entry->journalAmount ?? '0'; - $result = bcadd($amount, $extraAmount); - - return $result; - } -} diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 864df83367..c376c755e6 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -229,11 +229,9 @@ class TagRepository implements TagRepositoryInterface // $checkAccount is the source_account for a withdrawal // $checkAccount is the destination_account for a deposit - // TODO match split journals if ($check->isWithdrawal() && TransactionJournal::sourceAccount($check)->id != TransactionJournal::destinationAccount($journal)->id) { $match = false; } - // TODO match split journals if ($check->isDeposit() && TransactionJournal::destinationAccount($check)->id != TransactionJournal::destinationAccount($journal)->id) { $match = false; } diff --git a/app/Rules/Triggers/FromAccountContains.php b/app/Rules/Triggers/FromAccountContains.php index fe2abb7e4f..58799b60d4 100644 --- a/app/Rules/Triggers/FromAccountContains.php +++ b/app/Rules/Triggers/FromAccountContains.php @@ -52,7 +52,6 @@ final class FromAccountContains extends AbstractTrigger implements TriggerInterf */ public function triggered(TransactionJournal $journal): bool { - // TODO support split withdrawals $fromAccountName = strtolower($journal->source_account_name ?? TransactionJournal::sourceAccount($journal)->name); $search = strtolower($this->triggerValue); $strpos = strpos($fromAccountName, $search); diff --git a/app/Rules/Triggers/FromAccountEnds.php b/app/Rules/Triggers/FromAccountEnds.php index a588742988..96e83fadcf 100644 --- a/app/Rules/Triggers/FromAccountEnds.php +++ b/app/Rules/Triggers/FromAccountEnds.php @@ -52,7 +52,6 @@ final class FromAccountEnds extends AbstractTrigger implements TriggerInterface */ public function triggered(TransactionJournal $journal): bool { - // TODO support split withdrawals $name = strtolower($journal->source_account_name ?? TransactionJournal::sourceAccount($journal)->name); $nameLength = strlen($name); $search = strtolower($this->triggerValue); diff --git a/app/Rules/Triggers/FromAccountIs.php b/app/Rules/Triggers/FromAccountIs.php index fb4aae7006..061044cf7d 100644 --- a/app/Rules/Triggers/FromAccountIs.php +++ b/app/Rules/Triggers/FromAccountIs.php @@ -52,7 +52,6 @@ final class FromAccountIs extends AbstractTrigger implements TriggerInterface */ public function triggered(TransactionJournal $journal): bool { - // TODO support split withdrawals $name = strtolower($journal->source_account_name ?? TransactionJournal::sourceAccount($journal)->name); $search = strtolower($this->triggerValue); diff --git a/app/Rules/Triggers/FromAccountStarts.php b/app/Rules/Triggers/FromAccountStarts.php index f53a64ba28..62eaafac67 100644 --- a/app/Rules/Triggers/FromAccountStarts.php +++ b/app/Rules/Triggers/FromAccountStarts.php @@ -52,7 +52,6 @@ final class FromAccountStarts extends AbstractTrigger implements TriggerInterfac */ public function triggered(TransactionJournal $journal): bool { - // TODO support split withdrawals $name = strtolower($journal->source_account_name ?? TransactionJournal::sourceAccount($journal)->name); $search = strtolower($this->triggerValue); diff --git a/app/Rules/Triggers/ToAccountContains.php b/app/Rules/Triggers/ToAccountContains.php index 12e138dcdd..f6d7c31c68 100644 --- a/app/Rules/Triggers/ToAccountContains.php +++ b/app/Rules/Triggers/ToAccountContains.php @@ -52,7 +52,6 @@ final class ToAccountContains extends AbstractTrigger implements TriggerInterfac */ public function triggered(TransactionJournal $journal): bool { - // TODO support split journals $toAccountName = strtolower($journal->destination_account_name ?? TransactionJournal::destinationAccount($journal)->name); $search = strtolower($this->triggerValue); $strpos = strpos($toAccountName, $search); diff --git a/app/Rules/Triggers/ToAccountEnds.php b/app/Rules/Triggers/ToAccountEnds.php index 220730ac50..f01d8d8ba5 100644 --- a/app/Rules/Triggers/ToAccountEnds.php +++ b/app/Rules/Triggers/ToAccountEnds.php @@ -52,7 +52,6 @@ final class ToAccountEnds extends AbstractTrigger implements TriggerInterface */ public function triggered(TransactionJournal $journal): bool { - // TODO support split journals $toAccountName = strtolower($journal->destination_account_name ?? TransactionJournal::destinationAccount($journal)->name); $toAccountNameLength = strlen($toAccountName); $search = strtolower($this->triggerValue); diff --git a/app/Rules/Triggers/ToAccountIs.php b/app/Rules/Triggers/ToAccountIs.php index 8a2f46ea14..6d1ea0181e 100644 --- a/app/Rules/Triggers/ToAccountIs.php +++ b/app/Rules/Triggers/ToAccountIs.php @@ -52,7 +52,6 @@ final class ToAccountIs extends AbstractTrigger implements TriggerInterface */ public function triggered(TransactionJournal $journal): bool { - // TODO support split journals $toAccountName = strtolower($journal->destination_account_name ?? TransactionJournal::destinationAccount($journal)->name); $search = strtolower($this->triggerValue); diff --git a/app/Rules/Triggers/ToAccountStarts.php b/app/Rules/Triggers/ToAccountStarts.php index 64bebd5ce1..8f00f80d0c 100644 --- a/app/Rules/Triggers/ToAccountStarts.php +++ b/app/Rules/Triggers/ToAccountStarts.php @@ -52,7 +52,6 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface */ public function triggered(TransactionJournal $journal): bool { - // TODO support split journals $toAccountName = strtolower($journal->destination_account_name ?? TransactionJournal::destinationAccount($journal)->name); $search = strtolower($this->triggerValue); diff --git a/public/js/ff/boxes.js b/public/js/ff/boxes.js deleted file mode 100644 index ae787e7f5b..0000000000 --- a/public/js/ff/boxes.js +++ /dev/null @@ -1,61 +0,0 @@ -/* - * boxes.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. - */ - -$(function () { - "use strict"; - $('button[data-widget="collapse"]').click(storeBoxState); - - // restore boxes to their original state: - $.each($('.box'), function (i, v) { - var box = $(v); - if (box.attr('id')) { - var state = getBoxState(box.attr('id')); - console.log('Box ' + box.attr('id') + ' should be ' + state); - if(state == 'closed') { - $('button[data-widget="collapse"]', box).click(); - } - } - }); -}); - -function storeBoxState(e) { - "use strict"; - //Find the box parent - var button = $(e.target); - var box = button.parents(".box").first(); - var id = box.attr('id'); - if (id) { - console.log('Box has id: ' + id); - if (box.hasClass('collapsed-box')) { - setBoxState(id, 'open'); - console.log('Box "' + id + '" is now opening / open.'); - } else { - setBoxState(id, 'closed'); - console.log('Box "' + id + '" is now closing / closed.'); - } - } -} - -function setBoxState(id, state) { - "use strict"; - var index = 'ff-box-state-' + id; - if (typeof(Storage) !== "undefined") { - localStorage.setItem(index, state); - } -} -function getBoxState(id) { - "use strict"; - var index = 'ff-box-state-' + id; - if (typeof(Storage) !== "undefined") { - var state = localStorage.getItem(index); - if (state) { - return state; - } - } - return 'open'; -} \ No newline at end of file diff --git a/public/js/ff/reports/default/year.js b/public/js/ff/reports/default/year.js index 22d6797f08..f342c7e1dc 100644 --- a/public/js/ff/reports/default/year.js +++ b/public/js/ff/reports/default/year.js @@ -27,15 +27,6 @@ function drawChart() { columnChart('chart/budget/period/' + budgetId + '/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, id); }); - - // and another loop - $.each($('.category_year_chart'), function (i, v) { - var holder = $(v); - var id = holder.attr('id'); - var categoryId = holder.data('category'); - columnChart('chart/category/period/' + categoryId + '/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, id); - - }); } diff --git a/resources/views/accounts/index.twig b/resources/views/accounts/index.twig index 2310652b71..78c30497da 100644 --- a/resources/views/accounts/index.twig +++ b/resources/views/accounts/index.twig @@ -21,7 +21,6 @@
-