Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/backoffice/static/js/ticket_scan.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ document.addEventListener("DOMContentLoaded", () => {
} else if (ticket_token_input.value === "#handoutbadge") {
hand_out_badge_input.checked = true;
check_in_form.submit();
} else if (ticket_token_input.value.length === 65) {
} else if (ticket_token_input.value.length === 64 || ticket_token_input.value.length === 65) {
search_form.submit();
} else if (ticket_token_input.value.startsWith("#bornhack://opr/")) {
var oprelement = document.getElementById("opr");
Expand Down
16 changes: 13 additions & 3 deletions src/backoffice/templates/info_desk/scan.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,17 @@

<div class="row">

<div class="col-md-12">
<div class="col-md-6">
<h3>PoS: {{ pos.name }}</h3>
<h3>Scan the ticket!</h3>
<input type="text" class="form-control input-lg" name="ticket_token" id="ticket_token_input" autocomplete="off">
<input type="text"
class="form-control input-lg"
name="ticket_token"
id="ticket_token_input"
autocomplete="off">
<button type="submit" class="btn btn-lg btn-primary">
Find ticket
</button>
<div id="scan_again" hidden>
Scan again!
<hr/>
Expand Down Expand Up @@ -144,8 +151,11 @@ <h2 id="opr">{{ ticket.opr.id }}</h2>
</form>

<div class="row">
<div class="col-md-4">
<div class="col-md-4 text-center">
{% qr_code "clear" %}
<button class="btn btn-secondary" onclick="window.location.replace(window.location.pathname);">
Clear
</button>
</div>

{% if not ticket.used_at %}
Expand Down
5 changes: 4 additions & 1 deletion src/backoffice/views/infodesk.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,11 @@ def get_context_data(self, **kwargs):
context["ticket"] = self.ticket

elif "ticket_token" in self.request.POST:
ticket_token = self.request.POST.get("ticket_token")

# Slice to get rid of the first character which is a '#'
ticket_token = self.request.POST.get("ticket_token")[1:]
if ticket_token[0] == "#":
ticket_token = ticket_token[1:]

ticket: TicketTypeUnion | None = _ticket_getter_by_token(ticket_token)

Expand Down
4 changes: 3 additions & 1 deletion src/utils/bootstrap/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2268,16 +2268,18 @@ def create_camp_map_layer(self, camp: Camp) -> None:
processing="",
)

def create_camp_pos(self, teams: dict[Team]) -> None:
def create_camp_pos(self, teams: dict[str, Team]) -> None:
"""Create POS locations for camp."""
pos = [
Pos(
name="Infodesk",
slug="infodesk",
team=teams["info"],
external_id="HHR9izotB6HLzgT6k",
),
Pos(
name="Bar",
slug="bar",
team=teams["bar"],
external_id="bTasxE2YYXZh35wtQ",
),
Expand Down
Loading