From 3bff20a3cfc5e96cc589b02b29fa1dce3affb4bc Mon Sep 17 00:00:00 2001
From: Remy Jette <remy@remyjette.com>
Date: Tue, 31 Oct 2023 14:20:07 -0700
Subject: [PATCH] WebHost: Round percentage of checks, fix possible 500 error
 (#2270)

* WebHost: Round percentage of checks, fix possible 500 error

* Round using str.format in the template

How the percentage of checks done should be displayed is a display
concern, so it makes sense to just always do it in the template. That
way, along with using .format() instead of .round, means we always get
exactly the same presentation regardless of whether it ends in .00
(which would not round to two decimal places), is an int (which
`round(2)` wouldn't touch at all), etc.

* Round percent_total_checks_done in lttp multitracker

* Fix non-LttP games showing as 0% done in LttP MultiTracker
---
 WebHostLib/templates/lttpMultiTracker.html |  2 +-
 WebHostLib/templates/multiTracker.html     | 10 ++++++++--
 WebHostLib/tracker.py                      | 19 ++++++++++++-------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/WebHostLib/templates/lttpMultiTracker.html b/WebHostLib/templates/lttpMultiTracker.html
index 2b943a22..8eb471be 100644
--- a/WebHostLib/templates/lttpMultiTracker.html
+++ b/WebHostLib/templates/lttpMultiTracker.html
@@ -153,7 +153,7 @@
                                             {%- endif -%}
                                         {% endif %}
                                     {%- endfor -%}
-                                    <td class="center-column">{{ percent_total_checks_done[team][player] }}</td>
+                                    <td class="center-column">{{ "{0:.2f}".format(percent_total_checks_done[team][player]) }}</td>
                                     {%- if activity_timers[(team, player)] -%}
                                         <td class="center-column">{{ activity_timers[(team, player)].total_seconds() }}</td>
                                     {%- else -%}
diff --git a/WebHostLib/templates/multiTracker.html b/WebHostLib/templates/multiTracker.html
index 40d89eb4..1a3d353d 100644
--- a/WebHostLib/templates/multiTracker.html
+++ b/WebHostLib/templates/multiTracker.html
@@ -55,7 +55,7 @@
                                     <td class="center-column" data-sort="{{ checks["Total"] }}">
                                       {{ checks["Total"] }}/{{ locations[player] | length }}
                                     </td>
-                                    <td class="center-column">{{ percent_total_checks_done[team][player] }}</td>
+                                    <td class="center-column">{{ "{0:.2f}".format(percent_total_checks_done[team][player]) }}</td>
                                     {%- if activity_timers[team, player] -%}
                                         <td class="center-column">{{ activity_timers[team, player].total_seconds() }}</td>
                                     {%- else -%}
@@ -72,7 +72,13 @@
                                     <td>All Games</td>
                                     <td>{{ completed_worlds }}/{{ players|length }} Complete</td>
                                     <td class="center-column">{{ players.values()|sum(attribute='Total') }}/{{ total_locations[team] }}</td>
-                                    <td class="center-column">{{ (players.values()|sum(attribute='Total') / total_locations[team] * 100) | int }}</td>
+                                    <td class="center-column">
+                                        {% if total_locations[team] == 0 %}
+                                            100
+                                        {% else %}
+                                            {{ "{0:.2f}".format(players.values()|sum(attribute='Total') / total_locations[team] * 100) }}
+                                        {% endif %}
+                                    </td>
                                     <td class="center-column last-activity"></td>
                                 </tr>
                             </tfoot>
diff --git a/WebHostLib/tracker.py b/WebHostLib/tracker.py
index 0d9ead79..55b98df5 100644
--- a/WebHostLib/tracker.py
+++ b/WebHostLib/tracker.py
@@ -1532,9 +1532,11 @@ def _get_multiworld_tracker_data(tracker: UUID) -> typing.Optional[typing.Dict[s
             continue
         player_locations = locations[player]
         checks_done[team][player]["Total"] = len(locations_checked)
-        percent_total_checks_done[team][player] = int(checks_done[team][player]["Total"] /
-                                                      len(player_locations) * 100) \
-            if player_locations else 100
+        percent_total_checks_done[team][player] = (
+            checks_done[team][player]["Total"] / len(player_locations) * 100
+            if player_locations
+            else 100
+        )
 
     activity_timers = {}
     now = datetime.datetime.utcnow()
@@ -1690,10 +1692,13 @@ def get_LttP_multiworld_tracker(tracker: UUID):
             for recipient in recipients:
                 attribute_item(team, recipient, item)
                 checks_done[team][player][player_location_to_area[player][location]] += 1
-                checks_done[team][player]["Total"] += 1
-        percent_total_checks_done[team][player] = int(
-            checks_done[team][player]["Total"] / len(player_locations) * 100) if \
-        player_locations else 100
+        checks_done[team][player]["Total"] = len(locations_checked)
+
+        percent_total_checks_done[team][player] = (
+            checks_done[team][player]["Total"] / len(player_locations) * 100
+            if player_locations
+            else 100
+        )
 
     for (team, player), game_state in multisave.get("client_game_state", {}).items():
         if player in groups: