All “all” views are now consistent #595

resources/views/accounts/show.twig

@@ -10,7 +10,11 @@
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">
-                        {{ subTitle }}
+                        {% if moment == 'all' %}
+                            {{ trans('firefly.chart_all_journals_for_account', {name:account.name}) }}
+                        {% else %}
+                            xxx
+                        {% endif %}
                     </h3>
                     <!-- ACTIONS MENU -->
                     <div class="box-tools pull-right">
@@ -145,13 +149,13 @@
         // uri's for charts:
         var chartUri = '{{ chartUri }}';
         {% if start and end %}
-        var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
-        var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
-        var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
+            var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
+            var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
+            var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
         {% else %}
-        var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, 'all', 'all']) }}';
-        var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, 'all', 'all']) }}';
-        var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, 'all', 'all']) }}';
+            var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, 'all', 'all']) }}';
+            var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, 'all', 'all']) }}';
+            var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, 'all', 'all']) }}';
         {% endif %}
 
     </script>

resources/views/budgets/show.twig

@@ -9,7 +9,13 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'overview'|_ }}</h3>
+                    <h3 class="box-title">
+                        {% if budgetLimit %}
+                            XXXX
+                        {% else %}
+                            {{ trans('firefly.chart_all_journals_for_budget', {name:budget.name}) }}
+                        {% endif %}
+                    </h3>
 
                     <!-- ACTIONS MENU -->
                     <div class="box-tools pull-right">
@@ -29,6 +35,45 @@
         </div>
     </div>
 
+    <div class="row">
+        <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'expenses_by_category'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    <div style="width:60%;margin:0 auto;">
+                        <canvas id="budget-cat-out" style="margin:0 auto;"></canvas>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'expenses_by_asset_account'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    <div style="width:60%;margin:0 auto;">
+                        <canvas id="budget-asset-out" style="margin:0 auto;"></canvas>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'expenses_by_expense_account'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    <div style="width:60%;margin:0 auto;">
+                        <canvas id="budget-expense-out" style="margin:0 auto;"></canvas>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <div class="row">
         <div class="col-lg-offset-9 col-lg-3 col-md-offset-9 col-md-3 col-sm-12 col-xs-12">
             <p class="small text-center"><a href="{{ route('budgets.show',budget.id) }}">{{ 'showEverything'|_ }}</a></p>
@@ -45,12 +90,12 @@
                 <div class="box-body">
                     {% include 'list.journals-tasker' with {hideBudgets:true, hideBills:true} %}
                     {% if budgetLimit %}
-                    <p>
-                        <i class="fa fa-calendar" aria-hidden="true"></i>
-                        <a href="{{ route('budgets.show', [budget.id]) }}">
-                            {{ 'show_all_no_filter'|_ }}
-                        </a>
-                    </p>
+                        <p>
+                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <a href="{{ route('budgets.show', [budget.id]) }}">
+                                {{ 'show_all_no_filter'|_ }}
+                            </a>
+                        </p>
                     {% endif %}
                 </div>
             </div>
@@ -111,12 +156,19 @@
         var budgetID = {{ budget.id }};
         var budgetLimitID = 0;
         {% if budgetLimit.id %}
-        budgetLimitID = {{ budgetLimit.id }};
-        var budgetChartUri = '{{ route('chart.budget.budget-limit', [budget.id, budgetLimit.id] ) }}';
-        {% else %}
-        var budgetChartUri = '{{ route('chart.budget.budget', [budget.id] ) }}';
-        {% endif %}
+            budgetLimitID = {{ budgetLimit.id }};
+            var budgetChartUri = '{{ route('chart.budget.budget-limit', [budget.id, budgetLimit.id] ) }}';
 
+            var expenseCategoryUri = '{{ route('chart.budget.expense-category', [budget.id, budgetLimit.id]) }}';
+            var expenseAssetUri = '{{ route('chart.budget.expense-asset', [budget.id, budgetLimit.id]) }}';
+            var expenseExpenseUri = '{{ route('chart.budget.expense-expense', [budget.id, budgetLimit.id]) }}';
+        {% else %}
+            var budgetChartUri = '{{ route('chart.budget.budget', [budget.id] ) }}';
+
+        var expenseCategoryUri = '{{ route('chart.budget.expense-category', [budget.id]) }}';
+        var expenseAssetUri = '{{ route('chart.budget.expense-asset', [budget.id]) }}';
+        var expenseExpenseUri = '{{ route('chart.budget.expense-expense', [budget.id]) }}';
+        {% endif %}
     </script>
 
     <script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>

resources/views/tags/show.twig

@@ -37,10 +37,15 @@
                     {% if tag.date %}
                         <p>{{ 'date'|_ }}: {{ tag.date.formatLocalized(monthAndDayFormat) }}</p>
                     {% endif %}
-
-                    <p>
-                        {{ 'sum'|_ }}: {{ sum|formatAmount }}<br/>
-                    </p>
+                    {% if moment == 'all' %}
+                        <p>
+                            {{ 'total_sum'|_ }}: {{ sum|formatAmount }}<br/>
+                        </p>
+                    {% else %}
+                        <p>
+                            {{ 'sum'|_ }}: {{ sum|formatAmount }}<br/>
+                        </p>
+                    {% endif %}
 
                 </div>
             </div>
@@ -65,9 +70,7 @@
                 </div>
                 <div class="box-body">
                     {% if tag.latitude and tag.longitude and tag.zoomLevel %}
-                        <p>
-                            <img src="https://maps.googleapis.com/maps/api/staticmap?center={{ tag.latitude }},{{ tag.longitude }}&zoom={{ tag.zoomLevel }}&size=600x300">
-                        </p>
+                        <div id="map-canvas" style="width:100%;height:300px;"></div>
                     {% else %}
                         <p>{{ 'no_location_set'|_ }}</p>
                     {% endif %}
@@ -164,4 +167,19 @@
 
 {% endblock %}
 {% block scripts %}
+    <script type="text/javascript">
+        var latitude = {{ tag.latitude|default("52.3167") }};
+        var longitude = {{ tag.longitude|default("5.5500") }};
+        var zoomLevel = {{ tag.zoomLevel|default("6") }};
+
+        {% if tag.latitude and tag.longitude and tag.zoomLevel %}
+        var doPlaceMarker = true;
+        {% else %}
+        var doPlaceMarker = false;
+        {% endif %}
+
+        var apiKey = "{{ apiKey }}";
+    </script>
+    <script src="https://maps.googleapis.com/maps/api/js?v=3&amp;key={{ apiKey }}"></script>
+    <script src="js/ff/tags/show.js"></script>
 {% endblock %}