From 93d87274ef17f2c23c91eb04f408b3b33c1852b7 Mon Sep 17 00:00:00 2001
From: TimZ99 <TimZ99@users.noreply.github.com>
Date: Sun, 17 May 2020 23:16:59 +0200
Subject: [PATCH] Display time in ms instead of seconds

Only the template is effected, no db changes.
---
 src/psm/Module/Server/Controller/AbstractServerController.php | 2 +-
 src/templates/default/module/server/server/list.tpl.html      | 4 ++--
 src/templates/default/module/server/server/view.tpl.html      | 2 +-
 src/templates/default/module/server/status/index.tpl.html     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/psm/Module/Server/Controller/AbstractServerController.php b/src/psm/Module/Server/Controller/AbstractServerController.php
index befad354..26ed2c9d 100644
--- a/src/psm/Module/Server/Controller/AbstractServerController.php
+++ b/src/psm/Module/Server/Controller/AbstractServerController.php
@@ -114,7 +114,7 @@ abstract class AbstractServerController extends AbstractController
      */
     protected function formatServer($server)
     {
-        $server['rtime'] = round((float) $server['rtime'], 4);
+        $server['rtime'] = $server['rtime'];
         $server['last_online'] = psm_timespan($server['last_online']);
         $server['last_offline'] = psm_timespan($server['last_offline']);
         if ($server['last_offline'] != psm_get_lang('system', 'never')) {
diff --git a/src/templates/default/module/server/server/list.tpl.html b/src/templates/default/module/server/server/list.tpl.html
index 110c1261..8fd94464 100644
--- a/src/templates/default/module/server/server/list.tpl.html
+++ b/src/templates/default/module/server/server/list.tpl.html
@@ -9,7 +9,7 @@
                 <th scope="col">{{ label_domain }}</th>
                 <th scope="col" style="width: 5%;">{{ label_port }}</th>
                 <th scope="col" style="width: 8%;">{{ label_type }}</th>
-                <th scope="col" style="width: 8%;">{{ label_rtime }}</th>
+                <th scope="col" style="width: 8%;">{{ label_rtime }} (ms)</th>
                 <th scope="col" style="width: 10%;">{{ label_last_online }}</th>
                 <th scope="col" style="width: 10%;">{{ label_last_offline }}</th>
                 <th scope="col" style="width: 10%;">{{ label_monitoring }}</th>
@@ -41,7 +41,7 @@
 				<td><div class="content">{{ server.ip|raw }}</div></td>
 				<td>{{ server.port }}</td>
 				<td>{{ server.type }}</td>
-				<td>{{ server.rtime }}</td>
+				<td>{{ (server.rtime * 1000)|round(2) }}</td>
 				<td><div class="content">{{ server.last_online }}</div></td>
 				<td><div class="content">{{ server.last_offline }}</div></td>
 				<td>
diff --git a/src/templates/default/module/server/server/view.tpl.html b/src/templates/default/module/server/server/view.tpl.html
index 20218480..d92a2156 100644
--- a/src/templates/default/module/server/server/view.tpl.html
+++ b/src/templates/default/module/server/server/view.tpl.html
@@ -51,7 +51,7 @@
 				<li class="list-group-item">
 					<dl class="row">
 						<dt class="col-md-4">{{ label_rtime }}:</dt>
-						<dd class="col-md-8">{{ rtime }} {{ label_seconds }}</dd>
+						<dd class="col-md-8">{{ rtime * 1000 }} {{ label_seconds }}</dd>
 					</dl>
 				</li>
 			</ul>
diff --git a/src/templates/default/module/server/status/index.tpl.html b/src/templates/default/module/server/status/index.tpl.html
index 7a564127..77a98877 100644
--- a/src/templates/default/module/server/status/index.tpl.html
+++ b/src/templates/default/module/server/status/index.tpl.html
@@ -37,7 +37,7 @@
 						<p class="card-text">
 							{{ label_last_online }}: {{ server.last_online_nice }}<br>
 							{{ label_last_offline }}: {{ server.last_offline_nice }} {{ server.last_offline_duration_nice }}<br>
-							{{ label_rtime }}: {{ server.rtime }}
+							{{ label_rtime }}: {{ (server.rtime * 1000)|round(2) }} ms
 						</p>
 					</div>
 				</div>
@@ -97,7 +97,7 @@
 							<th class="full"><a href="{{ server.url_view|raw }}" class="text-white">{{ server.label }}<span class="sr-only"> ({{ label_online }})</span></a></th>
 							<td>{{ server.last_online_nice }}</td>
 							<td>{{ server.last_offline_nice }} {{ server.last_offline_duration_nice }}</td>
-							<td>{{ server.rtime }}s</td>
+							<td>{{ (server.rtime * 1000)|round(2) }} ms</td>
 						</tr>
 					{% endfor %}
 				</tbody>