Initial code base for tag report.

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -141,52 +141,10 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         return $this;
     }
 
-    /**
-     * @param Collection $collection
-     * @param int        $sortFlag
-     *
-     * @return array
-     */
-    private function getAverages(Collection $collection, int $sortFlag): array
-    {
-        $result = [];
-        /** @var Transaction $transaction */
-        foreach ($collection as $transaction) {
-            // opposing name and ID:
-            $opposingId = $transaction->opposing_account_id;
-
-            // is not set?
-            if (!isset($result[$opposingId])) {
-                $name                = $transaction->opposing_account_name;
-                $result[$opposingId] = [
-                    'name'    => $name,
-                    'count'   => 1,
-                    'id'      => $opposingId,
-                    'average' => $transaction->transaction_amount,
-                    'sum'     => $transaction->transaction_amount,
-                ];
-                continue;
-            }
-            $result[$opposingId]['count']++;
-            $result[$opposingId]['sum']     = bcadd($result[$opposingId]['sum'], $transaction->transaction_amount);
-            $result[$opposingId]['average'] = bcdiv($result[$opposingId]['sum'], strval($result[$opposingId]['count']));
-        }
-
-        // sort result by average:
-        $average = [];
-        foreach ($result as $key => $row) {
-            $average[$key] = floatval($row['average']);
-        }
-
-        array_multisort($average, $sortFlag, $result);
-
-        return $result;
-    }
-
     /**
      * @return Collection
      */
