Remove GA event codes.

resources/views/layout/default.twig

@@ -215,16 +215,6 @@
         })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
         ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100});
         ga('send', 'pageview');
-
-        // send an event if relevant:
-        {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %}
-        ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}');
-        {% endif %}
-
-        // send event if relevant:
-        {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %}
-        ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}', '{{ Session.get('gaEventLabel') }}');
-        {% endif %}
     </script>
 {% endif %}
 

resources/views/layout/empty.twig

@@ -47,16 +47,6 @@
         })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
         ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100});
         ga('send', 'pageview');
-
-        // send an event if relevant:
-        {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %}
-        ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}');
-        {% endif %}
-
-        // send event if relevant:
-        {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %}
-        ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}', '{{ Session.get('gaEventLabel') }}');
-        {% endif %}
     </script>
 {% endif %}
 </body>

resources/views/layout/guest.twig

@@ -58,16 +58,6 @@
         })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
         ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100});
         ga('send', 'pageview');
-
-        // send an event if relevant:
-        {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %}
-        ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}');
-        {% endif %}
-
-        // send event if relevant:
-        {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %}
-        ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}', '{{ Session.get('gaEventLabel') }}');
-        {% endif %}
     </script>
 {% endif %}
 </body>

resources/views/reports/partials/exp-budgets.twig

@@ -1,26 +1,25 @@
 <table class="table table-hover sortable">
     <thead>
     <tr>
-        <th  style="width:50%;" data-defaultsign="az">{{ 'budget'|_ }}</th>
-        <th style="width:50%;text-align: right;" data-defaultsort="disabled">{{ 'spent'|_ }}</th>
+        <th  style="width:66%;" data-defaultsign="az">{{ 'category'|_ }}</th>
+        <th style="width:34%;" data-defaultsort="_19">{{ 'spent'|_ }}</th>
     </tr>
     </thead>
     <tbody>
     {% for budgetId, entry in together %}
         <tr>
-            <td style="width:50%;" data-value="{% if entry.budget.name|length ==0 %}{{ 'no_budget_squared'|_ }}{% else %}{{ entry.budget.name }}{% endif %}">
-
-                {% if entry.budget.name|length ==0 %}
+            <td data-value="{% if entry.budget == null %}zzzzzzzzzzz{% else %}{{ entry.budget }}{% endif %}">
+                {% if entry.budget == null %}
                     <a href="{{ route('budgets.no-budget') }}">{{ 'no_budget_squared'|_ }}</a>
                 {% else %}
-                    <a href="{{ route('budgets.show', budgetId) }}">{{ entry.budget.name }}</a>
+                    <a href="{{ route('budgets.show', budgetId) }}">{{ entry.budget }}</a>
                 {% endif %}
             </td>
-            <td style="text-align: right;">
-                {% if entry.spent|length ==0 %}
+            <td data-value="{{ entry.spent.grand_total }}">
+                {% if entry.spent.per_currency|length ==0 %}
                     {{ '0'|formatAmount }}
                 {% else %}
