[#1919] Moved the JavaScript for calculating the Budget to an assets file.

app/views/deliverables/_form.html.erb

@@ -109,120 +109,3 @@
 
 <div id="preview" class="wiki"></div>
 </fieldset>
-<% content_for :header_tags do %>
-<script type="text/javascript">
-
-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"] || "$";
-            var separator = precision > 0 ? options["separator"] || "." : "";
-            var delimiter = options["delimiter"] || ",";
-            
-            var parts = parseFloat(number).toFixed(precision).split('.');
-            return unit + Budget.number_with_delimiter(parts[0], delimiter) + separator + parts[1].toString();
-        } 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();
-
-
-</script>
-<% end %>

app/views/deliverables/edit.html.erb

@@ -8,4 +8,5 @@
 
 <% content_for :header_tags do %>
   <%= stylesheet_link_tag "budget.css", :plugin => "budget_plugin", :media => "screen" %>
+  <%= javascript_include_tag('budget', :plugin => 'budget_plugin') %>
 <% end %>

app/views/deliverables/index.html.erb

@@ -28,4 +28,5 @@
 
 <% content_for :header_tags do %>
   <%= stylesheet_link_tag "budget.css", :plugin => "budget_plugin", :media => "screen" %>
+  <%= javascript_include_tag('budget', :plugin => 'budget_plugin') %>
 <% end %>

assets/javascripts/budget.js

@@ -0,0 +1,110 @@
+/* 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"] || "$";
+            var separator = precision > 0 ? options["separator"] || "." : "";
+            var delimiter = options["delimiter"] || ",";
+
+            var parts = parseFloat(number).toFixed(precision).split('.');
+            return unit + Budget.number_with_delimiter(parts[0], delimiter) + separator + parts[1].toString();
+        } 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();
+