Expand view

resources/assets/v2/api/v2/chart/account/dashboard.js

@@ -27,4 +27,10 @@ export default class Dashboard {
         let endStr = format(end, 'y-MM-dd');
         return api.get('/api/v2/chart/account/dashboard', {params: {start: startStr, end: endStr}});
     }
+
+    expense(start, end) {
+        let startStr = format(start, 'y-MM-dd');
+        let endStr = format(end, 'y-MM-dd');
+        return api.get('/api/v2/chart/account/expense-dashboard', {params: {start: startStr, end: endStr}});
+    }
 }

resources/assets/v2/pages/dashboard/accounts.js

@@ -209,12 +209,14 @@ export default () => ({
     init() {
         Promise.all([getVariable('viewRange', '1M'), getVariable('autoConversion', false),]).then((values) => {
             this.autoConversion = values[1];
-            // console.log(values[1]);
+            // main dashboard chart:
             this.loadChart();
             this.loadAccounts();
         });
         window.store.observe('end', () => {
             this.chartData = null;
+            this.expenseAccountChart = null;
+            // main dashboard chart:
             this.loadChart();
             this.loadAccounts();
         });

resources/assets/v2/pages/dashboard/categories.js

@@ -55,7 +55,23 @@ export default () => ({
             xaxis: {
                 categories: [],
             },
-            yaxis: {},
+            yaxis: {
+                labels: {
+                    formatter: function (value, index) {
+                        if (undefined === value) {
+                            return value;
+                        }
+                        if (undefined === index) {
+                            return value;
+                        }
+                        if (typeof index === 'object') {
+                            index = index.dataPointIndex; // this is the "category name + currency" index
+                        }
+                        let currencyCode = window.budgetCurrencies[index] ?? 'EUR';
+                        return formatMoney(value, currencyCode);
+                    }
+                }
+            },
             fill: {
                 opacity: 1
             },

resources/views/v2/index.blade.php

@@ -13,16 +13,16 @@
                 <div class="col-xl-8 col-lg-12 col-sm-12 col-xs-12">
                     <div class="row mb-2">
                         <div class="col">
-
                             <div class="card">
                                 <div class="card-header">
                                     <h3 class="card-title"><a href="{{ route('accounts.index',['asset']) }}"
                                                               title="{{ __('firefly.yourAccounts') }}">{{ __('firefly.yourAccounts') }}</a>
                                     </h3>
                                 </div>
-                                <div class="card-body">
+                                <div class="card-body p-0">
                                     <div id="account-chart"></div>
-                                    <p class="text-end">
+                                </div>
+                                <div class="card-footer text-end">
                                     <template x-if="autoConversion">
                                         <button type="button" @click="switchAutoConversion"
                                                 class="btn btn-outline-info btm-sm">
@@ -37,7 +37,6 @@
                                                         class="fa-solid fa-comments-dollar"></span> {{ __('firefly.enable_auto_convert')  }}
                                         </button>
                                     </template>
-                                    </p>
                                 </div>
                             </div>
 
@@ -51,7 +50,7 @@
                                                               title="{{ __('firefly.go_to_budgets') }}">{{ __('firefly.budgetsAndSpending') }}</a>
                                     </h3>
                                 </div>
-                                <div class="card-body">
+                                <div class="card-body p-0">
                                     <div id="budget-chart"></div>
                                 </div>
                             </div>
@@ -66,7 +65,7 @@
                                                               title="{{ __('firefly.yourAccounts') }}">{{ __('firefly.categories') }}</a>
                                     </h3>
                                 </div>
-                                <div class="card-body">
+                                <div class="card-body p-0">
                                     <div id="category-chart"></div>
                                 </div>
                             </div>
@@ -145,10 +144,12 @@
                 <div class="col">
                     <div class="card">
                         <div class="card-header">
-                            <h3 class="card-title"><a href="#" title="Something">Expense accounts</a></h3>
+                            <h3 class="card-title"><a href="#"
+                                                      title="{{ route('reports.index') }}">{{ __('firefly.income_and_expense') }}</a>
+                            </h3>
                         </div>
                         <div class="card-body">
-
+                            <div id="sankey-chart"></div>
                         </div>
                     </div>
                 </div>
@@ -177,7 +178,7 @@
                 <div class="col">
                     <div class="card">
                         <div class="card-header">
-                            <h3 class="card-title"><a href="#" title="Something">Revenue</a></h3>
+                            <h3 class="card-title"><a href="#" title="Something">recurring? rules? tags?</a></h3>
                         </div>
                         <div class="card-body">