dinislage/redmine-budget-plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ported FixedDeliverable.spent to use Rate. #1924

Browse Source
This commit is contained in:
Eric Davis
2009-01-21 14:31:06 -08:00
parent 50a466d7af
commit 4f18c28bba
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/fixed_deliverable.rb
View File

@@ -19,8 +19,8 @@ class FixedDeliverable < Deliverable
# Find each Member for their rate
time_logs.each do |time_log|
member = Member.find_by_user_id_and_project_id(time_log.user_id, time_log.project_id)
total += (member.rate * time_log.hours) unless member.nil? || member.rate.nil?
rate = Rate.amount_for(time_log.user, time_log.project, time_log.spent_on)
total += (rate * time_log.hours) unless rate.nil?
end
return total

5
spec/models/fixed_deliverable_spec.rb
View File

@@ -25,11 +25,10 @@ describe FixedDeliverable, '.spent' do
@user = mock_model(User)
@issue1 = mock_model(Issue)
@issue_1_time_entry = mock_model(TimeEntry, :issue_id => @issue1.id, :user_id => @user.id, :project_id => @project.id, :hours => 1.0)
@issue_1_time_entry = mock_model(TimeEntry, :issue_id => @issue1.id, :user => @user, :project => @project, :hours => 1.0, :spent_on => Date.today)
@issue1.stub!(:time_entries).and_return([@issue_1_time_entry])
@member = mock_model(Member, :user => @user, :project => @project, :rate => 60.0)
Member.should_receive(:find_by_user_id_and_project_id).with(@user.id, @project.id).and_return(@member)
Rate.should_receive(:amount_for).with(@user, @project, @issue_1_time_entry.spent_on).and_return(60.0)
@deliverable = FixedDeliverable.new({ :subject => 'test' })
@issues = [@issue1]