`
+ ${d.formatted.value} ${d.formatted.change} (${d.trend.percent}%)
+ `
)
- .style("left", event.pageX + 10 + "px")
+ .style("left", adjustedX + "px")
.style("top", event.pageY - 10 + "px");
g.selectAll(".guideline").remove(); // Remove existing line to ensure only one is shown at a time
diff --git a/app/models/account.rb b/app/models/account.rb
index 61eeebd4..1b0608bf 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -1,6 +1,7 @@
class Account < ApplicationRecord
belongs_to :family
- has_many :account_balances
+ has_many :balances, class_name: "AccountBalance"
+ has_many :valuations
delegated_type :accountable, types: Accountable::TYPES, dependent: :destroy
@@ -8,6 +9,15 @@ class Account < ApplicationRecord
before_create :check_currency
+ # Show all valuations in history table (no date range filtering)
+ def valuations_with_trend
+ series_for(valuations, :value)
+ end
+
+ def balances_with_trend(date_range = default_date_range)
+ series_for(balances, :balance, date_range)
+ end
+
def check_currency
if self.original_currency == self.family.currency
self.converted_balance = self.original_balance
@@ -17,4 +27,36 @@ class Account < ApplicationRecord
self.converted_currency = self.family.currency
end
end
+
+ private
+
+ def default_date_range
+ { start: 30.days.ago.to_date, end: Date.today }
+ end
+
+ # TODO: probably a better abstraction for this in the future
+ def series_for(collection, value_attr, date_range = {})
+ collection = filtered_by_date_for(collection, date_range)
+ overall_trend = Trend.new(collection.last&.send(value_attr), collection.first&.send(value_attr))
+
+ collection_with_trends = [ nil, *collection ].each_cons(2).map do |previous, current|
+ {
+ current: current,
+ previous: previous,
+ date: current.date,
+ currency: current.currency,
+ value: current.send(value_attr),
+ trend: Trend.new(current.send(value_attr), previous&.send(value_attr))
+ }
+ end
+
+ { date_range: date_range, trend: overall_trend, series: collection_with_trends }
+ end
+
+ def filtered_by_date_for(association, date_range)
+ scope = association
+ scope = scope.where("date >= ?", date_range[:start]) if date_range[:start]
+ scope = scope.where("date <= ?", date_range[:end]) if date_range[:end]
+ scope.order(:date).to_a
+ end
end
diff --git a/app/models/adjustment.rb b/app/models/adjustment.rb
new file mode 100644
index 00000000..1cef0cca
--- /dev/null
+++ b/app/models/adjustment.rb
@@ -0,0 +1,3 @@
+# Used for manual account value adjustments (e.g. to correct for a missing transaction)
+class Adjustment < Valuation
+end
diff --git a/app/models/appraisal.rb b/app/models/appraisal.rb
new file mode 100644
index 00000000..ca58791a
--- /dev/null
+++ b/app/models/appraisal.rb
@@ -0,0 +1,3 @@
+# Used to update the value of an account based on a manual or external appraisal (i.e. Zillow)
+class Appraisal < Valuation
+end
diff --git a/app/models/trend.rb b/app/models/trend.rb
new file mode 100644
index 00000000..0d59ee33
--- /dev/null
+++ b/app/models/trend.rb
@@ -0,0 +1,26 @@
+class Trend
+ attr_reader :current, :previous
+
+ def initialize(current, previous)
+ @current = current
+ @previous = previous
+ end
+
+ def direction
+ return "flat" unless @previous
+ return "up" if @current > @previous
+ return "down" if @current < @previous
+ "flat"
+ end
+
+ def amount
+ return 0 if @previous.nil?
+ @current - @previous
+ end
+
+ def percent
+ return 0 if @previous.nil?
+ return Float::INFINITY if @previous == 0
+ ((@current - @previous).abs / @previous.to_f * 100).round(1)
+ end
+end
diff --git a/app/models/valuation.rb b/app/models/valuation.rb
new file mode 100644
index 00000000..70dff5de
--- /dev/null
+++ b/app/models/valuation.rb
@@ -0,0 +1,5 @@
+# STI model to represent a point-in-time "valuation" of an account's value
+# Types include: Appraisal, Adjustment
+class Valuation < ApplicationRecord
+ belongs_to :account
+end
diff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erb
index 3c73ac33..25a82cfc 100644
--- a/app/views/accounts/show.html.erb
+++ b/app/views/accounts/show.html.erb
@@ -1,3 +1,5 @@
+<% balances = @account.balances_with_trend %>
+<% balance_styles = trend_styles(balances[:trend].direction) %>
@@ -22,24 +24,19 @@
Total Value
- <%# TODO: Will need a normalized way to split a formatted monetary value into these 3 parts %>
+ <%# TODO: Will need a better way to split a formatted monetary value into these 3 parts %>
diff --git a/app/views/valuations/_form_row.html.erb b/app/views/valuations/_form_row.html.erb
new file mode 100644
index 00000000..8c0ddb9a
--- /dev/null
+++ b/app/views/valuations/_form_row.html.erb
@@ -0,0 +1,15 @@
+<%#
+ Locals:
+ - f: form object for valuation
+ - form_icon: string representing the icon to be displayed
+ - submit_button_text: string representing the text on the submit button
+%>
+
diff --git a/app/views/valuations/create.html.erb b/app/views/valuations/create.html.erb
new file mode 100644
index 00000000..f9aa4ce8
--- /dev/null
+++ b/app/views/valuations/create.html.erb
@@ -0,0 +1,4 @@
+
+
Valuations#create
+
Find me in app/views/valuations/create.html.erb
+
diff --git a/app/views/valuations/create.turbo_stream.erb b/app/views/valuations/create.turbo_stream.erb
new file mode 100644
index 00000000..aeae48ed
--- /dev/null
+++ b/app/views/valuations/create.turbo_stream.erb
@@ -0,0 +1,3 @@
+<%# TODO: We need a way to determine the order the new valuation needs to be in the array, calculate the trend, and append it to the right spot %>
+<%= turbo_stream.update Valuation.new, "" %>
+<%= turbo_stream.append "notification-tray", partial: "shared/notification", locals: { type: "success", content: "Valuation created" } %>
diff --git a/app/views/valuations/destroy.html.erb b/app/views/valuations/destroy.html.erb
new file mode 100644
index 00000000..1bbc64cf
--- /dev/null
+++ b/app/views/valuations/destroy.html.erb
@@ -0,0 +1,4 @@
+