consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display the time a phase ends at in admin section

Browse Source
This commit is contained in:
Julian Herrero
2020-03-16 12:54:00 +01:00
committed by Javi Martín
parent b37eaf19c6
commit d20e521ee9
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/components/admin/budget_phases/phases_component.rb
View File

@@ -12,14 +12,14 @@ class Admin::BudgetPhases::PhasesComponent < ApplicationComponent
end end
def start_date(phase) def start_date(phase)
formatted_date(phase.starts_at) formatted_date(phase.starts_at) if phase.starts_at.present?
end end
def end_date(phase) def end_date(phase)
formatted_date(phase.ends_at) formatted_date(phase.ends_at - 1.second) if phase.ends_at.present?
end end
def formatted_date(time) def formatted_date(time)
time_tag(time.to_date, format: :default) if time.present? time_tag(time, format: :datetime)
end end
end end

16
spec/system/admin/budgets_spec.rb
View File

@@ -267,14 +267,14 @@ describe "Admin budgets", :admin do
"Reviewing voting" "Reviewing voting"
], ],
[ [
"2015-07-15 - 2015-08-15", "2015-07-15 00:00:00 - 2015-08-14 23:59:59",
"2015-08-15 - 2015-09-15", "2015-08-15 00:00:00 - 2015-09-14 23:59:59",
"2015-09-15 - 2015-10-15", "2015-09-15 00:00:00 - 2015-10-14 23:59:59",
"2015-10-15 - 2015-11-15", "2015-10-15 00:00:00 - 2015-11-14 23:59:59",
"2015-11-15 - 2015-12-15", "2015-11-15 00:00:00 - 2015-12-14 23:59:59",
"2015-12-15 - 2016-01-15", "2015-12-15 00:00:00 - 2016-01-14 23:59:59",
"2016-01-15 - 2016-02-15", "2016-01-15 00:00:00 - 2016-02-14 23:59:59",
"2016-02-15 - 2016-03-15" "2016-02-15 00:00:00 - 2016-03-14 23:59:59"
] ]
] ]