Makeroom wizard #27

Merged
stranck merged 15 commits from drew-dev into stranck-dev 2024-05-20 10:32:09 +00:00
2 changed files with 52 additions and 3 deletions
Showing only changes of commit b968a78aa5 - Show all commits

View File

@ -108,10 +108,59 @@ async def room_wizard(request, order:Order):
await clear_cache(request, order) await clear_cache(request, order)
#Separate orders which have incomplete rooms and which have no rooms #Separate orders which have incomplete rooms and which have no rooms
orders : list[Order]
orders = request.app.ctx.om.cache.items() orders = request.app.ctx.om.cache.items()
orders = {key:value for key,value in sorted(orders, key=lambda x: x[1].ans('fursona_name')) if value.status not in ['c', 'e'] and not value.room_confirmed}
# Orders with incomplete rooms # Orders with incomplete rooms
orders_incomplete_rooms = {key:value for key,value in sorted(orders, key=lambda x: x[1].ans('fursona_name')) if value.status not in ['c', 'e'] and value.code == value.room_id and not value.room_confirmed} incomplete_orders = {key:value for key,value in orders.items() if value.code == value.room_id and (value.room_person_no - len(value.room_members)) > 0}
# Roomless furs
roomless_orders = {key:value for key,value in orders.items() if not value.room_id and not value.daily}
# Result map
result_map = {
'A':{
'type': 'add_existing',
'to_add': ['b', 'c']
},
'B':{
'type': 'new',
'to_add': ['B', 'a', 'c']
}
}
# Fill already existing rooms
for room_order in incomplete_orders.items():
room = room_order.value
to_add = []
missing_slots = room.room_person_no - len(room.room_members)
for i in enumerate(missing_slots):
compatible_roomates = {key:value for key,value in roomless_orders.items() if value.bed_in_room == room.bed_in_room}
if len(compatible_roomates.items()) == 0: break
# Try picking a roomate that's from the same country and room type
country = room.country.lower()
roomless_by_country = {key:value for key,value in compatible_roomates.items() if value.country.lower() == country}
if len(roomless_by_country.items()) > 0:
code_to_add = roomless_by_country.keys()[0]
to_add.append(code_to_add)
del roomless_orders[code_to_add]
else:
# If not, add first roomless there is
code_to_add = compatible_roomates.keys()[0]
to_add.append(code_to_add)
del roomless_orders[code_to_add]
result_map[room.code] = {
'type': 'add_existing',
'to_add': to_add
}
# Create additional rooms
print ('Incomplete orders')
for order in incomplete_orders.values():
print(f'{order.code} - {order.bed_in_room}')
print ('Roomless')
for order in roomless_orders.values():
print(f'{order.code} - {order.bed_in_room}')
return redirect(f'/manage/admin')
@bp.get('/propic/remind') @bp.get('/propic/remind')
async def propic_remind_missing(request, order:Order): async def propic_remind_missing(request, order:Order):

View File

@ -19,12 +19,12 @@
<p>Rooms</p> <p>Rooms</p>
<a href="/manage/nosecount" role="button" title="Shortcut to the nosecount's admin data">Manage rooms</a> <a href="/manage/nosecount" role="button" title="Shortcut to the nosecount's admin data">Manage rooms</a>
<a href="/manage/admin/room/verify" role="button" title="Will unconfirm rooms that fail the default check. Useful when editing answers from Pretix">Verify Rooms</a> <a href="/manage/admin/room/verify" role="button" title="Will unconfirm rooms that fail the default check. Useful when editing answers from Pretix">Verify Rooms</a>
<a href="/manage/admin/room/wizard" role="button" title="Will try matching roomless furs together, you can still re-arrange the users before confirming.">Fill Rooms</a>
<hr> <hr>
<p>Profiles</p> <p>Profiles</p>
<a href="#" onclick="confirmAction('propicReminder', this)" role="button" title="Will remind via mail all people who event uploaded a badge to do it" action="/manage/admin/propic/remind">Remind badge upload</a> <a href="#" onclick="confirmAction('propicReminder', this)" role="button" title="Will remind via mail all people who event uploaded a badge to do it" action="/manage/admin/propic/remind">Remind badge upload</a>
<a href="/manage/admin/room/autoconfirm" role="button" title="Will confirm all the full rooms that are still unconfirmed">Auto-confirm Rooms</a> <a href="/manage/admin/room/autoconfirm" role="button" title="Will confirm all the full rooms that are still unconfirmed">Auto-confirm Rooms</a>
<hr> <hr>
<hr>
{% include 'components/confirm_action_modal.html' %} {% include 'components/confirm_action_modal.html' %}
</main> </main>