DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 14:09:43 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge pull request #9953 from uberbrady/fix_bootstrap_sum_formatter

Browse source 
Fixed ch17133 - Fixed sum total calculation on Bootstrap Table pages -
This commit is contained in:
snipe 2021-08-18 14:31:10 -07:00 committed by GitHub
parent 6f7718dd0e 4519f6e180
commit f5112b47cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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) { function sumFormatter(data) {
if (Array.isArray(data)) { if (Array.isArray(data)) {
var field = this.field; var field = this.field;
var total_sum = data.reduce(function(sum, row) { var total_sum = data.reduce(function(sum, row) {
return (sum) + (parseFloat(row[field]) || 0); return (sum) + (cleanFloat(row[field]) || 0);
}, 0); }, 0);
return numberWithCommas(total_sum.toFixed(2)); return numberWithCommas(total_sum.toFixed(2));
} }