DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2021-08-18 14:31:38 -07:00
parent b88fde5dae f5112b47cd
commit 7b447a2f16
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Helpers/Helper.php
View file

@ -67,7 +67,7 @@ class Helper
{
$colors = [
"#008941",
"#FF4A46",
"#FF851B",
"#006FA6",
"#A30059",
"#1CE6FF",

3
app/Http/Controllers/Api/StatuslabelsController.php
View file

@ -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++;
}
}

14
resources/views/partials/bootstrap-table.blade.php
View file

@ -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));
}