mirror of
https://github.com/we-promise/sure.git
synced 2026-05-30 07:49:01 +00:00
Previous savings goals UI looked nothing like the Claude Design output
(see sure-design-context/design/savings-goals/project/goals/*.jsx) and
the hand-rolled ring did not match the segmented D3 donut used at
app/views/budgets/_budget_donut.html.erb. This rewires the surface end
to end.
Donut chart:
- SavingsGoal#to_donut_segments_json returns the same segment shape as
Budget#to_donut_segments_json: filled portion in goal color, unused
remainder as `var(--budget-unallocated-fill)`. Visual identity is now
the same: segmented arc with cornerRadius and gap, courtesy of the
shared `donut-chart` Stimulus controller and D3.
- ProgressRingComponent renders a `data-controller="donut-chart"` div
with the same default-content/inner-text pattern as `_budget_donut`.
Index page (matches GoalsIndex.jsx):
- Page header: title + "Save toward what matters." subtitle + "New goal"
primary CTA right-aligned.
- Summary strip card: total saved / target, overall bar, active goals,
on-track ratio, behind count.
- State filter rendered as DS::Tabs-style pill nav (`bg-surface-inset
p-1 rounded-lg`, white-pill active state).
- Cards rebuilt: avatar (44px, rounded-xl, white initial on goal color)
+ name + secondary line ("N days left · by date" / "No target date" /
"Completed" / "Past due"), status pill with leading dot, big
$current/$target line + percent, bar in status colour, AccountStack
(overlapping initials) + "N accounts" + "to go".
Goal detail (matches GoalDetail.jsx):
- Header: 64px avatar + h1 name + status pill + "Target $X by date ·
N days left" subline + Edit (outline) + Add contribution (primary) +
kebab (DS::Menu for AASM transitions).
- Donut-chart ring card with stats overlay.
- 4-col stat row (Avg monthly, Total contributions, Target date,
Started) with mono numerals and "Needs $X/mo" / "Above target pace"
sub-captions where relevant.
- Two-col bottom: contributions list (avatar + account · date · source
· green +$amount) and funding accounts breakdown (stacked bar +
per-account row with $ and % of saved).
New components: Savings::AccountStackComponent (overlapping account
initials with ring-2 ring-container). StatusPillComponent now uses a
leading colored dot instead of an icon. GoalAvatarComponent radii
match Claude Design (rounded-md/lg/xl/2xl) and white initial.
Locale: new keys under savings_goals.{index.subtitle, index.summary.*,
goal_card.{accounts,days_left,completed,past_due,no_target_date},
show.header.*, show.ring.{of,to_go}, show.stats.*, show.funding_balance,
show.of_saved, show.notes}.
211 lines
7.1 KiB
Ruby
211 lines
7.1 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)
|
|
{
|
|
avg_monthly: avg,
|
|
avg_monthly_sub: sub_avg,
|
|
contributions_count: goal.savings_contributions.count,
|
|
monthly_target_sub: sub_target,
|
|
started_sub: sub_started
|
|
}
|
|
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
|