diff --git a/app/views/deliverables/_deliverable.html.erb b/app/views/deliverables/_deliverable.html.erb index 9480122..dddcfdf 100644 --- a/app/views/deliverables/_deliverable.html.erb +++ b/app/views/deliverables/_deliverable.html.erb @@ -2,7 +2,7 @@ <%= content_tag(:td, deliverable.id) %> <%= content_tag(:td, deliverable.score) %> <%= content_tag(:td, deliverable.subject) %> - <%= content_tag(:td, number_to_currency(deliverable.cost)) %> + <%= content_tag(:td, number_to_currency(deliverable.budget)) %> <%= content_tag(:td, number_to_currency(deliverable.spent)) %> <%= content_tag(:td, format_date(deliverable.due_date)) %> <%= content_tag(:td, progress_bar(deliverable.progress, :width => '80px')) %> diff --git a/app/views/deliverables/_form.html.erb b/app/views/deliverables/_form.html.erb index 44cf5de..da74011 100644 --- a/app/views/deliverables/_form.html.erb +++ b/app/views/deliverables/_form.html.erb @@ -18,13 +18,14 @@

TODO: Fixed cost

-

<%= f.text_field :cost, :size => 7 %>

+

TODO: Cost per hour

TODO: Total hours

<%= f.text_field :overhead, :size => 7 %>

<%= f.text_field :materials, :size => 7 %>

<%= f.text_field :profit, :size => 7 %>

<%# TODO %>

Total Budget:

+

<%= f.text_field :budget, :size => 7 %>

diff --git a/app/views/deliverables/_list.html.erb b/app/views/deliverables/_list.html.erb index 210f209..5efef96 100644 --- a/app/views/deliverables/_list.html.erb +++ b/app/views/deliverables/_list.html.erb @@ -5,7 +5,7 @@ <%= sort_header_tag("#{Deliverable.table_name}.id", :caption => '#', :default_order => 'desc') %> <%= content_tag('th', "Score") %> <%= sort_header_tag("#{Deliverable.table_name}.subject", :caption => 'Subject') %> - <%= sort_header_tag("#{Deliverable.table_name}.cost", :caption => 'Budget') %> + <%= sort_header_tag("#{Deliverable.table_name}.budget", :caption => 'Budget') %> <%= content_tag('th', "Spent") %> <%= sort_header_tag("#{Deliverable.table_name}.due_date", :caption => 'Due') %> <%= content_tag('th', "Progress") %> diff --git a/db/migrate/003_rename_cost_to_budget.rb b/db/migrate/003_rename_cost_to_budget.rb new file mode 100644 index 0000000..6278ec7 --- /dev/null +++ b/db/migrate/003_rename_cost_to_budget.rb @@ -0,0 +1,11 @@ +class RenameCostToBudget < ActiveRecord::Migration + def self.up + add_column :deliverables, :budget, :decimal + remove_column :deliverables, :cost + end + + def self.down + add_column :deliverables, :cost, :decimal + remove_column :deliverables, :budget + end +end