-    private function getExpenses(): Collection
+    protected function getExpenses(): Collection
     {
         if ($this->expenses->count() > 0) {
             Log::debug('Return previous set of expenses.');
@@ -208,34 +166,6 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         return $transactions;
     }
 
-    /**
-     * @return Collection
-     */
-    private function getTopExpenses(): Collection
-    {
-        $transactions = $this->getExpenses()->sortBy('transaction_amount');
-
-        return $transactions;
-    }
-
-    /**
-     * @param Collection $collection
-     *
-     * @return array
-     */
-    private function summarizeByAccount(Collection $collection): array
-    {
-        $result = [];
-        /** @var Transaction $transaction */
-        foreach ($collection as $transaction) {
-            $accountId          = $transaction->account_id;
-            $result[$accountId] = $result[$accountId] ?? '0';
-            $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
-        }
-
-        return $result;
-    }
-
     /**
      * @param Collection $collection
      *

app/Generator/Report/Category/MonthReportGenerator.php

@@ -151,52 +151,10 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         return $this;
     }
 
-    /**
-     * @param Collection $collection
-     * @param int        $sortFlag
-     *
-     * @return array
-     */
-    private function getAverages(Collection $collection, int $sortFlag): array
-    {
-        $result = [];
-        /** @var Transaction $transaction */
-        foreach ($collection as $transaction) {
-            // opposing name and ID:
-            $opposingId = $transaction->opposing_account_id;
-
-            // is not set?
-            if (!isset($result[$opposingId])) {
-                $name                = $transaction->opposing_account_name;
-                $result[$opposingId] = [
-                    'name'    => $name,
-                    'count'   => 1,
-                    'id'      => $opposingId,
-                    'average' => $transaction->transaction_amount,
-                    'sum'     => $transaction->transaction_amount,
-                ];
-                continue;
-            }
-            $result[$opposingId]['count']++;
-            $result[$opposingId]['sum']     = bcadd($result[$opposingId]['sum'], $transaction->transaction_amount);
-            $result[$opposingId]['average'] = bcdiv($result[$opposingId]['sum'], strval($result[$opposingId]['count']));
-        }
-
-        // sort result by average:
-        $average = [];
-        foreach ($result as $key => $row) {
-            $average[$key] = floatval($row['average']);
-        }
-
-        array_multisort($average, $sortFlag, $result);
-
-        return $result;
-    }
-
     /**
      * @return Collection
      */
-    private function getExpenses(): Collection
+    protected function getExpenses(): Collection
     {
         if ($this->expenses->count() > 0) {
             Log::debug('Return previous set of expenses.');
@@ -221,7 +179,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
     /**
      * @return Collection
      */
-    private function getIncome(): Collection
+    protected function getIncome(): Collection
     {
         if ($this->income->count() > 0) {
             return $this->income;
@@ -240,85 +198,6 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         return $transactions;
     }
 
-    /**
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
-     * @param array $spent
-     * @param array $earned
-     *
-     * @return array
-     */
-    private function getObjectSummary(array $spent, array $earned): array
-    {
-        $return = [];
-
-        /**
-         * @var int    $accountId
-         * @var string $entry
-         */
-        foreach ($spent as $objectId => $entry) {
-            if (!isset($return[$objectId])) {
-                $return[$objectId] = ['spent' => 0, 'earned' => 0];
-            }
-
-            $return[$objectId]['spent'] = $entry;
-        }
-        unset($entry);
-
-        /**
-         * @var int    $accountId
-         * @var string $entry
-         */
-        foreach ($earned as $objectId => $entry) {
-            if (!isset($return[$objectId])) {
-                $return[$objectId] = ['spent' => 0, 'earned' => 0];
-            }
-
-            $return[$objectId]['earned'] = $entry;
-        }
-
-
-        return $return;
-    }
-
-
-    /**
-     * @return Collection
-     */
-    private function getTopExpenses(): Collection
-    {
-        $transactions = $this->getExpenses()->sortBy('transaction_amount');
-
-        return $transactions;
-    }
-
-    /**
-     * @return Collection
-     */
-    private function getTopIncome(): Collection
-    {
-        $transactions = $this->getIncome()->sortByDesc('transaction_amount');
-
-        return $transactions;
-    }
-
-    /**
-     * @param Collection $collection
-     *
-     * @return array
-     */
-    private function summarizeByAccount(Collection $collection): array
-    {
-        $result = [];
-        /** @var Transaction $transaction */
-        foreach ($collection as $transaction) {
-            $accountId          = $transaction->account_id;
-            $result[$accountId] = $result[$accountId] ?? '0';
-            $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
-        }
-
-        return $result;
-    }
-
     /**
      * @param Collection $collection
      *

app/Generator/Report/Category/MultiYearReportGenerator.php

@@ -17,7 +17,7 @@ namespace FireflyIII\Generator\Report\Category;
 /**
  * Class MultiYearReportGenerator
  *
- * @package FireflyIII\Generator\Report\Audit
+ * @package FireflyIII\Generator\Report\Category
  */
 class MultiYearReportGenerator extends MonthReportGenerator
 {

app/Generator/Report/Category/YearReportGenerator.php

@@ -17,7 +17,7 @@ namespace FireflyIII\Generator\Report\Category;
 /**
  * Class YearReportGenerator
  *
- * @package FireflyIII\Generator\Report\Audit
+ * @package FireflyIII\Generator\Report\Category
  */
 class YearReportGenerator extends MonthReportGenerator
 {

app/Generator/Report/Support.php

@@ -80,4 +80,124 @@ class Support
         return $result;
     }
 
+    /**
+     * @param Collection $collection
+     * @param int        $sortFlag
+     *
+     * @return array
+     */
+    protected function getAverages(Collection $collection, int $sortFlag): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            // opposing name and ID:
+            $opposingId = $transaction->opposing_account_id;
+
+            // is not set?
+            if (!isset($result[$opposingId])) {
+                $name                = $transaction->opposing_account_name;
+                $result[$opposingId] = [
+                    'name'    => $name,
+                    'count'   => 1,
+                    'id'      => $opposingId,
+                    'average' => $transaction->transaction_amount,
+                    'sum'     => $transaction->transaction_amount,
+                ];
+                continue;
+            }
+            $result[$opposingId]['count']++;
+            $result[$opposingId]['sum']     = bcadd($result[$opposingId]['sum'], $transaction->transaction_amount);
+            $result[$opposingId]['average'] = bcdiv($result[$opposingId]['sum'], strval($result[$opposingId]['count']));
+        }
+
+        // sort result by average:
+        $average = [];
+        foreach ($result as $key => $row) {
+            $average[$key] = floatval($row['average']);
+        }
+
+        array_multisort($average, $sortFlag, $result);
+
+        return $result;
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
+     * @param array $spent
+     * @param array $earned
+     *
+     * @return array
+     */
+    protected function getObjectSummary(array $spent, array $earned): array
+    {
+        $return = [];
+
+        /**
+         * @var int    $accountId
+         * @var string $entry
+         */
+        foreach ($spent as $objectId => $entry) {
+            if (!isset($return[$objectId])) {
+                $return[$objectId] = ['spent' => 0, 'earned' => 0];
+            }
+
+            $return[$objectId]['spent'] = $entry;
+        }
+        unset($entry);
+
+        /**
+         * @var int    $accountId
+         * @var string $entry
+         */
+        foreach ($earned as $objectId => $entry) {
+            if (!isset($return[$objectId])) {
+                $return[$objectId] = ['spent' => 0, 'earned' => 0];
+            }
+
+            $return[$objectId]['earned'] = $entry;
+        }
+
+
+        return $return;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getTopExpenses(): Collection
+    {
+        $transactions = $this->getExpenses()->sortBy('transaction_amount');
+
+        return $transactions;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getTopIncome(): Collection
+    {
+        $transactions = $this->getIncome()->sortByDesc('transaction_amount');
+
+        return $transactions;
+    }
+
+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    protected function summarizeByAccount(Collection $collection): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $accountId          = $transaction->account_id;
+            $result[$accountId] = $result[$accountId] ?? '0';
+            $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
+        }
+
+        return $result;
+    }
+
 }

app/Generator/Report/Tag/MonthReportGenerator.php

@@ -0,0 +1,219 @@
+<?php
+/**
+ * MonthReportGenerator.php
+ * Copyright (c) 2017 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.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Tag;
+
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\ReportGeneratorInterface;
+use FireflyIII\Generator\Report\Support;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class MonthReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Tag
+ */
+class MonthReportGenerator extends Support implements ReportGeneratorInterface
+{
+
+    /** @var Collection */
+    private $accounts;
+    /** @var  Carbon */
+    private $end;
+    /** @var Collection */
+    private $expenses;
+    /** @var Collection */
+    private $income;
+    /** @var  Carbon */
+    private $start;
+    /** @var Collection */
+    private $tags;
+
+    /**
+     * MonthReportGenerator constructor.
+     */
+    public function __construct()
+    {
+        $this->expenses = new Collection;
+        $this->income   = new Collection;
+    }
+
+    /**
+     * @return string
+     */
+    public function generate(): string
+    {
+        $accountIds      = join(',', $this->accounts->pluck('id')->toArray());
+        $tagTags         = join(',', $this->tags->pluck('tag')->toArray());
+        $reportType      = 'tag';
+        $expenses        = $this->getExpenses();
+        $income          = $this->getIncome();
+        $accountSummary  = $this->getObjectSummary($this->summarizeByAccount($expenses), $this->summarizeByAccount($income));
+        $tagSummary      = $this->getObjectSummary($this->summarizeByTag($expenses), $this->summarizeByTag($income));
+        $averageExpenses = $this->getAverages($expenses, SORT_ASC);
+        $averageIncome   = $this->getAverages($income, SORT_DESC);
+        $topExpenses     = $this->getTopExpenses();
+        $topIncome       = $this->getTopIncome();
+
+
+        // render!
+        return view(
+            'reports.tag.month', compact(
+                                   'accountIds', 'tagTags', 'reportType', 'accountSummary', 'tagSummary', 'averageExpenses', 'averageIncome', 'topIncome',
+                                   'topExpenses'
+                               )
+        )->with('start', $this->start)->with('end', $this->end)->with('tags', $this->tags)->with('accounts', $this->accounts)->render();
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setAccounts(Collection $accounts): ReportGeneratorInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Collection $categories
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setCategories(Collection $categories): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setEndDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->end = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setStartDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->start = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $tags
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setTags(Collection $tags): ReportGeneratorInterface
+    {
+        $this->tags = $tags;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection
+     */
+    protected function getExpenses(): Collection
+    {
+        if ($this->expenses->count() > 0) {
+            Log::debug('Return previous set of expenses.');
+
+            return $this->expenses;
+        }
+
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
+                  ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
+                  ->setTags($this->tags)->withOpposingAccount()->disableFilter();
+
+        $accountIds     = $this->accounts->pluck('id')->toArray();
+        $transactions   = $collector->getJournals();
+        $transactions   = self::filterExpenses($transactions, $accountIds);
+        $this->expenses = $transactions;
+
+        return $transactions;
+    }
+
+    /**
+     * @return Collection
+     */
+    protected function getIncome(): Collection
+    {
+        if ($this->income->count() > 0) {
+            return $this->income;
+        }
+
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
+                  ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
+                  ->setTags($this->tags)->withOpposingAccount();
+        $accountIds   = $this->accounts->pluck('id')->toArray();
+        $transactions = $collector->getJournals();
+        $transactions = self::filterIncome($transactions, $accountIds);
+        $this->income = $transactions;
+
+        return $transactions;
+    }
+
+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    protected function summarizeByTag(Collection $collection): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $journal     = $transaction->transactionJournal;
+            $journalTags = $journal->tags;
+            /** @var Tag $journalTag */
+            foreach ($journalTags as $journalTag) {
+                $journalTagId          = $journalTag->id;
+                $result[$journalTagId] = $result[$journalTagId] ?? '0';
+                $result[$journalTagId] = bcadd($transaction->transaction_amount, $result[$journalTagId]);
+            }
+        }
+
+        return $result;
+    }
+}

app/Generator/Report/Tag/MultiYearReportGenerator.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * MultiYearReportGenerator.php
+ * Copyright (c) 2017 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.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Tag;
+
+
+/**
+ * Class MultiYearReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Tag
+ */
+class MultiYearReportGenerator extends MonthReportGenerator
+{
+    /**
+     * Doesn't do anything different.
+     */
+}

app/Generator/Report/Tag/YearReportGenerator.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * YearReportGenerator.php
+ * Copyright (c) 2017 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.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Tag;
+
+
+/**
+ * Class YearReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Tag
+ */
+class YearReportGenerator extends MonthReportGenerator
+{
+
+    /**
+     * Doesn't do anything different.
+     */
+}

app/Helpers/Collector/JournalCollector.php

@@ -712,4 +712,18 @@ class JournalCollector implements JournalCollectorInterface
             $this->query->leftJoin('tag_transaction_journal', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
         }
     }
+
+    /**
+     * @param Collection $tags
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setTags(Collection $tags): JournalCollectorInterface
+    {
+        $this->joinTagTables();
+        $tagIds = $tags->pluck('id')->toArray();
+        $this->query->whereIn('tag_transaction_journal.tag_id', $tagIds);
+
+        return $this;
+    }
 }

app/Helpers/Collector/JournalCollectorInterface.php

@@ -141,6 +141,13 @@ interface JournalCollectorInterface
      */
     public function setTag(Tag $tag): JournalCollectorInterface;
 
+    /**
+     * @param Collection $tags
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setTags(Collection $tags): JournalCollectorInterface;
+
     /**
      * @param array $types
      *

app/Http/Controllers/Chart/CategoryReportController.php

@@ -331,22 +331,4 @@ class CategoryReportController extends Controller
 
         return $grouped;
     }
-
-    /**
-     * @param Collection $set
-     *
-     * @return array
-     */
-    private function groupByOpposingAccount(Collection $set): array
-    {
-        $grouped = [];
-        /** @var Transaction $transaction */
-        foreach ($set as $transaction) {
-            $accountId           = $transaction->opposing_account_id;
-            $grouped[$accountId] = $grouped[$accountId] ?? '0';
-            $grouped[$accountId] = bcadd($transaction->transaction_amount, $grouped[$accountId]);
-        }
-
-        return $grouped;
-    }
 }

app/Http/Controllers/Chart/TagReportController.php

@@ -0,0 +1,216 @@
+<?php
+/**
+ * TagReportController.php
+ * Copyright (c) 2017 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.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers\Chart;
+
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
+use FireflyIII\Generator\Report\Tag\MonthReportGenerator;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Support\CacheProperties;
+use Illuminate\Support\Collection;
+use Navigation;
+use Response;
+
+class TagReportController extends Controller
+{
+    /** @var GeneratorInterface */
+    protected $generator;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        // create chart generator:
+        $this->generator = app(GeneratorInterface::class);
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $tags
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function mainChart(Collection $accounts, Collection $tags, Carbon $start, Carbon $end)
+    {
+        $cache = new CacheProperties;
+        $cache->addProperty('chart.category.report.main');
+        $cache->addProperty($accounts);
+        $cache->addProperty($tags);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        if ($cache->has()) {
+            return Response::json($cache->get());
+        }
+
+        $format       = Navigation::preferredCarbonLocalizedFormat($start, $end);
+        $function     = Navigation::preferredEndOfPeriod($start, $end);
+        $chartData    = [];
+        $currentStart = clone $start;
+
+        // prep chart data:
+        foreach ($tags as $tag) {
+            $chartData[$tag->id . '-in']  = [
+                'label'   => $tag->tag . ' (' . strtolower(strval(trans('firefly.income'))) . ')',
+                'type'    => 'bar',
+                'yAxisID' => 'y-axis-0',
+                'entries' => [],
+            ];
+            $chartData[$tag->id . '-out'] = [
+                'label'   => $tag->tag . ' (' . strtolower(strval(trans('firefly.expenses'))) . ')',
+                'type'    => 'bar',
+                'yAxisID' => 'y-axis-0',
+                'entries' => [],
+            ];
+            // total in, total out:
+            $chartData[$tag->id . '-total-in']  = [
+                'label'   => $tag->tag . ' (' . strtolower(strval(trans('firefly.sum_of_income'))) . ')',
+                'type'    => 'line',
+                'fill'    => false,
+                'yAxisID' => 'y-axis-1',
+                'entries' => [],
+            ];
+            $chartData[$tag->id . '-total-out'] = [
+                'label'   => $tag->tag . ' (' . strtolower(strval(trans('firefly.sum_of_expenses'))) . ')',
+                'type'    => 'line',
+                'fill'    => false,
+                'yAxisID' => 'y-axis-1',
+                'entries' => [],
+            ];
+        }
+        $sumOfIncome  = [];
+        $sumOfExpense = [];
+
+        while ($currentStart < $end) {
+            $currentEnd = clone $currentStart;
+            $currentEnd = $currentEnd->$function();
+            $expenses   = $this->groupByTag($this->getExpenses($accounts, $tags, $currentStart, $currentEnd));
+            $income     = $this->groupByTag($this->getIncome($accounts, $tags, $currentStart, $currentEnd));
+            $label      = $currentStart->formatLocalized($format);
+
+            /** @var Tag $tag */
+            foreach ($tags as $tag) {
+                $labelIn        = $tag->id . '-in';
+                $labelOut       = $tag->id . '-out';
+                $labelSumIn     = $tag->id . '-total-in';
+                $labelSumOut    = $tag->id . '-total-out';
+                $currentIncome  = $income[$tag->id] ?? '0';
+                $currentExpense = $expenses[$tag->id] ?? '0';
+
+
+                // add to sum:
+                $sumOfIncome[$tag->id]  = $sumOfIncome[$tag->id] ?? '0';
+                $sumOfExpense[$tag->id] = $sumOfExpense[$tag->id] ?? '0';
+                $sumOfIncome[$tag->id]  = bcadd($sumOfIncome[$tag->id], $currentIncome);
+                $sumOfExpense[$tag->id] = bcadd($sumOfExpense[$tag->id], $currentExpense);
+
+                // add to chart:
+                $chartData[$labelIn]['entries'][$label]     = $currentIncome;
+                $chartData[$labelOut]['entries'][$label]    = $currentExpense;
+                $chartData[$labelSumIn]['entries'][$label]  = $sumOfIncome[$tag->id];
+                $chartData[$labelSumOut]['entries'][$label] = $sumOfExpense[$tag->id];
+            }
+            $currentStart = clone $currentEnd;
+            $currentStart->addDay();
+        }
+        // remove all empty entries to prevent cluttering:
+        $newSet = [];
+        foreach ($chartData as $key => $entry) {
+            if (!array_sum($entry['entries']) == 0) {
+                $newSet[$key] = $chartData[$key];
+            }
+        }
+        if (count($newSet) === 0) {
+            $newSet = $chartData;
+        }
+        $data = $this->generator->multiSet($newSet);
+        $cache->store($data);
+
+        return Response::json($data);
+    }
+
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $tags
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return Collection
+     */
+    private function getExpenses(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): Collection
+    {
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
+                  ->setTags($tags)->withOpposingAccount()->disableFilter();
+        $accountIds   = $accounts->pluck('id')->toArray();
+        $transactions = $collector->getJournals();
+        $set          = MonthReportGenerator::filterExpenses($transactions, $accountIds);
+
+        return $set;
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $tags
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return Collection
+     */
+    private function getIncome(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): Collection
+    {
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
+                  ->setTags($tags)->withOpposingAccount();
+        $accountIds   = $accounts->pluck('id')->toArray();
+        $transactions = $collector->getJournals();
+        $set          = MonthReportGenerator::filterIncome($transactions, $accountIds);
+
+        return $set;
+    }
+
+    /**
+     * @param Collection $set
+     *
+     * @return array
+     */
+    private function groupByTag(Collection $set): array
+    {
+        // group by category ID:
+        $grouped = [];
+        /** @var Transaction $transaction */
+        foreach ($set as $transaction) {
+            $journal     = $transaction->transactionJournal;
+            $journalTags = $journal->tags;
+            /** @var Tag $journalTag */
+            foreach ($journalTags as $journalTag) {
+                $journalTagId           = $journalTag->id;
+                $grouped[$journalTagId] = $grouped[$journalTagId] ?? '0';
+                $grouped[$journalTagId] = bcadd($transaction->transaction_amount, $grouped[$journalTagId]);
+            }
+        }
+
+        return $grouped;
+    }
+
+}

app/Http/breadcrumbs.php

@@ -556,6 +556,19 @@ Breadcrumbs::register(
 }
 );
 
