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

Borrel reservations #172

Merged
merged 33 commits into from
Mar 7, 2022
Merged

Borrel reservations #172

merged 33 commits into from
Mar 7, 2022

Conversation

KiOui
Copy link
Owner

@KiOui KiOui commented Oct 13, 2021

This pull request adds a borrel application to TOSTI which replaces the functions of the VoorraadCie website. The functions of the application include:

  • Keeping track of people with a BasicBorrelBrevet
  • Enabling people with a BasicBorrelBrevet to create ReservationRequests
  • Enabling VoorraadCie members to respond to these ReservationRequests
  • Enabling people with a BasicBorrelBrevet to track their ReservationRequests and see whether they are accepted
  • Enabling people with a BasicBorrelBrevet to digitally hand in a BorrelForm
  • Enabling VoorraadCie members to add and remove Products from the BorrelForm and their inventory

Closes #169

@KiOui KiOui marked this pull request as draft October 13, 2021 18:54
@KiOui
Copy link
Owner Author

KiOui commented Oct 13, 2021

Things still TODO:

  • Create BorrelProduct model
  • Create a BorrelProductCategory model
  • Create a BorrelForm model
  • Create a BorrelInventoryRequest model which stores BorrelProducts and their respective ordered amounts
  • Add a way for creating a BorrelInventoryRequest to a ReservationRequest on the ReservationRequestCreateView
  • Add verifiers to the ReservationRequestCreateView (such as filtering reservations that are in the past)
  • Add a way for users to see their ReservationRequests and the responses to these ReservationRequests
  • Add administrator actions for accepting and denying ReservationRequests which should automatically create a Reservation (in case of accepting)
  • Add buttons on the respective pages to create a ReservationRequest
  • Add a way for users with a BasicBorrelBrevet to enter their BorrelForms digitally
  • Squash migrations

@KiOui
Copy link
Owner Author

KiOui commented Oct 13, 2021

Example borrel form

image

@JobDoesburg
Copy link
Collaborator

You should use Django's inlineformset_factory's to add inline items to the reservation form to add reserved items

website/borrel/models.py Outdated Show resolved Hide resolved
website/borrel/models.py Outdated Show resolved Hide resolved
website/borrel/models.py Outdated Show resolved Hide resolved
website/borrel/models.py Outdated Show resolved Hide resolved
website/borrel/models.py Outdated Show resolved Hide resolved
website/borrel/models.py Outdated Show resolved Hide resolved
website/borrel/forms.py Outdated Show resolved Hide resolved
@KiOui
Copy link
Owner Author

KiOui commented Oct 17, 2021

This needs to be changed as a whole when #174 is merged.

Copy link
Collaborator

@JobDoesburg JobDoesburg left a comment

Choose a reason for hiding this comment

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

I doubt if this venue calendar thing is the best way to separate modules. I think it is best to have borrel depend on the venue calendar app, and add one of those nice filters to display the kind of reservations that can be made for this calendar and add the buttons for it.

website/borrel/selectors.py Outdated Show resolved Hide resolved
website/venues/selectors.py Outdated Show resolved Hide resolved
website/borrel/views.py Outdated Show resolved Hide resolved
@JobDoesburg JobDoesburg changed the title Feature/borrel application Borrel reservations Feb 27, 2022
@JobDoesburg
Copy link
Collaborator

JobDoesburg commented Feb 27, 2022

TODO:

  • Display form and non-form error messages correctly in the template
  • Use correct success redirects and user-messages
  • Improve page structure (menu items, buttons, etc)
  • Implement the logic on when to use ReservationSubmission and ReservationUpdate views, when to show buttons and when to allow access to the view
  • Implement something to check out submitted borrel lists as read only objects
  • Deleting reservation items (hit the DELETE checkbox if 0 is entered)
  • Fix the calendar (currently, nothing shows up in the calendar)
  • Better link borrel and venue reservations
  • Venue reservations page and explainer
  • Give other people access to your borrel reservation (maybe with UUID's?)
  • Approval for changing reservations (if people change their reservation, this should be approved? Can they even change?)
  • Notification emails
  • Cancelling / deleting reservations (borrel ánd venue)
  • Test if the form breaks with changing available products
  • Display current venue reservation on home page, maybe do something with music controls

@JobDoesburg JobDoesburg marked this pull request as ready for review March 7, 2022 11:09
@KiOui
Copy link
Owner Author

KiOui commented Mar 7, 2022

When reserving a Venue, I get this error:
Schermafbeelding 2022-03-07 om 15 11 25

website/borrel/admin.py Outdated Show resolved Hide resolved
website/borrel/admin.py Outdated Show resolved Hide resolved
@JobDoesburg JobDoesburg merged commit 3e385e5 into master Mar 7, 2022
@JobDoesburg JobDoesburg deleted the feature/borrel-application branch March 7, 2022 19:40
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.

Add reservations application
2 participants