From 9bd577bf1ccc6690d2fc6ec8c26f811623cfb311 Mon Sep 17 00:00:00 2001
From: Piotr Dobrowolski <admin@tastycode.pl>
Date: Tue, 14 Apr 2020 22:30:16 +0200
Subject: [PATCH] moar info

---
 formity/admin.py         | 2 +-
 templates/admin_map.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/formity/admin.py b/formity/admin.py
index 4a69bfe..9488425 100644
--- a/formity/admin.py
+++ b/formity/admin.py
@@ -87,7 +87,7 @@ class MapView(AdminSecurityMixin, flask_admin.BaseView):
         mapdata = [
             {
                 key: getattr(request, key).name if isinstance(getattr(request, key), enum.Enum) else getattr(request, key)
-                for key in ['id', 'entity_info', 'shipping_latitude', 'shipping_longitude', 'status', 'handling_orga']
+                for key in ['id', 'entity_info', 'shipping_latitude', 'shipping_longitude', 'status', 'handling_orga', 'extra', 'remarks', 'faceshield_full_required']
             }
             for request in query
         ]
diff --git a/templates/admin_map.html b/templates/admin_map.html
index d427c1e..a88009d 100644
--- a/templates/admin_map.html
+++ b/templates/admin_map.html
@@ -44,7 +44,7 @@ for (const loc of mapdata) {
         stroke: loc.id == focusitem,
         fillOpacity: 0.4,
     }).addTo(map);
-    marker.bindPopup(`<b>[${e(loc.id)}]</b> <a href="/admin/faceshieldrequest/edit/?id=${e(loc.id)}">${e(loc.entity_info)}</a><br /><b>Handling orga:</b> ${e(loc.handling_orga)}<br /><b>Status:</b> ${e(loc.status)}`);
+    marker.bindPopup(`<b>[${e(loc.id)}]</b> <a href="/admin/faceshieldrequest/edit/?id=${e(loc.id)}">${e(loc.entity_info)}</a><br /><b>Handling orga:</b> ${e(loc.handling_orga)}<br /><b>Status:</b> ${e(loc.status)}<br/><b>Extra:</b> ${e(loc.extra||'')}<br/><b>Remarks:</b> ${e(loc.remarks||'')}<br/><b>Full required:</b> ${e(loc.faceshield_full_required)}`);
     if (loc.id == focusitem) {
         map.setView([loc.shipping_latitude, loc.shipping_longitude], 10);
         marker.openPopup();