diff --git a/formity/admin.py b/formity/admin.py index 424882e..4a69bfe 100644 --- a/formity/admin.py +++ b/formity/admin.py @@ -78,12 +78,18 @@ class IndexView(AdminSecurityMixin, flask_admin.AdminIndexView): class MapView(AdminSecurityMixin, flask_admin.BaseView): @flask_admin.expose('/') def index(self): + mode = request.args.get('mode', 'all') + if mode == 'new': + query = FaceshieldRequest.query.filter(FaceshieldRequest.shipping_latitude != None, FaceshieldRequest.status == Status.new) + else: + query = FaceshieldRequest.query.filter(FaceshieldRequest.shipping_latitude != None, FaceshieldRequest.status != Status.spam, FaceshieldRequest.status != Status.rejected) + 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 request in FaceshieldRequest.query.filter(FaceshieldRequest.shipping_latitude != None, FaceshieldRequest.status != Status.spam, FaceshieldRequest.status != Status.rejected) + for request in query ] return self.render('admin_map.html', mapdata=mapdata, focus=request.args.get('id', None)) diff --git a/templates/admin_map.html b/templates/admin_map.html index c6ce98e..d427c1e 100644 --- a/templates/admin_map.html +++ b/templates/admin_map.html @@ -1,6 +1,6 @@ {% extends "admin/master.html" %} {% block body %} - +
{% endblock %}