Skip to content

Commit 7026a80

Browse files
committed
Merge branch 'master' of github.com:mtierltd/time
2 parents 022e24c + c4adb37 commit 7026a80

File tree

9 files changed

+22
-5174
lines changed

9 files changed

+22
-5174
lines changed

css/fonts/open-iconic.svg

Lines changed: 1 addition & 543 deletions
Loading

img/app.svg

Lines changed: 1 addition & 56 deletions
Loading

img/play-button.svg

Lines changed: 1 addition & 41 deletions
Loading

img/stop-button.svg

Lines changed: 1 addition & 39 deletions
Loading

js/reports.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,20 @@
181181

182182
return h + ':' + m + ':' + s;
183183

184-
},}, //column will be allocated 1/5 of the remaining space
184+
},bottomCalc:"sum", bottomCalcParams:{
185+
precision:1,
186+
},bottomCalcFormatter:function(cell, formatterParams, onRendered){
187+
//cell - the cell component
188+
//formatterParams - parameters set for the column
189+
//onRendered - function to call when the formatter has been rendered
190+
var duration = cell.getValue();
191+
var s = Math.floor( (duration) % 60 );
192+
var m = Math.floor( (duration/60) % 60 );
193+
var h = Math.floor( (duration/(60*60)));
194+
195+
return h + ':' + m + ':' + s;
196+
197+
}}, //column will be allocated 1/5 of the remaining space
185198
],
186199
ajaxResponse:function(url, params, response){
187200

@@ -201,4 +214,4 @@
201214

202215

203216
} );
204-
}());
217+
}());

templates/index.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
script('timetracker', "daterangepicker.min");
55
script('timetracker', "tabulator");
66
script('timetracker', "Chart.min");
7-
script('timetracker', "jspdf.min");
8-
script('timetracker', "jspdf.plugin.autotable.min");
97
//script('timetracker', "select2");
108
style('timetracker', "kingtable");
119
style('timetracker', "daterangepicker");

0 commit comments

Comments
 (0)