From 7421028e89720121da64a0543df8041a4d72ba38 Mon Sep 17 00:00:00 2001
From: Patric Stout <truebrain@openttd.org>
Date: Sat, 27 Jan 2024 12:18:10 +0100
Subject: [PATCH] Add: show "play time" in server-listing (#148)

---
 webclient/pages/servers.py            |  3 +++
 webclient/static/css/servers.css      |  5 ++++-
 webclient/templates/server_entry.html | 20 +++++++++++++-------
 webclient/templates/server_list.html  |  4 ++++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/webclient/pages/servers.py b/webclient/pages/servers.py
index 360d421..3ca9703 100644
--- a/webclient/pages/servers.py
+++ b/webclient/pages/servers.py
@@ -95,6 +95,9 @@ def _fix_server_info(server):
     server["info"]["start_date"] = _date_to_string(server["info"]["start_date"])
     server["info"]["game_date"] = _date_to_string(server["info"]["game_date"])
 
+    minutes = int(server["info"]["ticks_playing"] / 37 / 60)
+    server["info"]["time_playing"] = f"{minutes // 60}h {minutes % 60}m"
+
 
 def _split_version(raw_version):
     """
diff --git a/webclient/static/css/servers.css b/webclient/static/css/servers.css
index 9e36ba5..8fa3186 100644
--- a/webclient/static/css/servers.css
+++ b/webclient/static/css/servers.css
@@ -54,7 +54,7 @@
 	width: 15px;
 }
 #server-table .name {
-	width: 562px;
+	width: 492px;
 }
 #server-table .address {
 	width: 100px;
@@ -65,6 +65,9 @@
 #server-table .companies {
 	width: 70px;
 }
+#server-table .play-time {
+	width: 70px;
+}
 #server-table .version {
 	width: 120px;
 }
diff --git a/webclient/templates/server_entry.html b/webclient/templates/server_entry.html
index 8d8dafe..9c2b3d7 100644
--- a/webclient/templates/server_entry.html
+++ b/webclient/templates/server_entry.html
@@ -56,36 +56,42 @@ <h1>{% block title %}{{ server["info"]["name"] }} {% endblock %}</h1>
             </td>
         </tr>
         <tr class="even">
+            <th>Play time:</th>
+            <td>
+                {{ server["info"]["time_playing"] }}
+            </td>
+        </tr>
+        <tr class="odd">
             <th>Clients:</th>
             <td>
                 {{ server["info"]["clients_on"] }} / {{ server["info"]["clients_max"] }}
             </td>
         </tr>
-        <tr class="odd">
+        <tr class="even">
             <th>Companies:</th>
             <td>
                 {{ server["info"]["companies_on"] }} / {{ server["info"]["companies_max"] }}
             </td>
         </tr>
-        <tr class="even">
+        <tr class="odd">
             <th>Spectators:</th>
             <td>
                 {{ server["info"]["spectators_on"] }}
             </td>
         </tr>
-        <tr class="odd">
+        <tr class="even">
             <th>Landscape:</th>
             <td>
                 {{ mapsets[server["info"]["map_type"]] }}
             </td>
         </tr>
-        <tr class="even">
+        <tr class="odd">
             <th>Map size:</th>
             <td>
                 {{ server["info"]["map_width"] }} x {{ server["info"]["map_height"] }}
             </td>
         </tr>
-        <tr class="odd">
+        <tr class="even">
             <th>Dedicated server:</th>
             <td>
                 {% if server["info"]["is_dedicated"] == 1 %}
@@ -95,7 +101,7 @@ <h1>{% block title %}{{ server["info"]["name"] }} {% endblock %}</h1>
                 {% endif %}
             </td>
         </tr>
-        <tr class="even">
+        <tr class="odd">
             <th>Gamescript:</th>
             <td>
                 {% if server["info"]["gamescript_version"] is none %}
@@ -108,7 +114,7 @@ <h1>{% block title %}{{ server["info"]["name"] }} {% endblock %}</h1>
             </td>
         </tr>
         {% if server["info"]["newgrfs"] is not none %}
-        <tr class="odd">
+        <tr class="even">
             <th>NewGRFs in use:</th>
             <td>
                 {{ server["info"]["newgrfs"]|length }}
diff --git a/webclient/templates/server_list.html b/webclient/templates/server_list.html
index ad1eef0..3cf8935 100644
--- a/webclient/templates/server_list.html
+++ b/webclient/templates/server_list.html
@@ -20,6 +20,7 @@ <h1>{% block title %}
         <th class="name">Name</th>
         <th class="clients">Clients</th>
         <th class="companies">Companies</th>
+        <th class="play-time">Play time</th>
         <th class="version">Version</th>
         <th class="icon-password"></th>
         <th class="icon-grf"></th>
@@ -51,6 +52,9 @@ <h1>{% block title %}
         <td>
             {{ server['info']['companies_on'] }} / {{ server['info']['companies_max'] }}
         </td>
+        <td>
+            {{ server['info']['time_playing'] }}
+        </td>
         <td>
             <div class="nowrap" style="width: 120px;">
                 <a href="/listing/{{ server['info']['openttd_version'] }}">{{ server['info']['openttd_version'] }}</a>