diff --git a/app/models/deliverable.rb b/app/models/deliverable.rb index ef5effc..4644ce3 100644 --- a/app/models/deliverable.rb +++ b/app/models/deliverable.rb @@ -134,11 +134,16 @@ class Deliverable < ActiveRecord::Base return self.issues.collect(&:time_entries).flatten.collect(&:hours).sum end - # Amount spent on members. + # Grouping of members and how much they spent def members_spent return MemberSpent.find_all_by_deliverable(self) end + # Amount spent on members. + def spent_by_members + return self.members_spent.collect(&:spent) + end + # Amount of the budget remaining def left return self.budget - self.spent @@ -177,6 +182,13 @@ class Deliverable < ActiveRecord::Base (user == user && user.allowed_to?(:manage_budget, project)) end + def fixed? + return self.class == FixedDeliverable + end + + def hourly? + return self.class == HourlyDeliverable + end private def use_issue_status_for_done_ratios? diff --git a/app/views/deliverables/_deliverable.html.erb b/app/views/deliverables/_deliverable.html.erb index 6068dce..c2af7a5 100644 --- a/app/views/deliverables/_deliverable.html.erb +++ b/app/views/deliverables/_deliverable.html.erb @@ -32,10 +32,16 @@