k-space/inventory-app
13
0
Fork 0
Code Issues 16 Pull Requests 1 Packages Activity

doorboy: merge status, success and approved

Browse Source
This commit is contained in:
rasmus
2025-08-07 21:54:48 +03:00
parent afc439e245
commit 6bba3f9831
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inventory-app/doorboy.py
View File

@@ -343,7 +343,7 @@ def view_swipe():
"timestamp": timestamp, "timestamp": timestamp,
"door": form["door"], "door": form["door"],
"event": "card-swiped", "event": "card-swiped",
"success": form["success"], "approved": form["approved"],
"token": { "token": {
"uid_hash": form["uid_hash"] "uid_hash": form["uid_hash"]
}, },
@@ -355,7 +355,7 @@ def view_swipe():
db.eventlog.insert_one(event_swipe) db.eventlog.insert_one(event_swipe)
status = "Permitted" if form["success"] else "Denied" status = "Permitted" if form["approved"] else "Denied"
username = token.get("inventory", {}).get("owner", {}).get("username", None) username = token.get("inventory", {}).get("owner", {}).get("username", None)
if username and username in g.users_lookup: if username and username in g.users_lookup:
subject = g.users_lookup[username].display_name or username subject = g.users_lookup[username].display_name or username

2
inventory-app/templates/doorboy.html
View File

@@ -84,7 +84,7 @@ Does not include door opens by webhook.
<td>{{ o.door }}</td> <td>{{ o.door }}</td>
<td>{% if o.inventory and o.inventory.owner %}<a href="/m/user/{{ o.inventory.owner.username }}">{{ o.inventory.owner.username | display_name }}</a>{% else %}Unknown{% endif %}</td> <td>{% if o.inventory and o.inventory.owner %}<a href="/m/user/{{ o.inventory.owner.username }}">{{ o.inventory.owner.username | display_name }}</a>{% else %}Unknown{% endif %}</td>
<td><a href="/m/doorboy/{{ o._id }}/events">{{ o.token.uid_hash[-6:] }}</a></td> <td><a href="/m/doorboy/{{ o._id }}/events">{{ o.token.uid_hash[-6:] }}</a></td>
<!-- <td>{% if o.success %}<i class="material-icons">check_circle</i>{% else %}&nbsp;{% endif %}</td> --> <!-- <td>{% if o.approved %}<i class="material-icons">check_circle</i>{% else %}&nbsp;{% endif %}</td> -->
<td>{% if o.inventory and o.inventory.owner %}{{ o.token.comment }}{% else %}<a class="waves-effect waves-light btn" href="/m/doorboy/{{ o._id }}/claim">Claim keycard</a>{% endif %}</td> <td>{% if o.inventory and o.inventory.owner %}{{ o.token.comment }}{% else %}<a class="waves-effect waves-light btn" href="/m/doorboy/{{ o._id }}/claim">Claim keycard</a>{% endif %}</td>
</tr> </tr>
{% endfor %} {% endfor %}