Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing assignments #181

Merged
merged 5 commits into from
Dec 6, 2023
Merged

Fixing assignments #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2fd5e7e
Updating frontend
bitbyt3r Nov 21, 2023
8d9c19a
Fixing roommate search
bitbyt3r Nov 29, 2023
d555471
Merge branch 'main' into frontend_dev
bitbyt3r Nov 29, 2023
9c306f3
Merge remote-tracking branch 'origin/main' into frontend_dev
bitbyt3r Dec 6, 2023
1b5d9f1
Fixing assignments
bitbyt3r Dec 6, 2023
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
45 changes: 21 additions & 24 deletions backend/tuber/api/hotels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,15 +218,14 @@ def matching_roommates(event):
if not check_permission("hotel_block.*.read"):
return "", 403

room = db.query(HotelRoom).filter(
HotelRoom.id == int(g.data['hotel_room'])).one()

room_nights = db.query(HotelRoomNight).filter(
HotelRoomNight.event == event).order_by(HotelRoomNight.date).all()
room_nights = {x.id: x for x in room_nights}

badges = db.query(Badge).filter(Badge.event == event,
Badge.search_name.contains(g.data.get('search', "").lower())).order_by(Badge.public_name).limit(10).all()
badges = db.query(Badge).join(HotelRoomRequest, HotelRoomRequest.badge == Badge.id).filter(
or_(HotelRoomRequest.declined == False, HotelRoomRequest.declined == None)
).filter(Badge.event == event, Badge.search_name.contains(g.data.get('search', "").lower())).order_by(Badge.public_name).limit(20).all()

results = []
for badge in badges:
missing = []
Expand All @@ -246,13 +245,14 @@ def matching_roommates(event):
break
if assign:
missing.append(night.room_night)
results.append({
"missing_nights": missing,
"id": badge.id,
"name": badge.public_name,
})
if missing:
results.append({
"missing_nights": missing,
"id": badge.id,
"name": badge.public_name,
})

return jsonify(results)
return jsonify(results[:10])


@app.route("/api/event/<int:event>/hotel/room_search", methods=["GET"])
Expand All @@ -279,23 +279,20 @@ def request_search(event, hotel_block):
RoomNightAssignment, and_(RoomNightAssignment.badge == RoomNightRequest.badge,
RoomNightAssignment.room_night == RoomNightRequest.room_night)
).subquery()

reqs = db.query(HotelRoomRequest).filter(
HotelRoomRequest.event == event,
HotelRoomRequest.hotel_block == hotel_block,
HotelRoomRequest.declined != True,
or_(HotelRoomRequest.declined == False, HotelRoomRequest.declined == None),
HotelRoomRequest.room_night_requests.any(and_(RoomNightRequest.requested, not_(RoomNightRequest.id.in_(assigned_nights))))
).join(Badge, Badge.id == HotelRoomRequest.badge).filter(
or_(Badge.search_name.contains(g.data['search_term'].lower()), func.lower(
HotelRoomRequest.notes).contains(g.data['search_term'].lower()))
).order_by(g.data['sort']).offset(int(g.data['offset'])).limit(int(g.data['limit'])).all()
count = db.query(HotelRoomRequest).filter(
HotelRoomRequest.event == event,
HotelRoomRequest.hotel_block == hotel_block,
HotelRoomRequest.room_night_requests.any(and_(RoomNightRequest.requested, not_(RoomNightRequest.id.in_(assigned_nights))))
).join(Badge, Badge.id == HotelRoomRequest.badge).filter(
or_(Badge.search_name.contains(g.data['search_term'].lower()), func.lower(
HotelRoomRequest.notes).contains(g.data['search_term'].lower()))
).count()
).join(Badge, Badge.id == HotelRoomRequest.badge)
if g.data['search_term']:
reqs = reqs.filter(
or_(Badge.search_name.contains(g.data['search_term'].lower()), func.lower(
HotelRoomRequest.notes).contains(g.data['search_term'].lower()))
)
count = reqs.count()
reqs = reqs.order_by(g.data['sort']).offset(int(g.data['offset'])).limit(int(g.data['limit'])).all()
return jsonify(requests=HotelRoomRequest.serialize(reqs, serialize_relationships=True, deep=True), count=count), 200


Expand Down
2 changes: 1 addition & 1 deletion frontend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16 as build-stage
FROM node:21 as build-stage
WORKDIR /app
COPY package*.json ./
RUN yarn install
Expand Down
11 changes: 3 additions & 8 deletions frontend/public/index.html → frontend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-93461466-1"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
</script>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="icon" href="/favicon.ico">
<title>Tuber</title>
<link id="theme-link" rel="stylesheet" href="<%= BASE_URL %>themes/arya-blue/theme.css">
<link id="theme-link" rel="stylesheet" href="/themes/arya-blue/theme.css">
</head>
<body>
<div id="app">
Expand All @@ -21,5 +15,6 @@
</div>
</div>
</div>
<script type="module" src="/src/main.ts"></script>
</body>
</html>
Loading
Loading