The personal finance app for everyone
Improve dashboard/account charts and tooltips (#2157)
Alex Hatzenbuhler341a800b6580
diff --git a/app/javascript/controllers/time_series_chart_controller.js b/app/javascript/controllers/time_series_chart_controller.jsindex 7fc86100..664e989d 100644--- a/app/javascript/controllers/time_series_chart_controller.js+++ b/app/javascript/controllers/time_series_chart_controller.js@@ -322,7 +322,7 @@ export default class extends Controller {.attr("class", "data-point-circle").attr("cx", this._d3XScale(d.date)).attr("cy", this._d3YScale(this._getDatumValue(d)))- .attr("r", 8)+ .attr("r", 10).attr("fill", this._trendColor).attr("fill-opacity", "0.1").attr("pointer-events", "none");@@ -333,7 +333,7 @@ export default class extends Controller {.attr("class", "data-point-circle").attr("cx", this._d3XScale(d.date)).attr("cy", this._d3YScale(this._getDatumValue(d)))- .attr("r", 3)+ .attr("r", 5).attr("fill", this._trendColor).attr("pointer-events", "none");@@ -364,19 +364,17 @@ export default class extends Controller {<div style="margin-bottom: 4px; color: var(--color-gray-500);">${datum.date_formatted}</div>-- <div style="display: flex; align-items: center; gap: 16px;">- <div style="display: flex; align-items: center; gap: 8px;">- <svg width="10" height="10">- <circle- cx="5"- cy="5"- r="4"- stroke="${datum.trend.color}"- fill="transparent"- stroke-width="1"></circle>- </svg>-+ <div style="display: flex; align-items: center; gap: 16px; margin-bottom: 0px;">+ <div style="display: flex; align-items: center; gap: 8px; color: var(--color-black);">+ <div style="display: flex; align-items: center; justify-content: center; height: 16px; width: 16px;">+ ${datum.trend.previous.amount === datum.trend.current.amount ? `+ <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="${datum.trend.color}" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-minus-icon lucide-minus"><path d="M5 12h14"/></svg>+ ` : Number(datum.trend.previous.amount) < Number(datum.trend.current.amount) ? `+ <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="${datum.trend.color}" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-up-right-icon lucide-arrow-up-right"><path d="M7 7h10v10"/><path d="M7 17 17 7"/></svg>+ ` : `+ <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="${datum.trend.color}" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-down-right-icon lucide-arrow-down-right"><path d="m7 7 10 10"/><path d="M17 7v10H7"/></svg>+ `}+ </div>${this._extractFormattedValue(datum.trend.current)}</div>diff --git a/app/views/accounts/chart.html.erb b/app/views/accounts/chart.html.erbindex 6be29472..11dcbaac 100644--- a/app/views/accounts/chart.html.erb+++ b/app/views/accounts/chart.html.erb@@ -3,16 +3,7 @@<%= turbo_frame_tag dom_id(@account, :chart_details) do %><div class="px-4">- <% if trend.direction.flat? %>- <%= tag.span t(".no_change"), class: "text-secondary" %>- <% else %>- <%= tag.span "#{trend.value.positive? ? "+" : ""}#{format_money(trend.value)}", style: "color: #{trend.color}" %>- <% unless trend.percent.infinite? %>- <%= tag.span "(#{trend.percent}%)", style: "color: #{trend.color}" %>- <% end %>- <% end %>-- <%= tag.span @period.comparison_label, class: "text-secondary" %>+ <%= render partial: "shared/trend_change", locals: { trend: trend, comparison_label: @period.comparison_label } %></div><div class="h-64 pb-4">@@ -24,7 +15,7 @@data-time-series-chart-data-value="<%= series.to_json %>"></div><% else %><div class="w-full h-full flex items-center justify-center">- <p class="text-secondary text-sm">No data available for the selected period.</p>+ <p class="text-secondary text-sm"><%= t(".data_not_available") %></p></div><% end %></div>diff --git a/app/views/holdings/index.html.erb b/app/views/holdings/index.html.erbindex 0b6eb62d..7da9cd4c 100644--- a/app/views/holdings/index.html.erb+++ b/app/views/holdings/index.html.erb@@ -15,7 +15,7 @@<div class="grid grid-cols-12 items-center uppercase text-xs font-medium text-secondary px-4 py-2"><%= tag.p t(".name"), class: "col-span-4" %><%= tag.p t(".weight"), class: "col-span-2 justify-self-end" %>- <%= tag.p t(".cost"), class: "col-span-2 justify-self-end" %>+ <%= tag.p t(".average_cost"), class: "col-span-2 justify-self-end" %><%= tag.p t(".holdings"), class: "col-span-2 justify-self-end" %><%= tag.p t(".return"), class: "col-span-2 justify-self-end" %></div>diff --git a/app/views/holdings/show.html.erb b/app/views/holdings/show.html.erbindex 195aba63..f536da9c 100644--- a/app/views/holdings/show.html.erb+++ b/app/views/holdings/show.html.erb@@ -38,7 +38,7 @@</div><div class="flex items-center justify-between text-sm">- <dt class="text-secondary"><%= t(".trend_label") %></dt>+ <dt class="text-secondary"><%= t(".total_return_label") %></dt><dd style="color: <%= @holding.trend&.color %>;"><%= @holding.trend ? render("shared/trend_change", trend: @holding.trend) : t(".unknown") %></dd>diff --git a/app/views/pages/dashboard/_net_worth_chart.html.erb b/app/views/pages/dashboard/_net_worth_chart.html.erbindex b36e57ba..dfa22031 100644--- a/app/views/pages/dashboard/_net_worth_chart.html.erb+++ b/app/views/pages/dashboard/_net_worth_chart.html.erb@@ -3,19 +3,14 @@<div class="flex justify-between gap-4 px-4"><div class="space-y-2"><div class="space-y-2">- <p class="text-sm text-secondary font-medium">Net Worth</p>+ <p class="text-sm text-secondary font-medium"><%= t(".title") %></p><p class="text-primary -space-x-0.5 text-3xl font-medium"><%= series.current.format %></p><% if series.trend.nil? %>- <p class="text-sm text-secondary">Data not available for the selected period</p>- <% elsif series.trend.direction.flat? %>- <p class="text-sm text-secondary">No change vs. prior period</p>+ <p class="text-sm text-secondary"><%= t(".data_not_available") %></p><% else %>- <div class="flex items-center gap-2">- <%= render partial: "shared/trend_change", locals: { trend: series.trend } %>- <span class="text-sm text-secondary"><%= period.comparison_label %></span>- </div>+ <%= render partial: "shared/trend_change", locals: { trend: series.trend, comparison_label: period.comparison_label } %><% end %></div></div>@@ -32,6 +27,6 @@data-time-series-chart-data-value="<%= series.to_json %>"></div><% else %><div class="w-full h-full flex items-center justify-center">- <p class="text-secondary text-sm">No data available for the selected period.</p>+ <p class="text-secondary text-sm"><%= t(".data_not_available") %></p></div><% end %>diff --git a/app/views/shared/_trend_change.html.erb b/app/views/shared/_trend_change.html.erbindex 3235bc0e..b2503a7a 100644--- a/app/views/shared/_trend_change.html.erb+++ b/app/views/shared/_trend_change.html.erb@@ -1,8 +1,8 @@-<%# locals: { trend: } %>+<%# locals: { trend:, comparison_label: nil } %><p class="text-sm" style="color: <%= trend.color %>"><% if trend.direction.flat? %>- <span>No change</span>+ <%= t(".no_change") %><%= " #{comparison_label}" if defined?(comparison_label) && comparison_label.present? %><% else %><span class="font-mono"><%= trend.value.is_a?(Money) ? format_money(trend.value) : trend.value.round(2) %>@@ -10,5 +10,8 @@<% unless trend.percent.infinite? %><span class="font-mono">(<%= lucide_icon(trend.icon, class: "w-4 h-4 align-text-bottom inline") %><%= trend.percent_formatted %>)</span><% end %>+ <span class="text-secondary">+ <%= " #{comparison_label}" if defined?(comparison_label) && comparison_label.present? %>+ </span><% end %></p>diff --git a/config/locales/views/accounts/en.yml b/config/locales/views/accounts/en.ymlindex f557755e..e384ef79 100644--- a/config/locales/views/accounts/en.yml+++ b/config/locales/views/accounts/en.yml@@ -4,7 +4,7 @@ en:account:troubleshoot: Troubleshootchart:- no_change: no change+ data_not_available: Data not available for the selected periodcreate:success: "%{type} account created"destroy:diff --git a/config/locales/views/holdings/en.yml b/config/locales/views/holdings/en.ymlindex 3003d629..933a8b83 100644--- a/config/locales/views/holdings/en.yml+++ b/config/locales/views/holdings/en.yml@@ -9,13 +9,13 @@ en:per_share: per shareshares: "%{qty} shares"index:- cost: cost+ average_cost: Average costholdings: Holdings- name: name+ name: Namenew_holding: New transactionno_holdings: No holdings to show.- return: total return- weight: weight+ return: Total return+ weight: Weightmissing_price_tooltip:description: This investment has missing values and we could not calculateits returns or value.@@ -33,5 +33,5 @@ en:settings: Settingsticker_label: Tickertrade_history_entry: "%{qty} shares of %{security} at %{price}"- trend_label: Trend+ total_return_label: Total Returnunknown: Unknowndiff --git a/config/locales/views/pages/en.yml b/config/locales/views/pages/en.ymlindex ad5f4942..1ee15ca3 100644--- a/config/locales/views/pages/en.yml+++ b/config/locales/views/pages/en.yml@@ -4,6 +4,9 @@ en:changelog:title: What's newdashboard:+ net_worth_chart:+ data_not_available: Data not available for the selected period+ title: Net Worthno_account_empty_state:new_account: New accountno_account_subtitle: Since no accounts have been added, there's no data todiff --git a/config/locales/views/shared/en.yml b/config/locales/views/shared/en.ymlindex cb632738..37e22cd3 100644--- a/config/locales/views/shared/en.yml+++ b/config/locales/views/shared/en.yml@@ -10,3 +10,5 @@ en:label: Amountsyncing_notice:syncing: Syncing accounts data...+ trend_change:+ no_change: "no change"