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

feat: Added option for notes when queueing cocktails #480

Merged
merged 12 commits into from
Jan 7, 2025

Conversation

jo-gross
Copy link
Owner

Closing issues:

Before you mark this PR as ready, please check the following points

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of
them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before
merging your code.

  • I´e created all necessary migrations?
  • The format is correct (pnpm format:check, if invalid pnpm format:fix)
  • No build errors (pnpm build)
  • I´ve tested the implemented function by my own
  • Ensure the pr title fits the conventional commit standard

Describe your work, what changed

  1. Adding Cocktails with Notes to the Queue:

    • It is now possible to queue (multiple) cocktails with individual notes.
    • Cocktails with the same name but different notes are grouped separately, with identical names and notes are still grouped together.
  2. Queue Behavior:

    • Cocktails in the queue are grouped by name and notes, with the option to mark them as "made" or "canceled."
    • Detail View (opened from the queue): any attached notes are displayed at the top. Clicking the "made" button removes the item with the displayed note from the queue, if no items remain, the view automatically closes.
  3. Behavior of the "Made" Button (e.g., Search, Cocktail Card, or Detail View):

    • If there are queue items without notes, they are removed when the "made" button is pressed.
    • If it's unclear which specific cocktail is meant, a clarification prompt appears.
    • If only items with notes exist, you are prompted to either remove one of them or track the action without removing any.

Affected sites (please check during review):

  • [workspaceId]/index - anything with the queue/statistic components

Signed-off-by: Johannes Groß <mail@gross-johannes.de>
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
@jo-gross jo-gross linked an issue Dec 13, 2024 that may be closed by this pull request
1 task
@jo-gross jo-gross changed the title 479 feat add notes to queued cocktail feat: Added option for notes when queueing cocktails Dec 13, 2024
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
@jo-gross jo-gross requested a review from jhns-de December 13, 2024 17:59
@jo-gross jo-gross enabled auto-merge (squash) December 13, 2024 18:00
@jo-gross jo-gross requested a review from fypsilonnn December 16, 2024 22:18
…-queued-cocktail

# Conflicts:
#	components/modals/CocktailDetailModal.tsx
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
Copy link
Collaborator

@fypsilonnn fypsilonnn left a comment

Choose a reason for hiding this comment

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

as personally discussed

Signed-off-by: Johannes Groß <mail@gross-johannes.de>
@jo-gross jo-gross requested a review from fypsilonnn December 16, 2024 23:15
Copy link
Collaborator

@fypsilonnn fypsilonnn left a comment

Choose a reason for hiding this comment

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

sometimes the wrong iteration of a cocktail gets deleted out of the queue when using the "x"
First you put in queue some number of e.g. margaritas and give them a note, then you add a few without any notes using the "Liste" or the "mit Notiz" button. Then when trying to delete a drink without a note using the red x in the queue it will delete a drink with a note instead of the one without any notes. This makes it impossible to delete any non-note drinks without clearing any previously added drinks with notes.
The same happens when having two iterations of a drink with notes and then adding a third one without notes
Any noted-drinks you add afterwards however will work fine. Adding noted drinks and trying to delete them will also work

Signed-off-by: Johannes Groß <mail@gross-johannes.de>
@jo-gross jo-gross requested a review from fypsilonnn December 27, 2024 18:08
@jo-gross
Copy link
Owner Author

sometimes the wrong iteration of a cocktail gets deleted out of the queue when using the "x" First you put in queue some number of e.g. margaritas and give them a note, then you add a few without any notes using the "Liste" or the "mit Notiz" button. Then when trying to delete a drink without a note using the red x in the queue it will delete a drink with a note instead of the one without any notes. This makes it impossible to delete any non-note drinks without clearing any previously added drinks with notes. The same happens when having two iterations of a drink with notes and then adding a third one without notes Any noted-drinks you add afterwards however will work fine. Adding noted drinks and trying to delete them will also work

Well spotted, thank you very much – it should now be fixed. :)

@fypsilonnn fypsilonnn closed this Jan 7, 2025
auto-merge was automatically disabled January 7, 2025 17:58

Pull request was closed

@fypsilonnn fypsilonnn reopened this Jan 7, 2025
@jo-gross jo-gross merged commit b87a6b9 into main Jan 7, 2025
10 checks passed
@jo-gross jo-gross deleted the 479-feat-add-notes-to-queued-cocktail branch January 7, 2025 18:42
jg-semantic-release-bot bot pushed a commit that referenced this pull request Jan 7, 2025
# [1.10.0](v1.9.7...v1.10.0) (2025-01-07)

### Bug Fixes

* Added add cocktail rating to cocktail ratings modal ([a6f909a](a6f909a))
* Alert z-index ([4012a27](4012a27))
* Search model open card behavior ([e589174](e589174))

### Features

* Added field for cocktail history notes and allowed numbers in tags ([#497](#497)) ([bb1a17d](bb1a17d))
* Added option for notes when queueing cocktails ([#480](#480)) ([b87a6b9](b87a6b9))
* Export cocktail as PDF ([#474](#474)) ([c424941](c424941))
* Tag suggestions ([#472](#472)) ([39584dc](39584dc))
@jg-semantic-release-bot
Copy link

🎉 This PR is included in version 1.10.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

feat: Add notes to queued cocktail
3 participants