dinislage/redmine_contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: extract utility method.

Browse Source
This commit is contained in:
Eric Davis
2010-09-09 15:42:12 -07:00
parent 12fffee314
commit 75046cfdd1
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/models/retainer_deliverable.rb
View File

@@ -193,16 +193,7 @@ class RetainerDeliverable < HourlyDeliverable
when :in
labor_budget_spent_with_filter do
issue_ids = self.issues.collect(&:id)
if issue_ids.present?
TimeEntry.all(:conditions => ["#{Issue.table_name}.id IN (:issue_ids) AND tyear = (:year) AND tmonth = (:month)",
{:issue_ids => issue_ids,
:year => date.year,
:month => date.month}
],
:include => :issue)
else
[]
end
time_entries_for_date_and_issue_ids(date, issue_ids)
end
when :out
0
@@ -216,16 +207,7 @@ class RetainerDeliverable < HourlyDeliverable
when :in
overhead_spent_with_filter do
issue_ids = self.issues.collect(&:id)
if issue_ids.present?
TimeEntry.all(:conditions => ["#{Issue.table_name}.id IN (:issue_ids) AND tyear = (:year) AND tmonth = (:month)",
{:issue_ids => issue_ids,
:year => date.year,
:month => date.month}
],
:include => :issue)
else
[]
end
time_entries_for_date_and_issue_ids(date, issue_ids)
end
when :out
0
@@ -356,4 +338,18 @@ class RetainerDeliverable < HourlyDeliverable
status
end
def time_entries_for_date_and_issue_ids(date, issue_ids)
if issue_ids.present?
TimeEntry.all(:conditions => ["#{Issue.table_name}.id IN (:issue_ids) AND tyear = (:year) AND tmonth = (:month)",
{:issue_ids => issue_ids,
:year => date.year,
:month => date.month}
],
:include => :issue)
else
[]
end
end
end