Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1390

Přidáno uživatelem Ondřej Fibich před asi 12 roky(ů)

Oprava #178 (U pracovnich vykazu se nepocitaji kilometry)

Zobrazit rozdíly:

freenetis/branches/testing/application/views/js/__pieces/work_report_form_functions.php
currency = ' <?php echo __(Settings::get('currency')) ?>';
/**
* Gets value from string reprezentation of price
* @param price Price to get value of
* @example 100 000,78 => 100000.78
*/
function get_value_of_price_str(price)
{
if (!price || !price.length)
{
return 0;
}
var price_replaced = price.replace(/ /g, '');
return parseFloat(price_replaced.replace(/,/g, '.'));
}
/**
* Adds actions for work form
*/
function add_actions()
......
else
{
$(this).removeClass('error');
hours_count = hours_count + parseFloat(val);
hours_count = hours_count + get_value_of_price_str(val);
}
});
......
$('#total_hours_price').text(number_format(price, 2, ',', ' ') + currency);
price = price + parseFloat($('#total_km_price').text());
price = price + get_value_of_price_str($('#total_km_price').text());
$('#total_price').text(number_format(price, 2, ',', ' ') + currency);
}
......
else
{
$(this).removeClass('error');
km_count = km_count + parseFloat($(this).val());
km_count = km_count + get_value_of_price_str($(this).val());
}
});
......
{
$('#price_per_km').removeClass('error');
}
var price = ppkm * km_count;
$('#total_km_price').text(number_format(price, 2, ',', ' ') + currency);
price = price + parseFloat($('#total_hours_price').text());
price = price + get_value_of_price_str($('#total_hours_price').text());
price = Math.round(price * 100) / 100;
$('#total_price').text(number_format(price, 2, ',', ' ') + currency);
......
}
else
{
var value = parseFloat($(this).val());
var value = get_value_of_price_str($(this).val());
if (value <= 0.0 || value > 24.0)
{

Také k dispozici: Unified diff