diff options
author | Simon Rettberg | 2018-01-04 18:34:28 +0100 |
---|---|---|
committer | Simon Rettberg | 2018-01-04 18:34:28 +0100 |
commit | 406cd79ff35ab1dd3ba796207f2ea471e87f17d5 (patch) | |
tree | e3efb7c338aee52126ccd16061872645c5e6cc43 /modules-available/statistics_reporting/templates/table-total.html | |
parent | [inc/Database] Add profiling info (timing, query count) (diff) | |
download | slx-admin-406cd79ff35ab1dd3ba796207f2ea471e87f17d5.tar.gz slx-admin-406cd79ff35ab1dd3ba796207f2ea471e87f17d5.tar.xz slx-admin-406cd79ff35ab1dd3ba796207f2ea471e87f17d5.zip |
[statistics_reporting] Query rewrite: Use iterative approach
Several simple test cases yielded incorrect results, also
sessions partially overlapping with the selected hours
were not handled properly. Iterative processing of logged events
instead of single humongous unmaintainable SQL query.
Diffstat (limited to 'modules-available/statistics_reporting/templates/table-total.html')
-rw-r--r-- | modules-available/statistics_reporting/templates/table-total.html | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/modules-available/statistics_reporting/templates/table-total.html b/modules-available/statistics_reporting/templates/table-total.html index 8d5d7571..83078714 100644 --- a/modules-available/statistics_reporting/templates/table-total.html +++ b/modules-available/statistics_reporting/templates/table-total.html @@ -1,22 +1,36 @@ -<table id="table-total" class="table table-condensed table-striped stupidtable"> +<table id="table-total" class="table table-condensed table-striped table-nowrap stupidtable"> <thead> <tr> - <th class="text-left col-md-2"></th> - <th class="text-left col_totalTime">{{lang_totalTime}}</th> - <th class="text-left col_medianSessionLength">{{lang_medianSessionLength}}</th> - <th class="text-left col_longSessions">{{lang_longSessions}}</th> - <th class="text-left col_shortSessions">{{lang_shortSessions}}</th> - <th class="text-left col_totalOffTime">{{lang_totalOffTime}}</th> + <th></th> + <th class="col_totalTime">{{lang_totalTime}}</th> + <th class="col_medianSessionLength">{{lang_medianSessionLength}}</th> + <th class="col_longSessions">{{lang_longSessions}}</th> + <th class="col_shortSessions">{{lang_shortSessions}}</th> + <th class="col_totalOffTime">{{lang_totalOffTime}}</th> + <th class="col_totalOffTime">(%)</th> + <th class="col_totalStandbyTime">{{lang_totalStandbyTime}}</th> + <th class="col_totalStandbyTime">(%)</th> + <th class="col_totalSessionTime">{{lang_totalSessionTime}}</th> + <th class="col_totalSessionTime">(%)</th> + <th class="col_totalIdleTime">{{lang_totalIdleTime}}</th> + <th class="col_totalIdleTime">(%)</th> </tr> </thead> <tbody> <tr> - <th class="text-left">{{lang_total}}</th> - <td class="text-left col_totalTime">{{data.totalTime_s}}</td> - <td class="text-left col_medianSessionLength">{{data.medianSessionLength_s}}</td> - <td class="text-left col_longSessions">{{data.longSessions}}</td> - <td class="text-left col_shortSessions">{{data.shortSessions}}</td> - <td class="text-left col_totalOffTime">{{data.totalOffTime_s}}</td> + <td>{{lang_total}}</td> + <td class="col_totalTime">{{data.totalTime_s}}</td> + <td class="col_medianSessionLength">{{data.medianSessionLength_s}}</td> + <td class="col_longSessions">{{data.longSessions}}</td> + <td class="col_shortSessions">{{data.shortSessions}}</td> + <td class="text-right col_totalOffTime">{{data.totalOffTime_s}}</td> + <td class="col_totalOffTime p-addon">{{data.totalOffTime_p}} %</td> + <td class="text-right col_totalStandbyTime">{{data.totalStandbyTime_s}}</td> + <td class="col_totalStandbyTime p-addon">{{data.totalStandbyTime_p}} %</td> + <td class="text-right col_totalSessionTime">{{data.totalSessionTime_s}}</td> + <td class="col_totalSessionTime p-addon">{{data.totalSessionTime_p}} %</td> + <td class="text-right col_totalIdleTime">{{data.totalIdleTime_s}}</td> + <td class="col_totalIdleTime p-addon">{{data.totalIdleTime_p}} %</td> </tr> </tbody> </table> |