Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add totals to tasks report

Browse Source
This commit is contained in:
Hillel Coren 2017-05-23 22:35:26 +03:00
parent 6c9a484aa8
commit d7373a133b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/views/reports/chart_builder.blade.php
View File

@ -261,7 +261,7 @@
var sumColumns = []; var sumColumns = [];
@foreach ($columns as $column) @foreach ($columns as $column)
sumColumns.push("{{ in_array($column, ['amount', 'paid', 'balance', 'cost']) ? trans("texts.{$column}") : false }}"); sumColumns.push("{{ in_array($column, ['amount', 'paid', 'balance', 'cost', 'duration']) ? trans("texts.{$column}") : false }}");
@endforeach @endforeach
$(function() { $(function() {
@ -292,11 +292,14 @@
// parse 1,000.00 or 1.000,00 // parse 1,000.00 or 1.000,00
function convertStringToNumber(str) { function convertStringToNumber(str) {
str = str + '' || ''; str = str + '' || '';
var number = Number(str.replace(/[^0-9]+/g, '')); if (str.indexOf(':')) {
return number / 100; return roundToTwo(moment.duration(str).asHours());
} else {
var number = Number(str.replace(/[^0-9]+/g, ''));
return number / 100;
}
} }
$(function(){ $(function(){
$(".tablesorter-data").tablesorter({ $(".tablesorter-data").tablesorter({
@if (! request()->group_when_sorted) @if (! request()->group_when_sorted)