-
Notifications
You must be signed in to change notification settings - Fork 89
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
New pages 'Booze Explorer' #160
Open
RichGibson
wants to merge
62
commits into
partyrobotics:master
Choose a base branch
from
RichGibson:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…with different booze
…hich is loaded in the dispensers, as well as all possible booze, and look at what drinks can be created with different Booze.
… a date, drink count, and volume, by date. Days are partially using an offset - ie. a day is from 10am or noon until the next day.
…drinks by date on the trending page, along with the ability to see the drinks for each day. Implements 'bartendro standard time' to start at 10 am. This handles most of the cases when an event runs across midnight. If you enter Jan 1st as a begin date it will show you drinks from 10 am Jan 1st - 10 am Jan 2nd.
…plicate of the obvious drink size on the right side, but it seemed reasonable to me. ymmv.
Add the new trending code.
…ame and ingredients if desired, and then it will be saved as a new item.
… an existing drink, change the name and ingredients if desired, and then it will be saved as a new item.
… hello_drinkbot Some merge
…s to an image in content/static/images. put an image in that directory, then add the image name to the booze.image field
…view images, and start of an api
… motor hat code so you can run it in software mode without the HAT. Software only flag is used when you don't have bartendro hardware. Maybe should have a flag for true software only.
…th booze id and booze name
Now active menu works properly for all items, added new if statements in layout file for graphical shots and booze menu
Modified files to fix active menu issue
…hemy now wants that.
… strings, and tried to fix some bugs.
… were deprecated, and general confusion.
…e addressed in the expected order.
…nian Roulette where if you press button 1 and then button 2 the second pump stops at the same time as the first one. Even though it should stay on a bit longer
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A non-admin page which lets a person look at what booze is currently loaded, as well as all of the booze in the database, and then explore which drinks they could make with each booze.
(it is amazing how much motivation is provided by the acknowledgement, and acceptance, of one's pull requests - Thanks Rob!)