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.

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

Added a way to request reservations #174

Merged
merged 5 commits into from
Oct 18, 2021
Merged

Conversation

KiOui
Copy link
Owner

@KiOui KiOui commented Oct 15, 2021

Added the following:

  • An accepted field to Reservations which indicates whether the Reservation is active/accepted
  • Added a form which can be used to request reservations

A way to see Reservation requests will be added once we have created the borrel application (see #172)

@KiOui KiOui self-assigned this Oct 15, 2021
@JobDoesburg
Copy link
Collaborator

website/venues/forms.py Outdated Show resolved Hide resolved
website/venues/templates/venues/reservation_request.html Outdated Show resolved Hide resolved
website/venues/urls.py Show resolved Hide resolved
@@ -43,7 +43,7 @@ class VenueReservationListAPIView(ListAPIView):
"""

serializer_class = ReservationSerializer
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe the unaccepted reservations should be shown in a opaque color

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will experiment with that

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You decided not to do it?

website/venues/forms.py Show resolved Hide resolved
website/venues/views.py Outdated Show resolved Hide resolved
Co-authored-by: Job Doesburg <job.doesburg@gmail.com>
@KiOui KiOui mentioned this pull request Oct 17, 2021
@KiOui
Copy link
Owner Author

KiOui commented Oct 17, 2021

You also want to create a LogEntry for such actions, like https://github.com/svthalia/concrexit/blob/b600592fb6a79383578a2b39186c159ec1822f6d/website/registrations/services.py#L175-L181 does

Where for exactly? Adding a Reservation or changing the status of a Reservation? The latter is already done by Django right?

@JobDoesburg
Copy link
Collaborator

Where for exactly? Adding a Reservation or changing the status of a Reservation? The latter is already done by Django right?

For changing the status. I think Django will only say "the reservation has changed" but will not display it as "the reservation is approved". Not sure though

@JobDoesburg
Copy link
Collaborator

Apart from these 3 small comments, it looks good to me

Co-authored-by: Job Doesburg <job.doesburg@gmail.com>
@JobDoesburg JobDoesburg merged commit 72e6588 into master Oct 18, 2021
@JobDoesburg JobDoesburg deleted the feature/reservation-requests branch October 18, 2021 07:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants