From 82d46bd12a8006ca74c17d8e25f6558ca2d1eabf Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 12 Aug 2010 09:49:45 -0700 Subject: [PATCH] [#4411] Round time and currencies on the Deliverable form to 2 decimal places. --- app/helpers/contracts_helper.rb | 4 ++++ app/models/deliverable.rb | 2 ++ app/views/deliverables/_form.html.erb | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/helpers/contracts_helper.rb b/app/helpers/contracts_helper.rb index 2bc20f5..8f60e0e 100644 --- a/app/helpers/contracts_helper.rb +++ b/app/helpers/contracts_helper.rb @@ -77,4 +77,8 @@ module ContractsHelper return '' if value.blank? return h(value.name) end + + def format_deliverable_value_fields(value) + number_with_precision(value, :precision => Deliverable::ViewPrecision, :delimiter => '') + end end diff --git a/app/models/deliverable.rb b/app/models/deliverable.rb index f9e2e89..b02f6db 100644 --- a/app/models/deliverable.rb +++ b/app/models/deliverable.rb @@ -1,6 +1,8 @@ class Deliverable < ActiveRecord::Base unloadable + ViewPrecision = 2 + # Associations belongs_to :contract belongs_to :manager, :class_name => 'User', :foreign_key => 'manager_id' diff --git a/app/views/deliverables/_form.html.erb b/app/views/deliverables/_form.html.erb index 2f70443..5976293 100644 --- a/app/views/deliverables/_form.html.erb +++ b/app/views/deliverables/_form.html.erb @@ -37,11 +37,11 @@

<%= labor_budget.label(:hours, l(:text_short_hours)) %>

- <%= labor_budget.text_field(:hours, :size => 10) %> + <%= labor_budget.text_field(:hours, :value => format_deliverable_value_fields(labor_budget.object.hours), :size => 10) %>

<%= labor_budget.label(:budget, l(:text_dollar_sign)) %>

- <%= labor_budget.text_field(:budget, :size => 10) %> + <%= labor_budget.text_field(:budget, :value => format_deliverable_value_fields(labor_budget.object.budget), :size => 10) %> <%# TODO: Green Add button for multiple records %> @@ -64,11 +64,11 @@

<%= overhead_budget.label(:hours, l(:text_short_hours)) %>

- <%= overhead_budget.text_field(:hours, :size => 10) %> + <%= overhead_budget.text_field(:hours, :value => format_deliverable_value_fields(overhead_budget.object.hours),:size => 10) %>

<%= overhead_budget.label(:budget, l(:text_dollar_sign)) %>

- <%= overhead_budget.text_field(:budget, :size => 10) %> + <%= overhead_budget.text_field(:budget, :value => format_deliverable_value_fields(overhead_budget.object.budget), :size => 10) %> <%# TODO: Green Add button for multiple records %>