Tag view update.

app/Http/Controllers/TagController.php

@@ -194,17 +194,13 @@ class TagController extends Controller
         $end          = null;
         $periods      = new Collection;
         $apiKey       = env('GOOGLE_MAPS_API_KEY', '');
-        $sum          = '0';
         $path         = route('tags.show', [$tag->id]);
 
-
         // prep for "all" view.
         if ($moment === 'all') {
             $subTitle = trans('firefly.all_journals_for_tag', ['tag' => $tag->tag]);
             $start    = $repository->firstUseDate($tag);
             $end      = new Carbon;
-            $sum      = $repository->sumOfTag($tag, null, null);
-            $result   = $repository->resultOfTag($tag, null, null);
             $path     = route('tags.show', [$tag->id, 'all']);
         }
 
@@ -218,8 +214,6 @@ class TagController extends Controller
                  'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
             );
             $periods  = $this->getPeriodOverview($tag);
-            $sum      = $repository->sumOfTag($tag, $start, $end);
-            $result   = $repository->resultOfTag($tag, $start, $end);
             $path     = route('tags.show', [$tag->id, $moment]);
         }
 
@@ -230,8 +224,6 @@ class TagController extends Controller
             /** @var Carbon $end */
             $end      = clone session('end', Navigation::endOfPeriod(new Carbon, $range));
             $periods  = $this->getPeriodOverview($tag);
-            $sum      = $repository->sumOfTag($tag, $start, $end);
-            $result   = $repository->resultOfTag($tag, $start, $end);
             $subTitle = trans(
                 'firefly.journals_in_period_for_tag',
                 ['tag' => $tag->tag, 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
@@ -245,8 +237,9 @@ class TagController extends Controller
         $journals = $collector->getPaginatedJournals();
         $journals->setPath($path);
 
+        $sums = $repository->sumsOfTag($tag, $start, $end);
 
-        return view('tags.show', compact('apiKey', 'tag', 'result', 'periods', 'subTitle', 'subTitleIcon', 'journals', 'sum', 'start', 'end', 'moment'));
+        return view('tags.show', compact('apiKey', 'tag', 'sums', 'periods', 'subTitle', 'subTitleIcon', 'journals', 'start', 'end', 'moment'));
     }
 
     /**

app/Repositories/Tag/TagRepository.php

@@ -186,34 +186,6 @@ class TagRepository implements TagRepositoryInterface
         return new Carbon;
     }
 
-    /**
-     * Same as sum of tag but substracts income instead of adding it as well.
-     *
-     * @param Tag         $tag
-     * @param Carbon|null $start
-     * @param Carbon|null $end
-     *
-     * @return string
-     */
-    public function resultOfTag(Tag $tag, ?Carbon $start, ?Carbon $end): string
-    {
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
-
-        if (!is_null($start) && !is_null($end)) {
-            $collector->setRange($start, $end);
-        }
-
-        $collector->setAllAssetAccounts()->setTag($tag);
-        $journals = $collector->getJournals();
-        $sum      = '0';
-        foreach ($journals as $journal) {
-            $sum = bcadd($sum, strval($journal->transaction_amount));
-        }
-
-        return strval($sum);
-    }
-
     /**
      * @param User $user
      */
@@ -290,6 +262,43 @@ class TagRepository implements TagRepositoryInterface
         return strval($sum);
     }
 
+    /**
+     * @param Tag         $tag
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     *
+     * @return string
+     */
+    public function sumsOfTag(Tag $tag, ?Carbon $start, ?Carbon $end): array
+    {
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+
+        if (!is_null($start) && !is_null($end)) {
+            $collector->setRange($start, $end);
+        }
+
+        $collector->setAllAssetAccounts()->setTag($tag);
+        $journals = $collector->getJournals();
+
+        $sums = [
+            TransactionType::WITHDRAWAL => '0',
+            TransactionType::DEPOSIT    => '0',
+            TransactionType::TRANSFER   => '0',
+        ];
+
+        foreach ($journals as $journal) {
+            $amount = app('steam')->positive(strval($journal->transaction_amount));
+            $type   = $journal->transaction_type_type;
+            if ($type === TransactionType::WITHDRAWAL) {
+                $amount = bcmul($amount, '-1');
+            }
+            $sums[$type] = bcadd($sums[$type], $amount);
+        }
+
+        return $sums;
+    }
+
     /**
      * Generates a tag cloud.
      *

app/Repositories/Tag/TagRepositoryInterface.php

@@ -103,15 +103,6 @@ interface TagRepositoryInterface
      */
     public function lastUseDate(Tag $tag): Carbon;
 
-    /**
-     * @param Tag         $tag
-     * @param Carbon|null $start
-     * @param Carbon|null $end
-     *
-     * @return string
-     */
-    public function resultOfTag(Tag $tag, ?Carbon $start, ?Carbon $end): string;
-
     /**
      * @param User $user
      */
@@ -126,6 +117,17 @@ interface TagRepositoryInterface
      */
     public function spentInPeriod(Tag $tag, Carbon $start, Carbon $end): string;
 
+    /**
+     * Calculates various amounts in tag.
+     *
+     * @param Tag         $tag
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     *
+     * @return array
+     */
+    public function sumsOfTag(Tag $tag, ?Carbon $start, ?Carbon $end): array;
+
     /**
      * This method stores a tag.
      *

resources/lang/en_US/firefly.php

@@ -329,6 +329,7 @@ return [
     'without_date'                               => 'Without date',
     'result'                                     => 'Result',
     'total_result'                               => 'Total result',
+    'sums_apply_to_range'                        => 'All sums apply to the selected range',
 
     // preferences
     'pref_home_screen_accounts'                  => 'Home screen accounts',

resources/lang/en_US/list.php

@@ -83,5 +83,9 @@ return [
     'outward'                 => 'Outward description',
     'number_of_transactions'  => 'Number of transactions',
     'total_amount'            => 'Total amount',
-
+    'sum'                     => 'Sum',
+    'sum_excluding_transfers' => 'Sum (excluding transfers)',
+    'sum_withdrawals'         => 'Sum of withdrawals',
+    'sum_deposits'            => 'Sum of deposits',
+    'sum_transfers'           => 'Sum of transfers',
 ];

resources/views/tags/show.twig

@@ -26,34 +26,56 @@
                         </div>
                     </div>
                 </div>
-                <div class="box-body">
+                <div class="box-body no-padding">
-
+                    <table class="table table-bordered">
                         {% if tag.description %}
-                        <p class="text-info">
+                        <tr>
-                            {{ tag.description }}
+                            <td>
-                        </p>
+                                {{ trans('list.description') }}
+                            </td>
+                            <td>{{ tag.description }}</td>
+                        </tr>
                         {% endif %}
-
                         {% if tag.date %}
-                        <p>{{ 'date'|_ }}: {{ tag.date.formatLocalized(monthAndDayFormat) }}</p>
+                        <tr>
+                            <td>
+                                {{ trans('list.date') }}
+                            </td>
+                            <td>
+                                {{ tag.date.formatLocalized(monthAndDayFormat) }}
+                            </td>
+                        </tr>
                         {% endif %}
-                    {% if moment == 'all' %}
+                        <tr>
-                        <p>
+                            <td>{{ trans('list.sum') }}</td>
-                            {{ 'total_sum'|_ }}: {{ sum|formatAmount }}<br/>
+                            <td> {{ (sums.Withdrawal + sums.Transfer + sums.Deposit)|formatAmount }}</td>
-                            {{ 'total_result'|_ }}: {{ result|formatAmount }}<br/>
+                        </tr>
-                        </p>
+                        <tr>
-                    {% else %}
+                            <td>{{ trans('list.sum_excluding_transfers') }}</td>
-                        <p>
+                            <td> {{ (sums.Withdrawal + sums.Deposit)|formatAmount }}</td>
-                            {{ 'sum'|_ }}: {{ sum|formatAmount }}<br/>
+                        </tr>
-                            {{ 'result'|_ }}: {{ result|formatAmount }}<br/>
+                        <tr>
-                        </p>
+                            <td>{{ trans('list.sum_withdrawals') }}</td>
-                    {% endif %}
+                            <td> {{ sums.Withdrawal|formatAmount }}</td>
-                    <div class="btn-group">
+                        </tr>
-                        <a href="{{ route('tags.edit',tag.id) }}" class="btn btn-default">
+                        <tr>
-                            <i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}</a>
+                            <td>{{ trans('list.sum_deposits') }}</td>
-                        <a href="{{ route('tags.delete',tag.id) }}" class="btn btn-danger"><i
+                            <td> {{ sums.Deposit|formatAmount }}</td>
-                                        class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a>
+                        </tr>
+                        <tr>
+                            <td>{{ trans('list.sum_transfers') }}</td>
+                            <td> {{ sums.Transfer|formatAmount }}</td>
+                        </tr>
+                    </table>
                 </div>
+                <div class="box-footer">
+                    <div class="btn-group btn-group-sm">
+                        <a href="{{ route('tags.edit',tag.id) }}" class="btn btn-default"><i class="fa fa-pencil fa-fw"></i></a>
+                        <a href="{{ route('tags.delete',tag.id) }}" class="btn btn-danger"><i class="fa fa-trash fa-fw"></i></a>
+                    </div>
+                    <p class="text-muted">
+                        <small>{{ 'sums_apply_to_range'|_ }}</small>
+                    </p>
                 </div>
             </div>
         </div>