diff --git a/app/javascript/controllers/time_series_chart_controller.js b/app/javascript/controllers/time_series_chart_controller.js index 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 {
${datum.date_formatted}
- -
-
- - - - +
+
+
+ ${datum.trend.previous.amount === datum.trend.current.amount ? ` + + ` : Number(datum.trend.previous.amount) < Number(datum.trend.current.amount) ? ` + + ` : ` + + `} +
${this._extractFormattedValue(datum.trend.current)}
diff --git a/app/views/accounts/chart.html.erb b/app/views/accounts/chart.html.erb index 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 %>
- <% 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 } %>
@@ -24,7 +15,7 @@ data-time-series-chart-data-value="<%= series.to_json %>">
<% else %>
-

No data available for the selected period.

+

<%= t(".data_not_available") %>

<% end %>
diff --git a/app/views/holdings/index.html.erb b/app/views/holdings/index.html.erb index 0b6eb62d..7da9cd4c 100644 --- a/app/views/holdings/index.html.erb +++ b/app/views/holdings/index.html.erb @@ -15,7 +15,7 @@
<%= 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" %>
diff --git a/app/views/holdings/show.html.erb b/app/views/holdings/show.html.erb index 195aba63..f536da9c 100644 --- a/app/views/holdings/show.html.erb +++ b/app/views/holdings/show.html.erb @@ -38,7 +38,7 @@
-
<%= t(".trend_label") %>
+
<%= t(".total_return_label") %>
<%= @holding.trend ? render("shared/trend_change", trend: @holding.trend) : t(".unknown") %>
diff --git a/app/views/pages/dashboard/_net_worth_chart.html.erb b/app/views/pages/dashboard/_net_worth_chart.html.erb index 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 @@
-

Net Worth

+

<%= t(".title") %>

<%= series.current.format %>

<% if series.trend.nil? %> -

Data not available for the selected period

- <% elsif series.trend.direction.flat? %> -

No change vs. prior period

+

<%= t(".data_not_available") %>

<% else %> -
- <%= render partial: "shared/trend_change", locals: { trend: series.trend } %> - <%= period.comparison_label %> -
+ <%= render partial: "shared/trend_change", locals: { trend: series.trend, comparison_label: period.comparison_label } %> <% end %>
@@ -32,6 +27,6 @@ data-time-series-chart-data-value="<%= series.to_json %>">
<% else %>
-

No data available for the selected period.

+

<%= t(".data_not_available") %>

<% end %> diff --git a/app/views/shared/_trend_change.html.erb b/app/views/shared/_trend_change.html.erb index 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 } %>

<% if trend.direction.flat? %> - No change + <%= t(".no_change") %><%= " #{comparison_label}" if defined?(comparison_label) && comparison_label.present? %> <% else %> <%= trend.value.is_a?(Money) ? format_money(trend.value) : trend.value.round(2) %> @@ -10,5 +10,8 @@ <% unless trend.percent.infinite? %> (<%= lucide_icon(trend.icon, class: "w-4 h-4 align-text-bottom inline") %><%= trend.percent_formatted %>) <% end %> + + <%= " #{comparison_label}" if defined?(comparison_label) && comparison_label.present? %> + <% end %>

diff --git a/config/locales/views/accounts/en.yml b/config/locales/views/accounts/en.yml index f557755e..e384ef79 100644 --- a/config/locales/views/accounts/en.yml +++ b/config/locales/views/accounts/en.yml @@ -4,7 +4,7 @@ en: account: troubleshoot: Troubleshoot chart: - no_change: no change + data_not_available: Data not available for the selected period create: success: "%{type} account created" destroy: diff --git a/config/locales/views/holdings/en.yml b/config/locales/views/holdings/en.yml index 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 share shares: "%{qty} shares" index: - cost: cost + average_cost: Average cost holdings: Holdings - name: name + name: Name new_holding: New transaction no_holdings: No holdings to show. - return: total return - weight: weight + return: Total return + weight: Weight missing_price_tooltip: description: This investment has missing values and we could not calculate its returns or value. @@ -33,5 +33,5 @@ en: settings: Settings ticker_label: Ticker trade_history_entry: "%{qty} shares of %{security} at %{price}" - trend_label: Trend + total_return_label: Total Return unknown: Unknown diff --git a/config/locales/views/pages/en.yml b/config/locales/views/pages/en.yml index 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 new dashboard: + net_worth_chart: + data_not_available: Data not available for the selected period + title: Net Worth no_account_empty_state: new_account: New account no_account_subtitle: Since no accounts have been added, there's no data to diff --git a/config/locales/views/shared/en.yml b/config/locales/views/shared/en.yml index cb632738..37e22cd3 100644 --- a/config/locales/views/shared/en.yml +++ b/config/locales/views/shared/en.yml @@ -10,3 +10,5 @@ en: label: Amount syncing_notice: syncing: Syncing accounts data... + trend_change: + no_change: "no change"