[#4411] Round time and currencies on the Deliverable form to 2 decimal places.

This commit is contained in:
Eric Davis committed 2010-08-12 09:49:45 -07:00
1 parent a2b810a4d8
commit 82d46bd12a
3 files changed
+10 -4

No files matched your search

+4
View File
@@ -77,4 +77,8 @@ module ContractsHelper
return '' if value.blank? return '' if value.blank?
return h(value.name) return h(value.name)
end end
def format_deliverable_value_fields(value)
number_with_precision(value, :precision => Deliverable::ViewPrecision, :delimiter => '')
end
end end
+2
View File
@@ -1,6 +1,8 @@
class Deliverable < ActiveRecord::Base class Deliverable < ActiveRecord::Base
unloadable unloadable
ViewPrecision = 2
# Associations # Associations
belongs_to :contract belongs_to :contract
belongs_to :manager, :class_name => 'User', :foreign_key => 'manager_id' belongs_to :manager, :class_name => 'User', :foreign_key => 'manager_id'
+4 -4
View File
@@ -37,11 +37,11 @@
</td> </td>
<td> <td>
<p class="inline-hints"><%= labor_budget.label(:hours, l(:text_short_hours)) %></p> <p class="inline-hints"><%= labor_budget.label(:hours, l(:text_short_hours)) %></p>
<%= labor_budget.text_field(:hours, :size => 10) %> <%= labor_budget.text_field(:hours, :value => format_deliverable_value_fields(labor_budget.object.hours), :size => 10) %>
</td> </td>
<td> <td>
<p class="inline-hints"><%= labor_budget.label(:budget, l(:text_dollar_sign)) %></p> <p class="inline-hints"><%= labor_budget.label(:budget, l(:text_dollar_sign)) %></p>
<%= labor_budget.text_field(:budget, :size => 10) %> <%= labor_budget.text_field(:budget, :value => format_deliverable_value_fields(labor_budget.object.budget), :size => 10) %>
</td> </td>
<%# TODO: Green Add button for multiple records %> <%# TODO: Green Add button for multiple records %>
<td> <td>
@@ -64,11 +64,11 @@
</td> </td>
<td> <td>
<p class="inline-hints"><%= overhead_budget.label(:hours, l(:text_short_hours)) %></p> <p class="inline-hints"><%= overhead_budget.label(:hours, l(:text_short_hours)) %></p>
<%= overhead_budget.text_field(:hours, :size => 10) %> <%= overhead_budget.text_field(:hours, :value => format_deliverable_value_fields(overhead_budget.object.hours),:size => 10) %>
</td> </td>
<td> <td>
<p class="inline-hints"><%= overhead_budget.label(:budget, l(:text_dollar_sign)) %></p> <p class="inline-hints"><%= overhead_budget.label(:budget, l(:text_dollar_sign)) %></p>
<%= overhead_budget.text_field(:budget, :size => 10) %> <%= overhead_budget.text_field(:budget, :value => format_deliverable_value_fields(overhead_budget.object.budget), :size => 10) %>
</td> </td>
<%# TODO: Green Add button for multiple records %> <%# TODO: Green Add button for multiple records %>
<td> <td>