diff options
| author | Steffen Ritter | 2018-06-06 16:09:22 +0200 |
|---|---|---|
| committer | Steffen Ritter | 2018-06-06 16:09:22 +0200 |
| commit | 09bfa9c947298ed810b91baeb27e9fae7ea091c7 (patch) | |
| tree | bb957fd351205ab433b0600138d64bea1f358601 | |
| parent | [exams] Fix warning msg when checking timeranges (sec vs ms) (diff) | |
| download | slx-admin-09bfa9c947298ed810b91baeb27e9fae7ea091c7.tar.gz slx-admin-09bfa9c947298ed810b91baeb27e9fae7ea091c7.tar.xz slx-admin-09bfa9c947298ed810b91baeb27e9fae7ea091c7.zip | |
[statistics] Add location column in clientlist
| -rw-r--r-- | modules-available/statistics/page.inc.php | 1 | ||||
| -rw-r--r-- | modules-available/statistics/templates/clientlist.html | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php index b4d3a42d..abacc8d2 100644 --- a/modules-available/statistics/page.inc.php +++ b/modules-available/statistics/page.inc.php @@ -679,6 +679,7 @@ class Page_Statistics extends Page $row['modeName'] = $data['modeName']; } } + $row['locationname'] = Location::getName($row['locationid']); $rows[] = $row; } if ($singleMachine !== false && $singleMachine !== 'none') { diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html index b81515ab..18a5d10a 100644 --- a/modules-available/statistics/templates/clientlist.html +++ b/modules-available/statistics/templates/clientlist.html @@ -34,6 +34,11 @@ <span class="glyphicon glyphicon-filter"></span> </button> </td> + <td> + <button type="button" class="btn btn-default btn-xs" onclick="popupFilter('location')"> + <span class="glyphicon glyphicon-filter"></span> + </button> + </td> </tr> <tr> <th data-sort="string">{{lang_machine}}</th> @@ -43,6 +48,7 @@ <th data-sort="int" class="text-right">{{lang_gbRam}}</th> <th data-sort="int" class="text-right">{{lang_tmpGb}}</th> <th data-sort="int">{{lang_cpuModel}}</th> + <th data-sort="string">{{lang_location}}</th> </tr> </thead> <tbody> @@ -97,6 +103,7 @@ </div>{{/nohdd}} </td> <td data-sort-value="{{realcores}}">{{lang_realCores}}: {{realcores}}<div class="small">{{cpumodel}}</div></td> + <td data-sort-value="{{locationname}}">{{locationname}}</td> </tr> {{/rows}} </tbody> |