diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index cd712c46ee..0cba900920 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -67,7 +67,7 @@ class Helper { $colors = [ "#008941", - "#FF4A46", + "#FF851B", "#006FA6", "#A30059", "#1CE6FF", diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php index 774fb70014..464ac5d77a 100644 --- a/app/Http/Controllers/Api/StatuslabelsController.php +++ b/app/Http/Controllers/Api/StatuslabelsController.php @@ -176,7 +176,6 @@ class StatuslabelsController extends Controller foreach ($statuslabels as $statuslabel) { if ($statuslabel->assets_count > 0) { - $labels[]=$statuslabel->name. ' ('.number_format($statuslabel->assets_count).')'; $points[]=$statuslabel->assets_count; @@ -184,8 +183,8 @@ class StatuslabelsController extends Controller $colors_array[] = $statuslabel->color; } else { $colors_array[] = Helper::defaultChartColors($default_color_count); - $default_color_count++; } + $default_color_count++; } } diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 7138ecf804..04f5d4cd74 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -595,11 +595,23 @@ } } + function cleanFloat(number) { + if ("{{$snipeSettings->digit_separator}}" == "1.234,56") { + // yank periods, change commas to periods + periodless = number.toString().replace("\.",""); + decimalfixed = periodless.replace(",","."); + } else { + // yank commas, that's it. + decimalfixed = number.toString().replace(",",""); + } + return parseFloat(decimalfixed); + } + function sumFormatter(data) { if (Array.isArray(data)) { var field = this.field; var total_sum = data.reduce(function(sum, row) { - return (sum) + (parseFloat(row[field]) || 0); + return (sum) + (cleanFloat(row[field]) || 0); }, 0); return numberWithCommas(total_sum.toFixed(2)); }