diff options
author | Udo Walter | 2016-12-22 15:08:36 +0100 |
---|---|---|
committer | Udo Walter | 2016-12-22 15:08:36 +0100 |
commit | 3a2dae96362b1187ae4b9d89904d23b6a7da87cb (patch) | |
tree | ef8ea07857893e7c21b2d6f1dba7f337432847db /modules-available/statistics_reporting | |
parent | [statistics_reporting] improved short session queries (bugfix) (diff) | |
download | slx-admin-3a2dae96362b1187ae4b9d89904d23b6a7da87cb.tar.gz slx-admin-3a2dae96362b1187ae4b9d89904d23b6a7da87cb.tar.xz slx-admin-3a2dae96362b1187ae4b9d89904d23b6a7da87cb.zip |
[statistics_reporting] added short sessions to ui
Diffstat (limited to 'modules-available/statistics_reporting')
5 files changed, 27 insertions, 18 deletions
diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json index c5494205..68b68250 100644 --- a/modules-available/statistics_reporting/lang/de/template-tags.json +++ b/modules-available/statistics_reporting/lang/de/template-tags.json @@ -3,7 +3,8 @@ "lang_countLogins": "Anzahl Logins", "lang_client": "Client", "lang_vm": "VM", - "lang_totalLogins": "Gesamt Logins", + "lang_sessions": "Sitzungen \u2265 60s", + "lang_shortSessions": "Sitzungen < 60s", "lang_overallOfftime": "Insgesamte Zeit Offline", "lang_totalOffTime": "Gesamtzeit Offline", "lang_clientLogout": "Letzter VM Logout", diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json index de91621f..b9e0c61d 100644 --- a/modules-available/statistics_reporting/lang/en/template-tags.json +++ b/modules-available/statistics_reporting/lang/en/template-tags.json @@ -3,7 +3,8 @@ "lang_countLogins": "Number of Logins", "lang_client": "Client", "lang_vm": "VM", - "lang_totalLogins": "Total Logins", + "lang_sessions": "Sessions \u2265 60s", + "lang_shortSessions": "Sessions < 60s", "lang_overallOfftime": "Overall time offline", "lang_totalOffTime": "Total Time Offline", "lang_clientLogout": "Last VM Logout", diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php index de13cdb3..f0f56e87 100644 --- a/modules-available/statistics_reporting/page.inc.php +++ b/modules-available/statistics_reporting/page.inc.php @@ -35,7 +35,7 @@ class Page_Statistics_Reporting extends Page // total time online, average time online, total number of logins $res = StatisticReporting::getOverallStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound); $row = $res->fetch(PDO::FETCH_NUM); - $data = array('time' => StatisticReporting::formatSeconds($row[0]), 'medianTime' => StatisticReporting::formatSeconds(StatisticReporting::calcMedian($row[1])), 'totalLogins' => $row[2], 'shortSessions' => $row[3]); + $data = array('time' => StatisticReporting::formatSeconds($row[0]), 'medianTime' => StatisticReporting::formatSeconds(StatisticReporting::calcMedian($row[1])), 'sessions' => $row[2], 'shortSessions' => $row[3]); //total time offline $res = StatisticReporting::getTotalOfflineStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound); @@ -48,7 +48,7 @@ class Page_Statistics_Reporting extends Page while ($row = $res->fetch(PDO::FETCH_NUM)) { $median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2])); $data['perLocation'][] = array('location' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1], - 'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4], 'shortSessions' => $row[5]); + 'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'sessions' => $row[4], 'shortSessions' => $row[5]); } // per client @@ -57,7 +57,7 @@ class Page_Statistics_Reporting extends Page while ($row = $res->fetch(PDO::FETCH_NUM)) { $median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2])); $data['perClient'][] = array('hostname' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1], - 'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4], + 'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'sessions' => $row[4], 'lastLogout' => date(DATE_RSS,$row[5]), 'lastLogoutUnixtime' => $row[5], 'lastStart' => date(DATE_RSS,$row[6]), 'lastStartUnixtime' => $row[6], 'shortSessions' => $row[7]); } @@ -65,14 +65,14 @@ class Page_Statistics_Reporting extends Page $res = StatisticReporting::getUserStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound); $data[] = array('perUser' => array()); while ($row = $res->fetch(PDO::FETCH_NUM)) { - $data['perUser'][] = array('user' => $row[0], 'loginCount' => $row[1]); + $data['perUser'][] = array('user' => $row[0], 'sessions' => $row[1]); } // per vm $res = StatisticReporting::getVMStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound); $data[] = array('perVM' => array()); while ($row = $res->fetch(PDO::FETCH_NUM)) { - $data['perVM'][] = array('vm' => $row[0], 'loginCount' => $row[1]); + $data['perVM'][] = array('vm' => $row[0], 'sessions' => $row[1]); } Render::addTemplate('columnChooser'); diff --git a/modules-available/statistics_reporting/templates/_page.html b/modules-available/statistics_reporting/templates/_page.html index 7cfb424c..d2aaecde 100644 --- a/modules-available/statistics_reporting/templates/_page.html +++ b/modules-available/statistics_reporting/templates/_page.html @@ -7,7 +7,8 @@ <th class="text-left col-md-2"></th> <th class="text-left column-totaltime">{{lang_totalTime}}</th> <th class="text-left column-mediantime">{{lang_medianSessionLength}}</th> - <th class="text-left column-logincount">{{lang_totalLogins}}</th> + <th class="text-left column-sessions">{{lang_sessions}}</th> + <th class="text-left column-shortsessions">{{lang_shortSessions}}</th> <th class="text-left column-timeoffline">{{lang_overallOfftime}}</th> </tr> </thead> @@ -16,7 +17,8 @@ <th class="text-left">{{lang_total}}</th> <td class="text-left column-totaltime">{{time}}</td> <td class="text-left column-mediantime">{{medianTime}}</td> - <td class="text-left column-logincount">{{totalLogins}}</td> + <td class="text-left column-sessions">{{sessions}}</td> + <td class="text-left column-shortsessions">{{shortSessions}}</td> <td class="text-left column-timeoffline">{{totalOfftime}}</td> </tr> </tbody> @@ -31,7 +33,8 @@ <th data-sort="string" class="text-left col-md-2">{{lang_location}}</th> <th data-sort="int" data-sort-default="desc" class="text-left column-totaltime">{{lang_totalTime}}</th> <th data-sort="int" data-sort-default="desc" class="text-left column-mediantime">{{lang_medianSessionLength}}</th> - <th data-sort="int" data-sort-default="desc" class="text-left column-logincount">{{lang_totalLogins}}</th> + <th data-sort="int" data-sort-default="desc" class="text-left column-sessions">{{lang_sessions}}</th> + <th data-sort="int" data-sort-default="desc" class="text-left column-shortsessions">{{lang_shortSessions}}</th> <th data-sort="int" data-sort-default="desc" class="text-left column-timeoffline">{{lang_totalOffTime}}</th> </tr> </thead> @@ -41,7 +44,8 @@ <td class="text-left">{{location}}</td> <td data-sort-value="{{timeInSeconds}}" class="text-left column-totaltime">{{time}}</td> <td data-sort-value="{{medianTimeInSeconds}}" class="text-left column-mediantime">{{medianTime}}</td> - <td class="text-left column-logincount">{{loginCount}}</td> + <td class="text-left column-sessions">{{sessions}}</td> + <td class="text-left column-shortsessions">{{shortSessions}}</td> <td data-sort-value="{{offlineTimeInSeconds}}" class="text-left column-timeoffline">{{offTime}}</td> </tr> {{/perLocation}} @@ -57,7 +61,8 @@ <th data-sort="string" class="text-left col-md-4">{{lang_hostname}}</th> <th data-sort="int" data-sort-default="desc" class="text-left column-totaltime">{{lang_totalTime}}</th> <th data-sort="int" data-sort-default="desc" class="text-left column-mediantime">{{lang_medianSessionLength}}</th> - <th data-sort="int" data-sort-default="desc" class="text-left column-logincount">{{lang_totalLogins}}</th> + <th data-sort="int" data-sort-default="desc" class="text-left column-sessions">{{lang_sessions}}</th> + <th data-sort="int" data-sort-default="desc" class="text-left column-shortsessions">{{lang_shortSessions}}</th> <th data-sort="int" data-sort-default="desc" class="text-left column-timeoffline">{{lang_totalOffTime}}</th> <th data-sort="int" data-sort-default="desc" class="text-left column-lastlogout">{{lang_clientLogout}}</th> <th data-sort="int" data-sort-default="desc" class="text-left column-laststart">{{lang_clientStart}}</th> @@ -69,7 +74,8 @@ <td class="text-left">{{hostname}}</td> <td data-sort-value="{{timeInSeconds}}" class="text-left column-totaltime">{{time}}</td> <td data-sort-value="{{medianTimeInSeconds}}" class="text-left column-mediantime">{{medianTime}}</td> - <td class="text-left column-logincount">{{loginCount}}</td> + <td class="text-left column-sessions">{{sessions}}</td> + <td class="text-left column-shortsessions">{{shortSessions}}</td> <td data-sort-value="{{offlineTimeInSeconds}}" class="text-left column-timeoffline">{{offTime}}</td> <td data-sort-value="{{lastLogoutUnixtime}}" class="text-left column-lastlogout">{{lastLogout}}</td> <td data-sort-value="{{lastStartUnixtime}}" class="text-left column-laststart">{{lastStart}}</td> @@ -85,14 +91,14 @@ <thead> <tr> <th data-sort="string" class="text-left col-md-4">{{lang_user}}</th> - <th data-sort="int" data-sort-default="desc" class="text-left column-logincount">{{lang_totalLogins}}</th> + <th data-sort="int" data-sort-default="desc" class="text-left column-sessions">{{lang_sessions}}</th> </tr> </thead> <tbody> {{#perUser}} <tr> <td class="text-left">{{user}}</td> - <td class="text-left column-logincount">{{loginCount}}</td> + <td class="text-left column-sessions">{{sessions}}</td> </tr> {{/perUser}} </tbody> @@ -105,14 +111,14 @@ <thead> <tr> <th data-sort="string" class="text-left col-md-4">{{lang_vm}}</th> - <th data-sort="int" data-sort-default="desc" class="text-left column-logincount">{{lang_totalLogins}}</th> + <th data-sort="int" data-sort-default="desc" class="text-left column-sessions">{{lang_sessions}}</th> </tr> </thead> <tbody> {{#perVM}} <tr> <td class="text-left">{{vm}}</td> - <td class="text-left column-logincount">{{loginCount}}</td> + <td class="text-left column-sessions">{{sessions}}</td> </tr> {{/perVM}} </tbody> diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html index d79f542b..49c9a75d 100644 --- a/modules-available/statistics_reporting/templates/columnChooser.html +++ b/modules-available/statistics_reporting/templates/columnChooser.html @@ -26,7 +26,8 @@ <div class="col-md-12 buttonbar"> <button id="button-totaltime" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('totaltime')">{{lang_totalTime}}</button> <button id="button-mediantime" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('mediantime')">{{lang_medianSessionLength}}</button> - <button id="button-logincount" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('logincount')">{{lang_totalLogins}}</button> + <button id="button-sessions" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('sessions')">{{lang_sessions}}</button> + <button id="button-shortsessions" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('shortsessions')">{{lang_shortSessions}}</button> <button id="button-timeoffline" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('timeoffline')">{{lang_totalOffTime}}</button> <button id="button-lastlogout" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('lastlogout')">{{lang_clientLogout}}</button> <button id="button-laststart" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('laststart')">{{lang_clientStart}}</button> |