From d7373a133bd8529bddf935685b95e4470d9a5f85 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 23 May 2017 22:35:26 +0300 Subject: [PATCH] Add totals to tasks report --- resources/views/reports/chart_builder.blade.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/resources/views/reports/chart_builder.blade.php b/resources/views/reports/chart_builder.blade.php index e1597623c028..175a7094498c 100644 --- a/resources/views/reports/chart_builder.blade.php +++ b/resources/views/reports/chart_builder.blade.php @@ -261,7 +261,7 @@ var sumColumns = []; @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 $(function() { @@ -292,11 +292,14 @@ // parse 1,000.00 or 1.000,00 function convertStringToNumber(str) { str = str + '' || ''; - var number = Number(str.replace(/[^0-9]+/g, '')); - return number / 100; + if (str.indexOf(':')) { + return roundToTwo(moment.duration(str).asHours()); + } else { + var number = Number(str.replace(/[^0-9]+/g, '')); + return number / 100; + } } - $(function(){ $(".tablesorter-data").tablesorter({ @if (! request()->group_when_sorted)