From f9ecc583ef6905bdffcab49d8c11a57007867db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 18 Feb 2021 22:09:48 +0100 Subject: [PATCH] Extract methods to show a phase start/end --- .../admin/budget_phases/phases_component.html.erb | 4 +--- .../admin/budget_phases/phases_component.rb | 12 ++++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/components/admin/budget_phases/phases_component.html.erb b/app/components/admin/budget_phases/phases_component.html.erb index 2e9de2685..425823203 100644 --- a/app/components/admin/budget_phases/phases_component.html.erb +++ b/app/components/admin/budget_phases/phases_component.html.erb @@ -19,9 +19,7 @@ <% if phase.starts_at.present? || phase.ends_at.present? %> - <%= l(phase.starts_at.to_date) if phase.starts_at.present? %> - - - <%= l(phase.ends_at.to_date) if phase.ends_at.present? %> + <%= start_date(phase) %> - <%= end_date(phase) %> <% else %> <%= t("admin.budgets.edit.blank_dates") %> <% end %> diff --git a/app/components/admin/budget_phases/phases_component.rb b/app/components/admin/budget_phases/phases_component.rb index e7e09176a..dfa0fbee6 100644 --- a/app/components/admin/budget_phases/phases_component.rb +++ b/app/components/admin/budget_phases/phases_component.rb @@ -10,4 +10,16 @@ class Admin::BudgetPhases::PhasesComponent < ApplicationComponent def phases budget.phases.order(:id) end + + def start_date(phase) + formatted_date(phase.starts_at) + end + + def end_date(phase) + formatted_date(phase.ends_at) + end + + def formatted_date(time) + l(time.to_date) if time.present? + end end