mirror of
https://github.com/we-promise/sure.git
synced 2026-05-30 07:49:01 +00:00
Brings the savings goals UI closer to the Claude Design reference shared
by the user. Changes:
- Sidebar nav label: "Savings goals" → "Savings".
- Status pill copy: "Behind" → "Behind pace" (matches Pill component
from GoalsCommon.jsx).
- Empty state rewritten with a large target icon, "No goals yet"
heading, and the descriptive body copy from the design.
Goal detail page (matches GoalDetail.jsx):
- New "← All goals" back link above the header.
- 2-column hero: ring card on the left (320px column), Projection card
on the right.
- Projection card uses a new D3 Stimulus controller
(`savings-goal-projection-chart`) that draws:
· saved area + line from goal creation → today (solid, primary)
· dashed projection segment from today → target date (yellow when
behind, green when on track)
· horizontal dashed target line with label
· today marker (vertical dashed line + dot)
Data shape comes from `SavingsGoal#projection_payload`.
- Card subtitle generates a contextual sentence ("At $X/mo you'll fall
short. Bump to $Y/mo to hit it on time." / "At your current pace
you'll reach this goal around Month YYYY." / "Goal reached. Nice
work.") with a strong tag highlighting the actionable figure.
- Stat row now shows Linked balance (sum across linked accounts) +
"N accounts" sub-caption instead of duplicate "Target date" stat.
New goal modal (matches the design images 2 + 3):
- DS::Dialog custom header: DS::FilledIcon target glyph + title + step
subtitle ("Step 1 of 2 · Goal details" / "Step 2 of 2 · Review &
start") that updates as the user advances.
- Connected stepper at top of body: numbered circles connected by a
bar, step-1 circle flips to ✓ when complete.
- Step 1 heading "What are you saving for?" + supporting copy.
- Name field paired with a target glyph affordance on its left.
- Target amount + Target date in a 2-col grid.
- Funding accounts list now grouped by account subtype with uppercase
section headers (CHECKING / SAVINGS / HSA / CD / MONEY MARKET /
OTHER), each row showing avatar + name + subtype + balance.
- Step 2 heading "Looks good?" + Review card (goal target + funding
accounts summary + suggested monthly = target/months_remaining), and
a disclosure for the optional initial contribution.
- Footer: "Cancel" left text-button (closes modal) / "Back" left text
when on step 2; "Continue →" or "Create goal →" right arrow button.
Demo generator: Depository accounts now set `subtype` ("checking" /
"savings") on the accountable so they group correctly in the modal.
Tests: all green, 35 runs in the savings suite, 92 assertions.
241 lines
8.3 KiB
Ruby
241 lines
8.3 KiB
Ruby
class SavingsGoalsController < ApplicationController
|
|
before_action :set_savings_goal, only: %i[show edit update destroy pause resume complete archive unarchive]
|
|
|
|
STATE_FILTERS = %w[all active paused completed archived].freeze
|
|
|
|
def index
|
|
@state_filter = STATE_FILTERS.include?(params[:state]) ? params[:state] : "active"
|
|
scope = Current.family.savings_goals.with_current_balance.alphabetically
|
|
scope = scope.where(state: @state_filter) unless @state_filter == "all"
|
|
@savings_goals = scope.to_a
|
|
|
|
@counts = STATE_FILTERS.each_with_object({}) do |state, h|
|
|
h[state] = state == "all" ? Current.family.savings_goals.count : Current.family.savings_goals.where(state: state).count
|
|
end
|
|
|
|
@linkable_account_count = Current.family.accounts.where(accountable_type: "Depository").visible.count
|
|
@totals = totals_for_family
|
|
end
|
|
|
|
def show
|
|
@contributions = @savings_goal.savings_contributions.includes(:account).chronological.limit(50)
|
|
@funding_breakdown = funding_breakdown_for(@savings_goal)
|
|
@stats = stats_for(@savings_goal)
|
|
end
|
|
|
|
def new
|
|
@savings_goal = Current.family.savings_goals.new(
|
|
color: SavingsGoal::COLORS.sample,
|
|
currency: Current.family.primary_currency_code
|
|
)
|
|
@linkable_accounts = linkable_accounts_for_new
|
|
end
|
|
|
|
def create
|
|
@savings_goal = Current.family.savings_goals.new(savings_goal_params)
|
|
accounts = lookup_accounts(params.dig(:savings_goal, :account_ids))
|
|
@savings_goal.currency = accounts.first.currency if accounts.any? && @savings_goal.currency.blank?
|
|
|
|
SavingsGoal.transaction do
|
|
accounts.each { |a| @savings_goal.savings_goal_accounts.build(account: a) }
|
|
@savings_goal.save!
|
|
create_initial_contribution_if_provided!(@savings_goal, accounts)
|
|
end
|
|
|
|
flash[:notice] = t(".success")
|
|
respond_to do |format|
|
|
format.html { redirect_to savings_goal_path(@savings_goal) }
|
|
format.turbo_stream do
|
|
render turbo_stream: turbo_stream.action(:redirect, savings_goal_path(@savings_goal))
|
|
end
|
|
end
|
|
rescue ActiveRecord::RecordInvalid
|
|
@linkable_accounts = linkable_accounts_for_new
|
|
render :new, status: :unprocessable_entity
|
|
end
|
|
|
|
def edit
|
|
end
|
|
|
|
def update
|
|
if @savings_goal.update(savings_goal_update_params)
|
|
flash[:notice] = t(".success")
|
|
respond_to do |format|
|
|
format.html { redirect_to savings_goal_path(@savings_goal) }
|
|
format.turbo_stream do
|
|
render turbo_stream: turbo_stream.action(:redirect, savings_goal_path(@savings_goal))
|
|
end
|
|
end
|
|
else
|
|
render :edit, status: :unprocessable_entity
|
|
end
|
|
end
|
|
|
|
def destroy
|
|
unless @savings_goal.archived?
|
|
redirect_to savings_goal_path(@savings_goal), alert: t(".archive_first")
|
|
return
|
|
end
|
|
|
|
@savings_goal.destroy!
|
|
redirect_to savings_goals_path, notice: t(".success")
|
|
end
|
|
|
|
def pause
|
|
perform_transition!(:pause)
|
|
end
|
|
|
|
def resume
|
|
perform_transition!(:resume)
|
|
end
|
|
|
|
def complete
|
|
perform_transition!(:complete)
|
|
end
|
|
|
|
def archive
|
|
perform_transition!(:archive)
|
|
end
|
|
|
|
def unarchive
|
|
perform_transition!(:unarchive)
|
|
end
|
|
|
|
private
|
|
def set_savings_goal
|
|
@savings_goal = Current.family.savings_goals.find(params[:id])
|
|
end
|
|
|
|
def savings_goal_params
|
|
params.require(:savings_goal).permit(:name, :target_amount, :target_date, :color, :notes)
|
|
end
|
|
|
|
def savings_goal_update_params
|
|
params.require(:savings_goal).permit(:name, :target_amount, :target_date, :color, :notes)
|
|
end
|
|
|
|
def lookup_accounts(ids)
|
|
return [] if ids.blank?
|
|
|
|
ids = Array(ids).reject(&:blank?)
|
|
Current.family.accounts.where(accountable_type: "Depository").visible.where(id: ids).to_a
|
|
end
|
|
|
|
def linkable_accounts_for_new
|
|
Current.family.accounts.where(accountable_type: "Depository").visible.alphabetically.to_a
|
|
end
|
|
|
|
def create_initial_contribution_if_provided!(goal, accounts)
|
|
amount = params.dig(:savings_goal, :initial_contribution_amount)
|
|
account_id = params.dig(:savings_goal, :initial_contribution_account_id)
|
|
return if amount.blank? || account_id.blank?
|
|
return unless BigDecimal(amount.to_s) > 0
|
|
|
|
source = accounts.find { |a| a.id == account_id }
|
|
raise ActiveRecord::RecordInvalid.new(goal) unless source
|
|
|
|
goal.savings_contributions.create!(
|
|
account: source,
|
|
amount: amount,
|
|
currency: goal.currency,
|
|
source: "initial",
|
|
contributed_at: Date.current
|
|
)
|
|
end
|
|
|
|
def funding_breakdown_for(goal)
|
|
totals = goal.savings_contributions
|
|
.group(:account_id)
|
|
.sum(:amount)
|
|
goal.linked_accounts.map do |account|
|
|
amount = totals[account.id] || 0
|
|
{ account: account, amount: amount, money: Money.new(amount, goal.currency) }
|
|
end
|
|
end
|
|
|
|
def totals_for_family
|
|
goals = Current.family.savings_goals.with_current_balance.to_a
|
|
saved = goals.sum { |g| g.current_balance.to_d }
|
|
target = goals.sum { |g| g.target_amount.to_d }
|
|
currency = Current.family.primary_currency_code
|
|
active_goals = goals.select { |g| g.state == "active" }
|
|
on_track = active_goals.count { |g| g.status == :on_track || g.status == :reached }
|
|
behind = active_goals.count { |g| g.status == :behind }
|
|
overall_percent = target.zero? ? 0 : ((saved / target) * 100).round
|
|
{
|
|
saved: Money.new(saved, currency),
|
|
target: Money.new(target, currency),
|
|
overall_percent: [ overall_percent, 100 ].min,
|
|
on_track_count: on_track,
|
|
behind_count: behind
|
|
}
|
|
end
|
|
|
|
def stats_for(goal)
|
|
avg = goal.average_monthly_contribution.to_d
|
|
sub_avg = if goal.monthly_target_amount && goal.monthly_target_amount.to_d > avg
|
|
t("savings_goals.show.stats.needs_per_month", amount: Money.new(goal.monthly_target_amount, goal.currency).format)
|
|
else
|
|
t("savings_goals.show.stats.above_target_pace")
|
|
end
|
|
sub_target = if goal.monthly_target_amount
|
|
t("savings_goals.show.stats.needs_per_month", amount: Money.new(goal.monthly_target_amount, goal.currency).format)
|
|
else
|
|
t("savings_goals.show.stats.no_required_pace")
|
|
end
|
|
months_since_start = ((Date.current.year - goal.created_at.year) * 12 + (Date.current.month - goal.created_at.month)).clamp(0, 1200)
|
|
sub_started = t("savings_goals.show.stats.months_ago", count: months_since_start)
|
|
linked_balance = goal.linked_accounts.sum { |a| a.balance.to_d }
|
|
sub_linked = t("savings_goals.show.stats.n_accounts", count: goal.linked_accounts.size)
|
|
|
|
summary = projection_summary(goal, avg)
|
|
|
|
{
|
|
avg_monthly: avg,
|
|
avg_monthly_sub: sub_avg,
|
|
contributions_count: goal.savings_contributions.count,
|
|
monthly_target_sub: sub_target,
|
|
started_sub: sub_started,
|
|
linked_balance: linked_balance,
|
|
linked_balance_sub: sub_linked,
|
|
projection_summary: summary
|
|
}
|
|
end
|
|
|
|
def projection_summary(goal, avg_monthly)
|
|
currency = goal.currency
|
|
money = ->(amount) { Money.new(amount, currency).format }
|
|
|
|
if goal.completed? || goal.progress_percent >= 100
|
|
t("savings_goals.show.projection.reached")
|
|
elsif goal.target_date.nil?
|
|
t("savings_goals.show.projection.no_target_date")
|
|
elsif goal.monthly_target_amount && avg_monthly < goal.monthly_target_amount
|
|
t("savings_goals.show.projection.behind",
|
|
current: money.call(avg_monthly),
|
|
required: money.call(goal.monthly_target_amount))
|
|
elsif avg_monthly.positive?
|
|
months_to_target = (goal.remaining_amount.to_d / avg_monthly).ceil
|
|
projected_date = Date.current >> months_to_target.to_i
|
|
t("savings_goals.show.projection.on_track",
|
|
date: projected_date.strftime("%b %Y"))
|
|
else
|
|
t("savings_goals.show.projection.no_pace")
|
|
end
|
|
end
|
|
|
|
def perform_transition!(event)
|
|
if @savings_goal.aasm.may_fire_event?(event)
|
|
@savings_goal.public_send("#{event}!")
|
|
respond_to do |format|
|
|
format.html { redirect_to savings_goal_path(@savings_goal), notice: t(".success") }
|
|
format.turbo_stream do
|
|
render turbo_stream: turbo_stream.action(:redirect, savings_goal_path(@savings_goal))
|
|
end
|
|
end
|
|
else
|
|
redirect_to savings_goal_path(@savings_goal), alert: t(".invalid_transition")
|
|
end
|
|
end
|
|
end
|