From d78e7b1dc342c94e477d03ee838295bc2203a769 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Fri, 17 Sep 2010 14:51:48 -0700 Subject: [PATCH] [#4477] Scope fixed budget items by period too (for Retainers) --- app/models/fixed_budget.rb | 8 ++++++++ app/views/deliverables/_details_row.html.erb | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/fixed_budget.rb b/app/models/fixed_budget.rb index bfbcb56..982067a 100644 --- a/app/models/fixed_budget.rb +++ b/app/models/fixed_budget.rb @@ -15,6 +15,14 @@ class FixedBudget < ActiveRecord::Base end end + named_scope :by_period, lambda {|date| + if date + { + :conditions => {:year => date.year, :month => date.month} + } + end + } + def markup_value return 0 if budget.blank? || markup.blank? diff --git a/app/views/deliverables/_details_row.html.erb b/app/views/deliverables/_details_row.html.erb index b2a6ccb..ef7104a 100644 --- a/app/views/deliverables/_details_row.html.erb +++ b/app/views/deliverables/_details_row.html.erb @@ -63,7 +63,7 @@ TODO: Release 2 / TODO hrs - <% deliverable.fixed_budgets.each do |fixed_budget| %> + <% deliverable.fixed_budgets.by_period(period).each do |fixed_budget| %> <% next if fixed_budget.blank_record? %> <%= h(fixed_budget.title) %>