From a4b92f80089087d353443278d1bfccb2d85254c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Madis=20M=C3=A4gi?= <madis.magi@k-space.ee>
Date: Wed, 13 Sep 2023 11:14:41 +0300
Subject: [PATCH] Show old owner data for orphaned keyfobs

---
 inventory-app/doorboy.py                   |  4 ++-
 inventory-app/templates/doorboy_admin.html | 35 +++++++++++++++-------
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/inventory-app/doorboy.py b/inventory-app/doorboy.py
index 950cb75..3c99fd7 100644
--- a/inventory-app/doorboy.py
+++ b/inventory-app/doorboy.py
@@ -237,7 +237,9 @@ def view_doorboy_admin():
               "$push" : {"$mergeObjects": [
                 "$token",
                 {"last_seen": "$last_seen"},
-                {"_id": "$_id"}
+                {"_id": "$_id"},
+                {"old_display_name": "$inventory.owner.display_name"},
+                {"old_foreign_id": "$inventory.owner.foreign_id"}
               ]}
             }
           }
diff --git a/inventory-app/templates/doorboy_admin.html b/inventory-app/templates/doorboy_admin.html
index 4989b4f..3e9cd07 100644
--- a/inventory-app/templates/doorboy_admin.html
+++ b/inventory-app/templates/doorboy_admin.html
@@ -45,16 +45,31 @@
         {{orphaned_keyfobs | length}}
       </div>
     </div>
-    <ul class="collapsible-body collection collapsible-collection">
-      {% for c in orphaned_keyfobs %}
-        <li class="collection-item">
-          {{c.comment or "unnamed"}}
-          <div class="secondary-content">
-            <a href="/m/doorboy/{{ c._id }}/events">{{ c.uid_hash[-6:] }}</a>
-          </div>
-        </li>
-      {% endfor %}
-    </ul>
+    <div class="collapsible-body collapsible-collection">
+      <table>
+        <thead>
+          <tr>
+            <th>Comment</th>
+            <th>Hash tail</th>
+            <th>Old ownership info</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for c in orphaned_keyfobs %}
+            <tr>
+              <td>{{c.comment or "unnamed"}}</td>
+              <td><a href="/m/doorboy/{{ c._id }}/events">{{ c.uid_hash[-6:] }}</a></td>
+              <td>
+                {{c.old_display_name}}
+                {% if c.old_foreign_id %}
+                  ({{c.old_foreign_id}})
+                {% endif %}
+              </td>
+            </tr>
+          {% endfor %}
+        <tbody>
+      </table>
+    </div>
   </li>
 </ul>