From 68a5784650746e25769699d983b4015f7f528692 Mon Sep 17 00:00:00 2001
From: Fluffyhairedguy <90944753+Fluffyhairedguy@users.noreply.github.com>
Date: Thu, 23 Sep 2021 07:48:25 -0400
Subject: [PATCH] New column for generic tracker (#78)

* Adding order received column to generic tracker. Progressive items will have the most recent number only.
---
 WebHostLib/templates/genericTracker.html | 2 ++
 WebHostLib/tracker.py                    | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/WebHostLib/templates/genericTracker.html b/WebHostLib/templates/genericTracker.html
index d1b57af6..6fa65650 100644
--- a/WebHostLib/templates/genericTracker.html
+++ b/WebHostLib/templates/genericTracker.html
@@ -20,6 +20,7 @@
                         <tr>
                             <th>Item</th>
                             <th>Amount</th>
+                            <th>Order Received</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -28,6 +29,7 @@
                     <tr>
                         <td>{{ name | item_name }}</td>
                         <td>{{ count }}</td>
+                        <td>{{received_items[name]}}</td>
                     </tr>
                     {%- endfor -%}
 
diff --git a/WebHostLib/tracker.py b/WebHostLib/tracker.py
index 703e7d9b..8c882e83 100644
--- a/WebHostLib/tracker.py
+++ b/WebHostLib/tracker.py
@@ -521,11 +521,14 @@ def getPlayerTracker(tracker: UUID, tracked_team: int, tracked_player: int):
 
     else:
         checked_locations = multisave.get("location_checks", {}).get((tracked_team, tracked_player), set())
+        player_received_items = {}
+        for order_index, networkItem in enumerate(multisave.get('received_items', {}).get((tracked_team, tracked_player), [])):
+            player_received_items[networkItem.item] = order_index + 1
         return render_template("genericTracker.html",
                                inventory=inventory,
                                player=tracked_player, team=tracked_team, room=room, player_name=player_name,
-                               checked_locations= checked_locations, not_checked_locations = set(locations[tracked_player])-checked_locations)
-
+                               checked_locations=checked_locations, not_checked_locations=set(locations[tracked_player])-checked_locations,
+                               received_items=player_received_items)
 
 @app.route('/tracker/<suuid:tracker>')
 @cache.memoize(timeout=60)  # multisave is currently created at most every minute