Added some (yet without function) information icons. [skip ci] [skip Scrutinizer]

app/Helpers/Collection/BillLine.php

@@ -27,6 +27,9 @@ class BillLine
     /** @var  string */
     protected $min;
 
+    /** @var  int */
+    private $transactionJournalId;
+
     /**
      * @return string
      */
@@ -91,6 +94,22 @@ class BillLine
         $this->min = $min;
     }
 
+    /**
+     * @return int
+     */
+    public function getTransactionJournalId(): int
+    {
+        return $this->transactionJournalId ?? 0;
+    }
+
+    /**
+     * @param int $transactionJournalId
+     */
+    public function setTransactionJournalId(int $transactionJournalId)
+    {
+        $this->transactionJournalId = $transactionJournalId;
+    }
+
     /**
      * @return boolean
      */

app/Helpers/Report/ReportHelper.php

@@ -80,11 +80,13 @@ class ReportHelper implements ReportHelperInterface
 
             $entry = $journals->filter(
                 function (TransactionJournal $journal) use ($bill) {
-                    return $journal->bill_id == $bill->id;
+                    return $journal->bill_id === $bill->id;
                 }
             );
-            if (!is_null($entry->first())) {
+            $first = $entry->first();
-                $billLine->setAmount($entry->first()->journalAmount);
+            if (!is_null($first)) {
+                $billLine->setTransactionJournalId($first->id);
+                $billLine->setAmount($first->journalAmount);
                 $billLine->setHit(true);
             } else {
                 $billLine->setHit(false);
@@ -93,7 +95,6 @@ class ReportHelper implements ReportHelperInterface
                 $collection->addBill($billLine);
             }
 
-
         }
 
         return $collection;

app/Repositories/Bill/BillRepository.php

@@ -82,6 +82,7 @@ class BillRepository implements BillRepositoryInterface
                    ->get(
                        [
                            'transaction_journals.bill_id',
+                           'transaction_journals.id',
                            DB::Raw('SUM(`transactions`.`amount`) as `journalAmount`'),
                        ]
                    );

resources/views/reports/partials/balance.twig

@@ -41,6 +41,7 @@
                         <td>
                             {% if balanceEntry.getSpent != 0 %}
                                 <span class="text-danger">{{ (balanceEntry.getSpent)|formatAmountPlain }}</span>
+                                <i class="fa fa-fw text-muted fa-info-circle"></i>
                             {% endif %}
                             {% if balanceEntry.getLeft != 0 %}
                                 <span class="text-success">{{ (balanceEntry.getLeft)|formatAmountPlain }}</span>

resources/views/reports/partials/bills.twig

@@ -15,33 +15,30 @@
             </thead>
             <tbody>
             {% for line in bills.getBills %}
-                {% if not line.isActive %}
+                <tr>
-                    <tr class="text-muted">
+                    <td data-value="{{ line.getBill.name }}">
-                {% else %}
+                        <a href="{{ route('bills.show',line.getBill.id) }}">{{ line.getBill.name }}</a>
-                    <tr>
+                    </td>
-                {% endif %}
+                    <td data-value="{{ line.getMin }}">{{ line.getMin|formatAmount }}</td>
-                <td data-value="{{ line.getBill.name }}">
+                    <td data-value="{{ line.getMax }}">{{ line.getMax|formatAmount }}</td>
-                    <a href="{{ route('bills.show',line.getBill.id) }}">{{ line.getBill.name }}</a>
+                    {% if line.isHit %}
+                        <td data-value="{{ line.getAmount }}">
+                            <a href="{{ route('transactions.show', line.getTransactionJournalId) }}">
+                                {{ line.getAmount|formatAmount }}
+                            </a>
+                        </td>
+                    {% endif %}
+                    {% if not line.isHit and line.isActive %}
+                        <td data-value="0" class="bg-success">{{ 'notCharged'|_ }}</td>
+                    {% endif %}
                     {% if not line.isActive %}
-                        ({{ 'inactive'|_|lower }})
+                        <td data-value="-1">&nbsp;</td>
                     {% endif %}
-                </td>
+                    <td data-value="{{ (line.getMax - line.getAmount) }}">
-                <td data-value="{{ line.getMin }}">{{ line.getMin|formatAmount }}</td>
+                        {% if line.isActive %}
-                <td data-value="{{ line.getMax }}">{{ line.getMax|formatAmount }}</td>
+                            {{ (line.getMax + line.getAmount)|formatAmount }}
-                {% if line.isHit %}
+                        {% endif %}
-                    <td data-value="{{ line.getAmount }}">{{ line.getAmount|formatAmount }}</td>
+                    </td>
-                {% endif %}
-                {% if not line.isHit and line.isActive %}
-                    <td data-value="0" class="bg-success">{{ 'notCharged'|_ }}</td>
-                {% endif %}
-                {% if not line.isActive %}
-                    <td data-value="-1">&nbsp;</td>
-                {% endif %}
-                <td data-value="{{ (line.getMax - line.getAmount) }}">
-                    {% if line.isActive %}
-                        {{ (line.getMax + line.getAmount)|formatAmount }}
-                    {% endif %}
-                </td>
 
                 </tr>
 

resources/views/reports/partials/budgets.twig

@@ -39,12 +39,13 @@
                     </td>
                     <td>
                         {% if budgetLine.getSpent != 0 %}
-                            {{ budgetLine.getSpent|formatAmount }}
+                            {{ budgetLine.getSpent|formatAmount }} <i class="fa fa-fw text-muted fa-info-circle"></i>
                         {% endif %}
 
                         {% if budgetLine.getSpent == 0 %}
                             {{ budgetLine.getSpent|formatAmount }}
                         {% endif %}
+
                     </td>
                     <td>
                         {% if(budgetLine.getOverspent == 0) %}

resources/views/reports/partials/categories.twig

@@ -7,7 +7,7 @@
             <thead>
             <tr>
                 <th>{{ 'categories'|_ }}</th>
-                <th>{{ 'spent'|_ }}</th>
+                <th colspan="2">{{ 'spent'|_ }}</th>
             </tr>
             </thead>
             <tbody>
@@ -17,6 +17,9 @@
                         <a href="{{ route('categories.show',cat.id) }}">{{ cat.name }}</a>
                     </td>
                     <td>{{ cat.spent|formatAmount }}</td>
+                    <td style="width:20px;">
+                        <i class="fa fa-fw fa-info-circle text-muted"></i>
+                    </td>
                 </tr>
             {% endfor %}
             </tbody>

resources/views/reports/partials/expenses.twig

@@ -15,7 +15,10 @@
                     <a href="{{ route('accounts.show',expense.id) }}">{{ expense.name }}</a>
                     {% if expense.count > 1 %}
                         <br/>
-                        <small>{{ expense.count }} {{ 'transactions'|_|lower }}</small>
+                        <small>
+                            {{ expense.count }} {{ 'transactions'|_|lower }}
+                            <i class="fa fa-fw text-muted fa-info-circle"></i>
+                        </small>
                     {% endif %}
                 </td>
                 <td>{{ (expense.amount)|formatAmount }}</td>