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

Complted the JavaScript subtotals on the new Deliverable form

Browse Source 
* Subtotals will be updated as data is entered
* Created a helper to setup the fields with observers
* Added JavaScript functions to calculate the values

  #1135
This commit is contained in:
Eric Davis
2008-05-20 22:27:00 -07:00
parent d3abeb7dec
commit f8399f1968
3 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/helpers/deliverables_helper.rb Normal file
View File

@@ -0,0 +1,12 @@
module DeliverablesHelper
def field_with_budget_observer_and_totals(form, field)
content_tag(:p,
form.text_field(field, :size => 7) +
content_tag(:span,
0,
:class => "budget-calculation",
:id => 'deliverable_' + field.to_s + '_subtotal'
)
) + observe_field('deliverable_' + field.to_s, :function => "updateSubtotal('deliverable_#{field.to_s}'); updateBudget('deliverable_budget');")
end
end

51
app/views/deliverables/_form.html.erb
View File

@@ -19,16 +19,19 @@
<div class="splitcontentright">
<%# TODO: Need to update subtotals with observers %>
<p>TODO: Fixed cost</p>
<p><%= f.text_field :cost_per_hour, :size => 7 %></p>
<%= observe_field('deliverable_cost_per_hour', :function => "updateBudget('deliverable_budget');") %>
<p><%= f.text_field :total_hours, :size => 7 %></p>
<%= observe_field('deliverable_total_hours', :function => "updateBudget('deliverable_budget');") %>
<p><%= f.text_field :overhead, :size => 7 %></p>
<%= observe_field('deliverable_overhead', :function => "updateBudget('deliverable_budget');") %>
<p><%= f.text_field :materials, :size => 7 %></p>
<%= observe_field('deliverable_materials', :function => "updateBudget('deliverable_budget');") %>
<p><%= f.text_field :profit, :size => 7 %></p>
<%= observe_field('deliverable_profit', :function => "updateBudget('deliverable_budget');") %>
<%= observe_field('deliverable_cost_per_hour', :function => "updateBaseSubtotal(); updateBudget('deliverable_budget');") %>
<p>
<%= f.text_field :total_hours, :size => 7 %>
<%= content_tag(:span, 0, :class => "budget-calculation", :id => 'deliverable_base_subtotal') %>
</p>
<%= observe_field('deliverable_total_hours', :function => "updateBaseSubtotal(); updateBudget('deliverable_budget');") %>
<%= field_with_budget_observer_and_totals(f, :overhead) %>
<%= field_with_budget_observer_and_totals(f, :materials) %>
<%= field_with_budget_observer_and_totals(f, :profit) %>
<p><%= f.text_field :budget, :size => 7, :disabled => true %></p>
</div>
@@ -101,5 +104,35 @@ function updateBudget(field) {
$(field).value = calcBudget();
}
}
function updateSubtotal(field) {
var perHour = toAmount($('deliverable_cost_per_hour').value);
var hours = toAmount($('deliverable_total_hours').value);
var variableCost = perHour * hours;
if ($(field).value.match('%')) {
var subtotal = (toAmount($(field).value) / 100) * variableCost;
} else {
var subtotal = toAmount($(field).value);
}
if ($(field + '_subtotal')) {
$(field + '_subtotal').innerHTML = subtotal;
}
calcBudget('deliverable_budget');
}
function updateBaseSubtotal() {
var perHour = toAmount($('deliverable_cost_per_hour').value);
var hours = toAmount($('deliverable_total_hours').value);
var variableCost = perHour * hours;
if ($('deliverable_base_subtotal')) {
$('deliverable_base_subtotal').innerHTML = variableCost;
}
}
</script>
<% end %>

4
assets/stylesheets/budget.css
View File

@@ -8,4 +8,6 @@ tr.deliverable td.subject { text-align: left; }
tr.deliverable td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
#deliverable-form .splitcontentleft { width: 62% }
#deliverable-form .splitcontentright { width: 37% }
#deliverable-form .splitcontentright { width: 37% }
span.budget-calculation { color:#999999; font-weight:bold;}