+Breadcrumbs::register(
+    'reports.report.tag', function (BreadCrumbGenerator $breadcrumbs, string $accountIds, string $tagTags, Carbon $start, Carbon $end) {
+    $breadcrumbs->parent('reports.index');
+
+    $monthFormat = (string)trans('config.month_and_day');
+    $startString = $start->formatLocalized($monthFormat);
+    $endString   = $end->formatLocalized($monthFormat);
+    $title       = (string)trans('firefly.report_tag', ['start' => $startString, 'end' => $endString]);
+
+    $breadcrumbs->push($title, route('reports.report.tag', [$accountIds, $tagTags, $start->format('Ymd'), $end->format('Ymd')]));
+}
+);
+
 Breadcrumbs::register(
     'reports.report.category', function (BreadCrumbGenerator $breadcrumbs, string $accountIds, string $categoryIds, Carbon $start, Carbon $end) {
     $breadcrumbs->parent('reports.index');

public/js/ff/reports/tag/all.js

@@ -0,0 +1,10 @@
+/*
+ * all.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.
+ */
+

public/js/ff/reports/tag/month.js

@@ -0,0 +1,66 @@
+/*
+ * month.js
+ * Copyright (c) 2017 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.
+ */
+
+/** global: tagIncomeUri, tagExpenseUri, accountIncomeUri, accountExpenseUri, tagBudgetUri, tagCategoryUri, mainUri */
+
+$(function () {
+    "use strict";
+    drawChart();
+
+    $('#tags-in-pie-chart-checked').on('change', function () {
+        redrawPieChart('tags-in-pie-chart', tagIncomeUri);
+    });
+
+    $('#tags-out-pie-chart-checked').on('change', function () {
+        redrawPieChart('tags-out-pie-chart', tagExpenseUri);
+    });
+
+    $('#accounts-in-pie-chart-checked').on('change', function () {
+        redrawPieChart('accounts-in-pie-chart', accountIncomeUri);
+    });
+
+    $('#accounts-out-pie-chart-checked').on('change', function () {
+        redrawPieChart('accounts-out-pie-chart', accountExpenseUri);
+    });
+
+    // two extra charts:
+    pieChart(tagBudgetUri, 'budgets-out-pie-chart');
+    pieChart(tagCategoryUri, 'categories-out-pie-chart');
+
+});
+
+
+function drawChart() {
+    "use strict";
+
+    // month view:
+    doubleYChart(mainUri, 'in-out-chart');
+
+    // draw pie chart of income, depending on "show other transactions too":
+    redrawPieChart('tags-in-pie-chart', tagIncomeUri);
+    redrawPieChart('tags-out-pie-chart', tagExpenseUri);
+    redrawPieChart('accounts-in-pie-chart', accountIncomeUri);
+    redrawPieChart('accounts-out-pie-chart', accountExpenseUri);
+
+
+}
+
+function redrawPieChart(container, uri) {
+    "use strict";
+    var checkbox = $('#' + container + '-checked');
+
+    var others = '0';
+    // check if box is checked:
+    if (checkbox.prop('checked')) {
+        others = '1';
+    }
+    uri = uri.replace('OTHERS', others);
+
+    pieChart(uri, container);
+
+}

resources/lang/en_US/firefly.php

@@ -667,6 +667,7 @@ return [
     'report_audit'                               => 'Transaction history overview between :start and :end',
     'report_category'                            => 'Category report between :start and :end',
     'report_budget'                              => 'Budget report between :start and :end',
+    'report_tag'                                 => 'Tag report between :start and :end',
     'quick_link_reports'                         => 'Quick links',
     'quick_link_default_report'                  => 'Default financial report',
     'quick_link_audit_report'                    => 'Transaction history overview',

resources/views/reports/tag/month.twig

@@ -0,0 +1,434 @@
+{% extends "./layout/default" %}
+
+{% block breadcrumbs %}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, tagTags, start, end) }}
+{% endblock %}
+
+{% block content %}
+
+    <div class="row">
+        <div class="col-lg-6 col-md-6">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'accounts'|_ }}</h3>
+                </div>
+                <div class="box-body table-responsive no-padding">
+                    <table class="table table-hover sortable">
+                        <thead>
+                        <tr>
+                            <th data-defaultsign="az">{{ 'name'|_ }}</th>
+                            <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>
+                            <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for account in accounts %}
+                            <tr>
+                                <td data-value="{{ account.name }}">
+                                    <a href="{{ route('accounts.show', account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
+                                </td>
+                                {% if accountSummary[account.id] %}
+                                    <td data-value="{{ accountSummary[account.id].earned }}"
+                                        style="text-align: right;">{{ accountSummary[account.id].earned|formatAmount }}</td>
+                                {% else %}
+                                    <td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
+                                {% endif %}
+                                {% if accountSummary[account.id] %}
+                                    <td data-value="{{ accountSummary[account.id].spent }}"
+                                        style="text-align: right;">{{ accountSummary[account.id].spent|formatAmount }}</td>
+                                {% else %}
+                                    <td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
+                                {% endif %}
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-2 col-md-3">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'income_per_tag'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    <canvas id="tags-in-pie-chart" style="margin:0 auto;" height="150" width="150"></canvas>
+                    <label style="font-weight:normal;">
+                        <input type="checkbox" id="tags-in-pie-chart-checked">
+                        <small>{{ 'include_income_not_in_tags'|_ }}</small>
+                    </label>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-2 col-md-3">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'expense_per_tag'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    <canvas id="tags-out-pie-chart" style="margin:0 auto;" height="150" width="150"></canvas>
+                    <label style="font-weight:normal;">
+                        <input type="checkbox" id="tags-out-pie-chart-checked">
+                        <small>{{ 'include_expense_not_in_tags'|_ }}</small>
+                    </label>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-2 col-md-3">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'expense_per_budget'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    <canvas id="budgets-out-pie-chart" style="margin:0 auto;" height="150" width="150"></canvas>
+                    Uitgaven per budget voor de gevonden transacties
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-6 col-md-6">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'tags'|_ }}</h3>
+                </div>
+                <div class="box-body table-responsive no-padding">
+                    <table class="table table-hover sortable">
+                        <thead>
+                        <tr>
+                            <th data-defaultsign="az">{{ 'name'|_ }}</th>
+                            <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>
+                            <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for tag in tags %}
+                            <tr>
+                                <td data-value="{{ tag.tag }}">
+                                    <a href="{{ route('tags.show', tag.id) }}" title="{{ tag.tag }}">{{ tag.tag }}</a>
+                                </td>
+                                {% if tagSummary[tag.id] %}
+                                    <td data-value="{{ tagSummary[tag.id].earned }}" style="text-align: right;">{{ tagSummary[tag.id].earned|formatAmount }}</td>
+                                {% else %}
+                                    <td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
+                                {% endif %}
+                                {% if tagSummary[tag.id] %}
+                                    <td data-value="{{ tagSummary[tag.id].spent }}" style="text-align: right;">{{ tagSummary[tag.id].spent|formatAmount }}</td>
+                                {% else %}
+                                    <td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
+                                {% endif %}
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-2 col-md-3">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'income_per_account'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    <canvas id="accounts-in-pie-chart" style="margin:0 auto;" height="150" width="150"></canvas>
+                    <label style="font-weight:normal;">
+                        <input type="checkbox" id="accounts-in-pie-chart-checked">
+                        <small>{{ 'include_income_not_in_account'|_ }}</small>
+                    </label>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-2 col-md-3">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'expense_per_account'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    <canvas id="accounts-out-pie-chart" style="margin:0 auto;" height="150" width="150"></canvas>
+                    <label style="font-weight:normal;">
+                        <input type="checkbox" id="accounts-out-pie-chart-checked">
+                        <small>{{ 'include_income_not_in_account'|_ }}</small>
+                    </label>
+                </div>
+            </div>
+        </div>
+
+        <div class="col-lg-2 col-md-3">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'expense_per_category'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    <canvas id="categories-out-pie-chart" style="margin:0 auto;" height="150" width="150"></canvas>
+                    Uitgaven per category voor de gevonden transacties
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'income_and_expenses'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    <canvas id="in-out-chart" style="margin:0 auto;" height="300"></canvas>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        {% if averageExpenses|length > 0 %}
+            <div class="col-lg-6">
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'average_spending_per_account'|_ }}</h3>
+                    </div>
+                    <div class="box-body table-responsive no-padding">
+                        <table class="table table-hover sortable">
+                            <thead>
+                            <tr>
+                                <th data-defaultsign="az">{{ 'account'|_ }}</th>
+                                <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>
+                                <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>
+                                <th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            {% for row in averageExpenses %}
+                                {% if loop.index > listLength %}
+                                    <tr class="overListLength">
+                                {% else %}
+                                    <tr>
+                                {% endif %}
+                                <td data-value="{{ row.name }}">
+                                    <a href="{{ route('accounts.show', row.id) }}">{{ row.name }}</a>
+                                </td>
+                                <td data-value="{{ row.average }}" style="text-align: right;">
+                                    {{ row.average|formatAmount }}
+                                </td>
+                                <td data-value="{{ row.sum }}" style="text-align: right;">
+                                    {{ row.sum|formatAmount }}
+                                </td>
+                                <td data-value="{{ row.count }}">
+                                    {{ row.count }}
+                                </td>
+                                </tr>
+                            {% endfor %}
+                            </tbody>
+                            <tfoot>
+                            {% if averageExpenses|length > listLength %}
+                                <tr>
+                                    <td colspan="4" class="active">
+                                        <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                                    </td>
+                                </tr>
+                            {% endif %}
+                            </tfoot>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        {% endif %}
+        {% if topExpenses.count > 0 %}
+            <div class="col-lg-6">
+
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+                    </div>
+                    <div class="box-body">
+                        <table class="table table-hover sortable">
+                            <thead>
+                            <tr>
+                                <th data-defaultsort="disabled">{{ 'description'|_ }}</th>
+                                <th data-defaultsign="month">{{ 'date'|_ }}</th>
+                                <th data-defaultsign="az">{{ 'account'|_ }}</th>
+                                <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            {% for row in topExpenses %}
+                                {% if loop.index > listLength %}
+                                    <tr class="overListLength">
+                                {% else %}
+                                    <tr>
+                                {% endif %}
+                                <td data-sortable="false">
+                                    <a href="{{ route('transactions.show', row.journal_id) }}">
+                                        {% if row.transaction_description|length > 0 %}
+                                            {{ row.transaction_description }} ({{ row.description }})
+                                        {% else %}
+                                            {{ row.description }}
+                                        {% endif %}
+                                    </a>
+                                </td>
+                                <td data-value="{{ row.date.format('Y-m-d') }}">
+                                    {{ row.date.formatLocalized(monthAndDayFormat) }}
+                                </td>
+                                <td data-value="{{ row.opposing_account_name }}">
+                                    <a href="{{ route('accounts.show', row.opposing_account_id) }}">
+                                        {{ row.opposing_account_name }}
+                                    </a>
+                                </td>
+                                <td data-value="{{ row.transaction_amount }}" style="text-align: right;">
+                                    {{ row.transaction_amount|formatAmount }}
+                                </td>
+                                </tr>
+                            {% endfor %}
+                            </tbody>
+                            <tfoot>
+                            {% if topExpenses|length > listLength %}
+                                <tr>
+                                    <td colspan="3" class="active">
+                                        <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                                    </td>
+                                </tr>
+                            {% endif %}
+                            </tfoot>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        {% endif %}
+    </div>
+    <div class="row">
+        {% if averageIncome|length > 0 %}
+            <div class="col-lg-6">
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'average_income_per_account'|_ }}</h3>
+                    </div>
+                    <div class="box-body">
+                        <table class="table table-hover sortable">
+                            <thead>
+                            <tr>
+                                <th data-defaultsign="az">{{ 'account'|_ }}</th>
+                                <th data-defaultsign="_19">{{ 'income_average'|_ }}</th>
+                                <th data-defaultsign="_19">{{ 'total'|_ }}</th>
+                                <th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            {% for row in averageIncome %}
+                                <tr>
+                                    <td data-value="{{ row.name }}">
+                                        <a href="{{ route('accounts.show', row.id) }}">{{ row.name }}</a>
+                                    </td>
+                                    <td data-value="{{ row.average }}">
+                                        {{ row.average|formatAmount }}
+                                    </td>
+                                    <td data-value="{{ row.sum }}">
+                                        {{ row.sum|formatAmount }}
+                                    </td>
+                                    <td data-value="{{ row.count }}">
+                                        {{ row.count }}
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        {% endif %}
+        <div class="col-lg-6">
+            {% if topIncome.count > 0 %}
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+                    </div>
+                    <div class="box-body">
+                        <table class="table table-hover sortable">
+                            <thead>
+                            <tr>
+                                <th data-defaultsort="disabled">{{ 'description'|_ }}</th>
+                                <th data-defaultsign="month">{{ 'date'|_ }}</th>
+                                <th data-defaultsign="az">{{ 'account'|_ }}</th>
+                                <th data-defaultsign="_19">{{ 'amount'|_ }}</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            {% for row in topIncome %}
+                                {% if loop.index > listLength %}
+                                    <tr class="overListLength">
+                                {% else %}
+                                    <tr>
+                                {% endif %}
+                                <td>
+                                    <a href="{{ route('transactions.show', row.journal_id) }}">
+                                        {% if row.transaction_description|length > 0 %}
+                                            {{ row.transaction_description }} ({{ row.description }})
+                                        {% else %}
+                                            {{ row.description }}
+                                        {% endif %}
+                                    </a>
+                                </td>
+                                <td data-value="{{ row.date.format('Y-m-d H-i-s') }}">
+                                    {{ row.date.formatLocalized(monthAndDayFormat) }}
+                                </td>
+                                <td data-value="{{ row.opposing_account_name }}">
+                                    <a href="{{ route('accounts.show', row.opposing_account_id) }}">
+                                        {{ row.opposing_account_name }}
+                                    </a>
+                                </td>
+                                <td data-value="{{ row.transaction_amount }}">
+                                    {{ row.transaction_amount|formatAmount }}
+                                </td>
+                                </tr>
+                            {% endfor %}
+                            </tbody>
+                            <tfoot>
+                            {% if topIncome.count > listLength %}
+                                <tr>
+                                    <td colspan="3" class="active">
+                                        <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                                    </td>
+                                </tr>
+                            {% endif %}
+                            </tfoot>
+                        </table>
+                    </div>
+                </div>
+            {% endif %}
+        </div>
+    </div>
+
+{% endblock %}
+
+{% block scripts %}
+    <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
+    <script type="text/javascript" src="js/ff/charts.defaults.js"></script>
+    <script type="text/javascript" src="js/ff/charts.js"></script>
+    <script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
+
+    <script type="text/javascript">
+        // to report another URL:
+        var startDate = '{{ start.format('Ymd') }}';
+        var endDate = '{{ end.format('Ymd') }}';
+        var accountIds = '{{ accountIds }}';
+        var tagTags = '{{ tagTags }}';
+
+        // chart uri's
+        var tagIncomeUri = '{{ route('chart.tag.tag-income', [accountIds, tagTags, start.format('Ymd'), end.format('Ymd'),'OTHERS']) }}';
+        var tagExpenseUri = '{{ route('chart.tag.tag-expense', [accountIds, tagTags, start.format('Ymd'), end.format('Ymd'),'OTHERS']) }}';
+        var accountIncomeUri = '{{ route('chart.tag.account-income', [accountIds, tagTags, start.format('Ymd'), end.format('Ymd'),'OTHERS']) }}';
+        var accountExpenseUri = '{{ route('chart.tag.account-expense', [accountIds, tagTags, start.format('Ymd'), end.format('Ymd'),'OTHERS']) }}';
+
+        // two new charts
+        var tagBudgetUri = '{{ route('chart.tag.budget-expense', [accountIds, tagTags, start.format('Ymd'), end.format('Ymd')]) }}';
+        var tagCategoryUri = '{{ route('chart.tag.category-expense', [accountIds, tagTags, start.format('Ymd'), end.format('Ymd')]) }}';
+        var mainUri = '{{ route('chart.tag.main', [accountIds, tagTags, start.format('Ymd'), end.format('Ymd')]) }}';
+    </script>
+
+
+    <script type="text/javascript" src="js/ff/reports/tag/all.js"></script>
+    <script type="text/javascript" src="js/ff/reports/tag/month.js"></script>
+
+{% endblock %}
+
+{% block styles %}
+    <link rel="stylesheet" href="css/bootstrap-sortable.css" type="text/css" media="all"/>
+{% endblock %}

