preklad
This commit is contained in:
@@ -32,6 +32,7 @@ class DeliverablesController < ApplicationController
|
|||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html { render :action => 'index', :layout => !request.xhr? }
|
format.html { render :action => 'index', :layout => !request.xhr? }
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Action to preview the Deliverable description
|
# Action to preview the Deliverable description
|
||||||
@@ -167,5 +168,4 @@ class DeliverablesController < ApplicationController
|
|||||||
return deliverables
|
return deliverables
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<div id="new-deliverable" style="<%= @display_form ? '' : 'display:none;' -%>">
|
<div id="new-deliverable" style="<%= @display_form ? '' : 'display:none;' -%>">
|
||||||
<h2><%= l(:label_new_deliverable) %></h2>
|
<h2><%= l(:label_new_deliverable) %></h2>
|
||||||
<% remote_form_for :deliverable, @deliverable, :url => {:controller => 'deliverables', :action => 'create', :id => @project },
|
<% remote_form_for :deliverable, @deliverable, :url => {:controller => 'deliverables', :action => 'create', :id => @project },
|
||||||
:method => :post, :builder => TabularFormBuilder, :lang => 'cs',
|
:method => :post, :builder => TabularFormBuilder, :lang => current_language,
|
||||||
:html => {:multipart => true, :id => 'deliverable-form', :class => 'tabular'} do |f| %>
|
:html => {:multipart => true, :id => 'deliverable-form', :class => 'tabular'} do |f| %>
|
||||||
<%= render :partial => 'form', :locals => { :mode => :create, :f => f } %>
|
<%= render :partial => 'form', :locals => { :mode => :create, :f => f } %>
|
||||||
<% end %>
|
<% end %>
|
||||||
@@ -28,5 +28,147 @@
|
|||||||
|
|
||||||
<% content_for :header_tags do %>
|
<% content_for :header_tags do %>
|
||||||
<%= stylesheet_link_tag "budget.css", :plugin => "budget_plugin", :media => "screen" %>
|
<%= stylesheet_link_tag "budget.css", :plugin => "budget_plugin", :media => "screen" %>
|
||||||
<%= javascript_include_tag('budget.js', :plugin => 'budget_plugin') %>
|
|
||||||
|
<% javascript_tag do %>
|
||||||
|
/* Used to calculate the Budget */
|
||||||
|
var BudgetModule = Class.create();
|
||||||
|
Object.extend(BudgetModule.prototype, {
|
||||||
|
initialize: function () {},
|
||||||
|
|
||||||
|
toAmount: function(value) {
|
||||||
|
var amount = value.replace(/[^1234567890.]/ig,'');
|
||||||
|
if (amount) {
|
||||||
|
return parseFloat(amount);
|
||||||
|
} else {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
updateAmounts: function() {
|
||||||
|
if ($('deliverable_type').checked) {
|
||||||
|
// Fixed cost
|
||||||
|
var cost = Budget.toAmount($('deliverable_fixed_cost').value);
|
||||||
|
Budget.updateAmount($('fixedCost'), cost);
|
||||||
|
} else {
|
||||||
|
// Variable cost
|
||||||
|
var perHour = Budget.toAmount($('deliverable_cost_per_hour').value);
|
||||||
|
var hours = Budget.toAmount($('deliverable_total_hours').value);
|
||||||
|
|
||||||
|
var cost = perHour * hours;
|
||||||
|
Budget.updateAmount($('variableCost'), cost);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if ($('deliverable_overhead').value.match('%')) {
|
||||||
|
var overhead_subtotal = (Budget.toAmount($('deliverable_overhead').value) / 100) * cost;
|
||||||
|
} else {
|
||||||
|
var overhead_subtotal = Budget.toAmount($('deliverable_overhead').value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($('deliverable_materials').value.match('%')) {
|
||||||
|
var materials_subtotal = (Budget.toAmount($('deliverable_materials').value) / 100) * cost;
|
||||||
|
} else {
|
||||||
|
var materials_subtotal = Budget.toAmount($('deliverable_materials').value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Profit uses labor cost and overhead
|
||||||
|
if ($('deliverable_profit').value.match('%')) {
|
||||||
|
var profit_subtotal = (Budget.toAmount($('deliverable_profit').value) / 100) * (cost + overhead_subtotal);
|
||||||
|
} else {
|
||||||
|
var profit_subtotal = Budget.toAmount($('deliverable_profit').value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Amounts
|
||||||
|
Budget.updateAmount($('overhead_subtotal'), overhead_subtotal);
|
||||||
|
Budget.updateAmount($('materials_subtotal'), materials_subtotal);
|
||||||
|
Budget.updateAmount($('profit_subtotal'), profit_subtotal);
|
||||||
|
|
||||||
|
var total = cost + overhead_subtotal + materials_subtotal + profit_subtotal;
|
||||||
|
$('deliverable_budget').value = total;
|
||||||
|
$('total-budget-calculation').innerHTML = Budget.number_to_currency(total);
|
||||||
|
},
|
||||||
|
|
||||||
|
updateAmount: function(element, value) {
|
||||||
|
if (element) {
|
||||||
|
element.innerHTML = Budget.number_to_currency(value);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
changeType: function() {
|
||||||
|
if ($('deliverable_type').checked) {
|
||||||
|
// Fixed
|
||||||
|
$$('.budget-hourly').each(function(ele) { ele.hide(); });
|
||||||
|
$$('.budget-fixed').each(function(ele) { ele.show(); });
|
||||||
|
} else {
|
||||||
|
// Variable
|
||||||
|
$$('.budget-hourly').each(function(ele) { ele.show(); });
|
||||||
|
$$('.budget-fixed').each(function(ele) { ele.hide(); });
|
||||||
|
}
|
||||||
|
|
||||||
|
Budget.updateAmounts();
|
||||||
|
},
|
||||||
|
// Rails-like number_to_currency currency formatting
|
||||||
|
// http://snippets.dzone.com/posts/show/4646
|
||||||
|
number_to_currency: function (number, options) {
|
||||||
|
try {
|
||||||
|
var options = options || {};
|
||||||
|
var precision = options["precision"] || 2;
|
||||||
|
var unit = options["unit"] || "<%= number_to_currency(0, :precision => 0).gsub('0', '') %>";
|
||||||
|
var separator = precision > 0 ? options["separator"] || "." : "";
|
||||||
|
var delimiter = options["delimiter"] || " ";
|
||||||
|
|
||||||
|
var parts = parseFloat(number).toFixed(precision).split('.');
|
||||||
|
|
||||||
|
<% if I18n.locale != :en %>
|
||||||
|
<%= "return Budget.number_with_delimiter(parts[0], delimiter) + separator + parts[1].toString() + unit;" %>
|
||||||
|
<% else %>
|
||||||
|
<%= "return unit + Budget.number_with_delimiter(parts[0], delimiter) + separator + parts[1].toString();" %>
|
||||||
|
<% end %>
|
||||||
|
} catch(e) {
|
||||||
|
return number;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
number_with_delimiter: function (number, delimiter, separator) {
|
||||||
|
try {
|
||||||
|
var delimiter = delimiter || ",";
|
||||||
|
var separator = separator || ".";
|
||||||
|
|
||||||
|
var parts = number.toString().split('.');
|
||||||
|
parts[0] = parts[0].replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1" + delimiter);
|
||||||
|
return parts.join(separator);
|
||||||
|
} catch(e) {
|
||||||
|
return number
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
Budget = new BudgetModule();
|
||||||
|
|
||||||
|
function toggleAll() {
|
||||||
|
$$('.deliverable-details').each(function(ele) {
|
||||||
|
ele.toggle();
|
||||||
|
});
|
||||||
|
$$('.toggle').each(function(e) {
|
||||||
|
e.toggle();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function expandRow(deliverable_id) {
|
||||||
|
$('deliverable-details-'+ deliverable_id).show();
|
||||||
|
$('deliverable-description-'+ deliverable_id).show();
|
||||||
|
$$('.toggle_' + deliverable_id).each(function(e) {
|
||||||
|
e.toggle();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function collapseRow(deliverable_id) {
|
||||||
|
$('deliverable-details-'+ deliverable_id).hide();
|
||||||
|
$('deliverable-description-'+ deliverable_id).hide();
|
||||||
|
$$('.toggle_' + deliverable_id).each(function(e) {
|
||||||
|
e.toggle();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -3,10 +3,6 @@ var BudgetModule = Class.create();
|
|||||||
Object.extend(BudgetModule.prototype, {
|
Object.extend(BudgetModule.prototype, {
|
||||||
initialize: function () {},
|
initialize: function () {},
|
||||||
|
|
||||||
// number to currency options
|
|
||||||
// var options = new Hash();
|
|
||||||
// options.set('delimiter', ' ');
|
|
||||||
//// options.set('unit', ' ');
|
|
||||||
toAmount: function(value) {
|
toAmount: function(value) {
|
||||||
var amount = value.replace(/[^1234567890.]/ig,'');
|
var amount = value.replace(/[^1234567890.]/ig,'');
|
||||||
if (amount) {
|
if (amount) {
|
||||||
|
|||||||
Reference in New Issue
Block a user