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

Display last milestones image

Browse Source 
Also adds a second order to ensure the order to display milestones with same publication date is always the same
This commit is contained in:
decabeza
2018-11-07 18:25:02 +01:00
parent ba1a6b4cc8
commit 1d5335c782
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/budget_executions_helper.rb
View File

@@ -7,8 +7,8 @@ module BudgetExecutionsHelper
end
def first_milestone_with_image(investment)
investment.milestones.order(publication_date: :asc, created_at: :asc)
.select{ |milestone| milestone.image.present? }.first
investment.milestones.order_by_publication_date
.select{ |milestone| milestone.image.present? }.last
end
end

2
app/models/budget/investment/milestone.rb
View File

@@ -17,7 +17,7 @@ class Budget
validates :publication_date, presence: true
validate :description_or_status_present?
scope :order_by_publication_date, -> { order(publication_date: :asc) }
scope :order_by_publication_date, -> { order(publication_date: :asc, created_at: :asc) }
scope :published, -> { where("publication_date <= ?", Date.current) }
scope :with_status, -> { where("status_id IS NOT NULL") }

4
spec/features/budgets/executions_spec.rb
View File

@@ -100,7 +100,7 @@ feature 'Executions' do
expect(page).to have_css("img[alt='#{investment4.title}']")
end
scenario "renders first milestone's image if investment has multiple milestones with images associated" do
scenario "renders last milestone's image if investment has multiple milestones with images associated" do
milestone1 = create(:budget_investment_milestone, investment: investment1,
publication_date: Date.yesterday)
@@ -122,7 +122,7 @@ feature 'Executions' do
click_link 'Milestones'
expect(page).to have_content(investment1.title)
expect(page).to have_css("img[alt='#{milestone2.image.title}']")
expect(page).to have_css("img[alt='#{milestone3.image.title}']")
end
end