Compare commits

..

No commits in common. "0d663c5b5819a35d719f750436935d515763403b" and "e780a2a0c04f1abcb5957aff6a8106853a025708" have entirely different histories.

6 changed files with 44 additions and 66 deletions

2
.gitignore vendored
View File

@ -165,5 +165,3 @@ res/rooms/*
config.py
furizon_webinit_riverside2023.tar.gz
diomerdas
furizon.net/site/*
furizon.net.zip

View File

@ -14,14 +14,9 @@ async def send_unconfirm_message (room_order, orders):
issues_html = "<ul>"
for err in room_order.room_errors:
errId = err[1]
order = err[0]
orderStr = ""
if order is not None:
orderStr = f"{order}: "
if errId in ROOM_ERROR_TYPES.keys():
issues_plain += f"{orderStr}{ROOM_ERROR_TYPES[errId]}\n"
issues_html += f"<li>{orderStr}{ROOM_ERROR_TYPES[errId]}</li>"
if err in ROOM_ERROR_TYPES.keys():
issues_plain += f"{ROOM_ERROR_TYPES[err]}\n"
issues_html += f"<li>{ROOM_ERROR_TYPES[err]}</li>"
issues_html += "</ul>"
for member in orders:

View File

@ -18,8 +18,7 @@ def draw_profile (source, member, position, font, size=(170, 170), border_width=
# Draw border
idraw.rounded_rectangle(border_loc, border_width, border_color)
# Draw profile picture
fileName = member['propic'] or 'default.png'
with Image.open(f'res/propic/{fileName}') as to_add:
with Image.open(f'res/propic/{member['propic'] or 'default.png'}') as to_add:
source.paste(to_add.resize (size), profile_location)
name_len = idraw.textlength(str(member['name']), font)
calc_size = 0

View File

@ -20,7 +20,7 @@
h1 img {max-height:1.4em;}
.notice {padding:0.8em;border-radius:3px;background:#e53935;color:#eee;}
.notice a {color:#eee;text-decoration:underline;}
.container {max-width:50em;padding:1em;box-sizing:border-box;}
.container {max-width:40em;padding:1em;box-sizing:border-box;}
td > a[role=button] {padding: 0.3em 0.7em;}
td {padding-left: 0.2em;padding-right: 0.2em;}
td > input[type=file] {margin:0;padding:0;}

View File

@ -88,8 +88,8 @@
<details id="shuttle">
<summary role="button"><img src="/res/icons/bus.svg" class="icon" />Shuttle</summary>
<p>This year, a shuttle service operated by the tourism company of Val di Fiemme will be available. The shuttle service will consist of a bus serving the convention, with scheduled stops at major airports and train stations. More informations <a href="https://furizon.net/furizon-overlord/furizon-overlord-shuttle-bus/">in the dedicated page.</a></p>
<p style="text-align:right;"><a href="{{LOCALES['shuttle_link_url'][locale]}}" target="_blank" role="button">Book now!</a></p>
<p>This year we teamed up with VisitFiemme to take our guests to the convention.</p>
<p style="text-align:right;"><a href="{{LOCALES['shuttle_link_url'][locale]}}" target="_blank" role="button">Book now</a></p>
</details>
<details id="barcard">

View File

@ -154,32 +154,26 @@ async def validate_rooms(request, rooms, om):
logger.info('Validating rooms...')
if not om: om = request.app.ctx.om
# rooms_to_unconfirm is the room that MUST be unconfirmed, room_with_errors is a less strict set containing all rooms with kind-ish errors
rooms_to_unconfirm = []
room_with_errors = []
failed_rooms = []
# Validate rooms
for order in rooms:
# returns tuple (room owner order, check, room error list, room members orders)
result = await check_room(request, order, om)
if(len(order.room_errors) > 0):
room_with_errors.append(result)
order = result[0]
check = result[1]
if check != None and check == False:
rooms_to_unconfirm.append(result)
failed_rooms.append(result)
# End here if no room has failed check
if len(room_with_errors) == 0:
if len(failed_rooms) == 0:
logger.info('[ROOM VALIDATION] Every room passed the check.')
return
roomErrListSrts = []
for fr in room_with_errors:
for error in fr[0].room_errors:
roomErrListSrts.append(f"[ROOM VALIDATION] [ERR] Parent room: {fr[0].code} {'C' if fr[0].room_confirmed else 'N'} | Order {error[0] if error[0] else '-----'} with code {error[1]}")
logger.warning(f'[ROOM VALIDATION] Room validation failed for orders: \n%s', "\n".join(roomErrListSrts))
logger.warning(f'[ROOM VALIDATION] Room validation failed for orders: %s', list(map(lambda rf: rf[0].code, failed_rooms)))
# Get confirmed rooms that fail validation
failed_confirmed_rooms = list(filter(lambda fr: (fr[0].room_confirmed == True), rooms_to_unconfirm))
failed_confirmed_rooms = list(filter(lambda fr: (fr[0].room_confirmed == True), failed_rooms))
if len(failed_confirmed_rooms) == 0:
logger.info('[ROOM VALIDATION] No rooms to unconfirm.')
@ -219,7 +213,6 @@ async def check_room(request, order, om=None):
# This is not needed anymore you buy tickets already
#if quotas.get_left(len(order.room_members)) == 0:
# raise exceptions.BadRequest("There are no more rooms of this size to reserve.")
allOk = True
bed_in_room = order.bed_in_room # Variation id of the ticket for that kind of room
for m in order.room_members:
@ -230,27 +223,20 @@ async def check_room(request, order, om=None):
# Room user in another room
if res.room_id != order.code:
room_errors.append((res.code, 'room_id_mismatch'))
allOk = False
room_errors.append('room_id_mismatch')
if res.status != 'paid':
room_errors.append((res.code, 'unpaid'))
room_errors.append('unpaid')
if res.bed_in_room != bed_in_room:
room_errors.append((res.code, 'type_mismatch'))
if order.room_confirmed:
allOk = False
room_errors.append('type_mismatch')
if res.daily:
room_errors.append((res.code, 'daily'))
if order.room_confirmed:
allOk = False
room_errors.append('daily')
room_members.append(res)
if len(room_members) != order.room_person_no and order.room_person_no != None:
room_errors.append((None, 'capacity_mismatch'))
if order.room_confirmed:
allOk = False
room_errors.append('capacity_mismatch')
order.set_room_errors(room_errors)
return (order, allOk, room_members)
return (order, len(room_errors) == 0, room_members)