-                    {% for expense in entry.spent %}
+                    {% for expense in entry.spent.per_currency %}
                         {{ formatAmountBySymbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}<br />
                     {% endfor %}
                 {% endif %}

resources/views/reports/partials/exp-categories.twig

@@ -2,34 +2,35 @@
     <thead>
     <tr>
         <th  style="width:50%;" data-defaultsign="az">{{ 'category'|_ }}</th>
-        <th style="width:25%;text-align: right;" data-defaultsort="disabled">{{ 'spent'|_ }}</th>
-        <th style="width:25%;text-align: right;" data-defaultsort="disabled">{{ 'earned'|_ }}</th>
+        <th style="width:25%;" data-defaultsort="_19">{{ 'spent'|_ }}</th>
+        <th style="width:25%;" data-defaultsort="_19">{{ 'earned'|_ }}</th>
     </tr>
     </thead>
     <tbody>
     {% for categoryId, entry in together %}
         <tr>
-            <td style="width:50%;" data-value="{% if entry.category.name|length ==0 %}{{ 'noCategory'|_ }}{% else %}{{ entry.category.name }}{% endif %}">
-                {% if entry.category.name|length ==0 %}
+            <td data-value="{% if entry.category == null %}zzzzzzzzzzz{% else %}{{ entry.category }}{% endif %}">
+                {% if entry.category == null %}
                     <a href="{{ route('categories.no-category') }}">{{ 'noCategory'|_ }}</a>
                 {% else %}
-                    <a href="{{ route('categories.show', categoryId) }}">{{ entry.category.name }}</a>
+                    <a href="{{ route('categories.show', categoryId) }}">{{ entry.category }}</a>
+
                 {% endif %}
             </td>
-            <td style="text-align: right;">
-                {% if entry.spent|length ==0 %}
+            <td data-value="{{ entry.spent.grand_total }}">
+                {% if entry.spent.per_currency|length ==0 %}
                     {{ '0'|formatAmount }}
                 {% else %}
-                    {% for expense in entry.spent %}
+                    {% for expense in entry.spent.per_currency %}
                         {{ formatAmountBySymbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}<br />
                     {% endfor %}
                 {% endif %}
             </td>
-            <td style="text-align: right;">
-                {% if entry.earned|length ==0 %}
+            <td data-value="{{ entry.earned.grand_total }}">
+                {% if entry.earned.per_currency|length ==0 %}
                     {{ '0'|formatAmount }}
                 {% else %}
-                    {% for income in entry.earned %}
+                    {% for income in entry.earned.per_currency %}
                         {{ formatAmountBySymbol(income.sum, income.currency.symbol, income.currency.dp) }}<br />
                     {% endfor %}
                 {% endif %}

resources/views/reports/partials/exp-not-grouped.twig

@@ -1,33 +1,33 @@
+
 <table class="table table-hover sortable">
     <thead>
     <tr>
         <th style="width:50%;" data-defaultsign="az">{{ 'name'|_ }}</th>
-        <th style="width:25%;text-align:right;" class="hidden-xs" style="text-align: right;" data-defaultsort="disabled">{{ 'spent'|_ }}</th>
-        <th style="width:25%;text-align:right;" class="hidden-xs" style="text-align: right;" data-defaultsort="disabled">{{ 'earned'|_ }}</th>
+        <th style="width:25%;" class="hidden-xs" data-defaultsort="_19">{{ 'spent'|_ }}</th>
+        <th style="width:25%;" class="hidden-xs" data-defaultsort="_19">{{ 'earned'|_ }}</th>
     </tr>
     </thead>
     <tbody>
     {% for name, amounts in result %}
-            <tr>
-                <td>{{ name }}</td>
-                <td style="text-align: right;" >
-                    {% if amounts.spent|length == 0%}
-                        {{ '0'|formatAmount }}
-                    {% endif %}
-                    {% for expense in amounts.spent %}
-                        {{ formatAmountBySymbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}<br />
-                    {% endfor %}
-                </td>
-                <td style="text-align: right;" >
-                    {% if amounts.earned|length == 0 %}
-                        {{ '0'|formatAmount }}
-                    {% endif %}
-                    {% for income in amounts.earned %}
-                        {{ formatAmountBySymbol(income.sum, income.currency.symbol, income.currency.dp) }}<br />
-                    {% endfor %}
-                </td>
-            </tr>
+        <tr>
+            <td data-value="{{ name }}">{{ name }}</td>
+            <td data-value="{{ amounts.spent.grand_sum }}">
+                {% if amounts.spent.per_currency|length == 0%}
+                    {{ '0'|formatAmount }}
+                {% endif %}
+                {% for expense in amounts.spent.per_currency %}
+                    {{ formatAmountBySymbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}<br />
+                {% endfor %}
+            </td>
+            <td data-value="{{ amounts.earned.grand_sum }}">
+                {% if amounts.earned.per_currency|length == 0%}
+                    {{ '0'|formatAmount }}
+                {% endif %}
+                {% for income in amounts.earned.per_currency %}
+                    {{ formatAmountBySymbol(income.sum, income.currency.symbol, income.currency.dp) }}<br />
+                {% endfor %}
+            </td>
+        </tr>
     {% endfor %}
-
     </tbody>
 </table>