diff --git a/app/models/budget.rb b/app/models/budget.rb index 2e4af0000..5d24e2437 100644 --- a/app/models/budget.rb +++ b/app/models/budget.rb @@ -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 diff --git a/app/models/budget/phase.rb b/app/models/budget/phase.rb index 5475d97be..87a3909a0 100644 --- a/app/models/budget/phase.rb +++ b/app/models/budget/phase.rb @@ -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? diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb index 71d439a98..bf0bbe7ab 100644 --- a/app/views/budgets/index.html.erb +++ b/app/views/budgets/index.html.erb @@ -14,10 +14,8 @@

- <% 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})" %> - <%= t('budgets.show.phase') %> <%= phases_progress_numbers %> + <% steps_progress = "(#{current_phase.step_number}/#{@budget.published_phases.count})" %> + <%= t('budgets.show.phase') %> <%= steps_progress %>

<%= t("budgets.phase.#{@budget.phase}") %>