diff --git a/app/views/pages/dashboard/_balance_sheet.html.erb b/app/views/pages/dashboard/_balance_sheet.html.erb index 5273e5031..af9ab3165 100644 --- a/app/views/pages/dashboard/_balance_sheet.html.erb +++ b/app/views/pages/dashboard/_balance_sheet.html.erb @@ -35,7 +35,7 @@ -
+
Name
@@ -50,11 +50,11 @@
<% classification_group.account_groups.each_with_index do |account_group, idx| %> -
<%= idx == classification_group.account_groups.size - 1 ? "rounded-b-lg" : "" %> "> - +
<%= icon("chevron-right", class: "group-open:rotate-90") %> diff --git a/app/views/pages/dashboard/_outflows_donut.html.erb b/app/views/pages/dashboard/_outflows_donut.html.erb index dd1aab80f..b1132cf9b 100644 --- a/app/views/pages/dashboard/_outflows_donut.html.erb +++ b/app/views/pages/dashboard/_outflows_donut.html.erb @@ -59,11 +59,24 @@
-
-
- <% outflows_data[:categories].each do |category| %> +
+
+
+

<%= t("pages.dashboard.outflows_donut.categories") %>·<%= outflows_data[:categories].count %>

+
+
+
+

<%= t("pages.dashboard.outflows_donut.value") %>

+
+
+

<%= t("pages.dashboard.outflows_donut.weight") %>

+
+
+
+
+ <% outflows_data[:categories].each_with_index do |category, idx| %> <%= link_to transactions_path(q: { categories: [category[:name]], start_date: period.date_range.first, end_date: period.date_range.last }), - class: "flex items-center justify-between p-3 rounded-lg hover:bg-container-inset transition-colors cursor-pointer group", + class: "flex items-center justify-between mx-3 p-3 rounded-lg cursor-pointer group", data: { turbo_frame: "_top", category_id: category[:id], @@ -79,6 +92,9 @@ <%= category[:percentage] %>%
<% end %> + <% if idx < outflows_data[:categories].size - 1 %> + <%= render "shared/ruler", classes: "mx-3 lg:mx-4" %> + <% end %> <% end %>
diff --git a/config/locales/views/pages/en.yml b/config/locales/views/pages/en.yml index f33a3e00a..572b06c78 100644 --- a/config/locales/views/pages/en.yml +++ b/config/locales/views/pages/en.yml @@ -29,3 +29,6 @@ en: outflows_donut: title: "Outflows" total_outflows: "Total Outflows" + categories: "Categories" + value: "Value" + weight: "Weight"