shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-11 05:17:41 +03:00
Code Releases Wiki Activity

development: fix rounding in template cost calculation

Browse Source
This commit is contained in:
Ruben S. Montero 2019-01-07 18:52:13 +01:00
parent 5afdaf4e74
commit 4d514a0abe
2 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
View File

@ -122,15 +122,6 @@ define(function(require) {
} }
return number.toFixed(6); return number.toFixed(6);
} }
function caculatedTotalMemory(context){
var memory_cost = document.getElementById('MEMORY_COST').value;
var type = document.getElementById('MEMORY_UNIT_COST').value;
var real_memory = document.getElementById('MEMORY').value;
memory = memory_cost * real_memory * 24 * 30; //24 hours and 30 days
document.getElementById('total_value_memory').textContent = convertCostNumber(memory);
if (memory_cost != "")
$(".total_memory_cost", context).show();
}
function _setup(context) { function _setup(context) {
var that = this; var that = this;
@ -145,21 +136,15 @@ define(function(require) {
}); });
context.on("change", "#MEMORY_COST", function() { context.on("change", "#MEMORY_COST", function() {
caculatedTotalMemory(context);
CapacityCreate.calculatedRealMemory(context); CapacityCreate.calculatedRealMemory(context);
}); });
context.on("change", "#MEMORY_UNIT_COST", function() { context.on("change", "#MEMORY_UNIT_COST", function() {
caculatedTotalMemory(context); CapacityCreate.calculatedRealMemory(context);
CapacityCreate.calculatedRealMemory();
}); });
context.on("change", "#CPU_COST", function() { context.on("change", "#CPU_COST", function() {
var cpu = document.getElementById('CPU').value; CapacityCreate.calculatedRealCpu(context);
var cpu_cost = document.getElementById('CPU_COST').value;
document.getElementById('total_value_cpu').textContent = convertCostNumber(cpu * cpu_cost * 24 * 30);
$(".total_cpu_cost", context).show();
CapacityCreate.calculatedRealCpu();
}); });
context.on("change", "#DISK_COST", function() { context.on("change", "#DISK_COST", function() {

37
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js
View File

@ -106,47 +106,58 @@ define(function(require) {
} }
} }
function _calculatedRealMemory(){ function _calculatedRealMemory(context){
var memory_cost = $("#MEMORY_COST").val(); var memory_cost = $("#MEMORY_COST").val();
var type_cost = $("#MEMORY_UNIT_COST").val(); var type_cost = $("#MEMORY_UNIT_COST").val();
var memory = $("#MEMORY").val(); var memory = $("#MEMORY").val();
var type = $("#memory_unit").val(); var type = $("#memory_unit").val();
if (type_cost == "GB"){ if (type_cost == "GB"){
memory = (memory / 1024) * memory_cost * 24 * 30; memory = (memory / 1024) * memory_cost * 24 * 30;
} else { } else {
memory = memory * memory_cost * 24 * 30; memory = memory * memory_cost * 24 * 30;
} }
document.getElementById('real_memory_cost').textContent = "Cost: " + convertCostNumber(memory);
document.getElementById('real_memory_cost').value = memory; document.getElementById('real_memory_cost').value = memory;
document.getElementById('total_value_memory').textContent = memory; document.getElementById('total_value_memory').textContent = convertCostNumber(memory);
if (memory_cost != "")
$(".total_memory_cost", context).show();
_totalCost(); _totalCost();
} }
function _calculatedRealCpu(){ function _calculatedRealCpu(context){
var cpu_cost = $("#CPU_COST").val(); var cpu_cost = $("#CPU_COST").val();
var cpu = $("#CPU").val(); var cpu = $("#CPU").val();
cpu = cpu * cpu_cost * 24 * 30; cpu = cpu * cpu_cost * 24 * 30;
document.getElementById('real_cpu_cost').textContent = "Cost: " + convertCostNumber(cpu);
document.getElementById('real_cpu_cost').value = cpu; document.getElementById('real_cpu_cost').value = cpu;
document.getElementById('total_value_cpu').textContent = cpu; document.getElementById('total_value_cpu').textContent = convertCostNumber(cpu);
if (cpu_cost != "")
$(".total_cpu_cost", context).show();
_totalCost(); _totalCost();
} }
function _setup(context) { function _setup(context) {
context.on("change", "#MEMORY", function() { context.on("change", "#MEMORY", function() {
_calculatedRealMemory(); _calculatedRealMemory(context);
}); });
context.on("change", "#MEMORY_GB", function() { context.on("change", "#MEMORY_GB", function() {
_calculatedRealMemory(); _calculatedRealMemory(context);
}); });
context.on("change", "#memory_unit", function() { context.on("change", "#memory_unit", function() {
_calculatedRealMemory(); _calculatedRealMemory(context);
}); });
context.on("change", "#CPU", function() { context.on("change", "#CPU", function() {
_calculatedRealCpu(); _calculatedRealCpu(context);
}); });
// MB to GB // MB to GB