Refactor budget phases current step & total steps

This commit is contained in:
Bertocq
2018-01-18 16:53:36 +01:00
parent 986ee9c87d
commit 2e883db283
3 changed files with 10 additions and 4 deletions

View File

@@ -40,6 +40,10 @@ class Budget < ActiveRecord::Base
phases.send(phase)
end
def published_phases
phases.published
end
def description
description_for_phase(phase)
end

View File

@@ -55,6 +55,10 @@ class Budget
end
end
def step_number
budget.published_phases.order(:id).index(self) + 1 || 0
end
private
def prev_phase_dates_valid?

View File

@@ -14,10 +14,8 @@
</div>
<div class="small-12 medium-3 column info padding" data-equalizer-watch>
<p>
<% published_phases = @budget.phases.published %>
<% current_phase_number = published_phases.index(@budget.current_phase) + 1 || 0 %>
<% phases_progress_numbers = "(#{current_phase_number}/#{published_phases.count})" %>
<strong><%= t('budgets.show.phase') %> <%= phases_progress_numbers %></strong>
<% steps_progress = "(#{current_phase.step_number}/#{@budget.published_phases.count})" %>
<strong><%= t('budgets.show.phase') %> <%= steps_progress %></strong>
</p>
<h2><%= t("budgets.phase.#{@budget.phase}") %></h2>