routes/web.php

@@ -310,6 +310,47 @@ Route::group(
 }
 );
 
+/**
+ * Chart\Tag Controller
+ */
+Route::group(
+    ['middleware' => 'user-full-auth', 'namespace' => 'Chart', 'prefix' => 'chart/tag', 'as' => 'chart.tag.'], function () {
+
+    // these charts are used in reports (tag reports):
+    Route::get(
+        'tag/income/{accountList}/{tagList}/{start_date}/{end_date}/{others}',
+        ['uses' => 'TagReportController@tagIncome', 'as' => 'tag-income']
+    );
+    Route::get(
+        'tag/expense/{accountList}/{tagList}/{start_date}/{end_date}/{others}',
+        ['uses' => 'TagReportController@tagExpense', 'as' => 'tag-expense']
+    );
+    Route::get(
+        'account/income/{accountList}/{tagList}/{start_date}/{end_date}/{others}',
+        ['uses' => 'TagReportController@accountIncome', 'as' => 'account-income']
+    );
+    Route::get(
+        'account/expense/{accountList}/{tagList}/{start_date}/{end_date}/{others}',
+        ['uses' => 'TagReportController@accountExpense', 'as' => 'account-expense']
+    );
+    Route::get(
+        'budget/expense/{accountList}/{tagList}/{start_date}/{end_date}',
+        ['uses' => 'TagReportController@budgetExpense', 'as' => 'budget-expense']
+    );
+    Route::get(
+        'category/expense/{accountList}/{tagList}/{start_date}/{end_date}',
+        ['uses' => 'TagReportController@categoryExpense', 'as' => 'category-expense']
+    );
+
+
+    Route::get(
+        'operations/{accountList}/{tagList}/{start_date}/{end_date}',
+        ['uses' => 'TagReportController@mainChart', 'as' => 'main']
+    );
+
+}
+);
+
 /**
  * Chart\PiggyBank Controller
  */