Code

New pages 'Booze Explorer'#160

Code

Open

RichGibson wants to merge 62 commits intopartyrobotics:masterpartyrobotics/bartendro:masterfrom

RichGibson:masterRichGibson/bartendro:masterCopy head branch name to clipboard

Commits

Commits on Mar 7, 2016

• Added the start of the booze explorer

  RichGibson

  committed
  7e12d71

  Copy full SHA for 7e12d71

Commits on Mar 8, 2016

• Added 'Explore Booze' which lets you look at what drinks can be made with different booze

  RichGibson

  committed
  46957f1

  Copy full SHA for 46957f1

• Added 'Explore Booze' which lets a non-admin user look at the booze which is loaded in the dispensers, as well as all possible booze, and look at what drinks can be created with different Booze.

  RichGibson

  committed
  776b2ab

  Copy full SHA for 776b2ab

Commits on Mar 9, 2016

• minor wording change

  RichGibson

  committed
  59951b0

  Copy full SHA for 59951b0

Commits on Mar 10, 2016

• trending now has options to show drinks for a date range, and to show 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.

  RichGibson

  committed
  ae3bb5c

  Copy full SHA for ae3bb5c

• Trending drinks improvement for a first pass at issue 105. Shows the drinks by date on the trending page, along with the ability to see the drinks for each day. Implements 'bartendro standard time'…

  Show description for 70750b3
  RichGibson

  committed
  70750b3

  Copy full SHA for 70750b3

• Added the drink size underneath the list of ingredients. This is a duplicate of the obvious drink size on the right side, but it seemed reasonable to me. ymmv.

  RichGibson

  committed
  fa727e0

  Copy full SHA for fa727e0

• Merge branch 'trending_105'

  Show description for 396d92e
  RichGibson

  committed
  396d92e

  Copy full SHA for 396d92e

Commits on Mar 11, 2016

• remove call to deprected explore module

  RichGibson

  committed
  d35a7c1

  Copy full SHA for d35a7c1

Commits on Mar 12, 2016

• Issue 58 - Save As New option. Select an existing drink, change the name and ingredients if desired, and then it will be saved as a new item.

  RichGibson

  committed
  9849ae7

  Copy full SHA for 9849ae7

• This commit fixes Issue #58 - Save As New option. Select an existing drink, change the name and ingredients if desired, and then it will be saved as a new item.

  RichGibson

  committed
  c7a9381

  Copy full SHA for c7a9381

• Merge branch 'save_as_new_58' of github.com:RichGibson/bartendro into save_as_new_58

  RichGibson

  committed
  bd45cbb

  Copy full SHA for bd45cbb

Commits on Mar 18, 2019

• added a test endpoint 'snooze' and other minor changes

  RichGibson

  committed
  0978a5e

  Copy full SHA for 0978a5e

Commits on Mar 25, 2019

• start of controlling hello drinkbot

  RichGibson

  committed
  ae2ddb1

  Copy full SHA for ae2ddb1

• mostly wrapped sql in sqlalchemy text()

  RichGibson

  committed
  e360b79

  Copy full SHA for e360b79

• merge code, and add inital use of adafruit library for motor control

  RichGibson

  committed
  4744810

  Copy full SHA for 4744810

Commits on Mar 26, 2019

• added hello_drinkbot_driver which replaces RouterDriver

  RichGibson

  committed
  3568fac

  Copy full SHA for 3568fac

• Merge branch 'hello_drinkbot' of github.com:RichGibson/bartendro into hello_drinkbot

  Show description for 7d42421
  RichGibson

  committed
  7d42421

  Copy full SHA for 7d42421

• fix accidental delete of a line

  RichGibson

  committed
  9f3fc19

  Copy full SHA for 9f3fc19

Commits on Apr 8, 2019

• new driver in progress. correct pumps come on, but not yet for the correct time.

  RichGibson

  committed
  663c4a9

  Copy full SHA for 663c4a9

• Merge hello_drinkbot branch into master.

  RichGibson

  committed
  0c6b1f5

  Copy full SHA for 0c6b1f5

• added todos

  RichGibson

  committed
  3fcdbc9

  Copy full SHA for 3fcdbc9

• added commands to stop() so it should turn motors off

  RichGibson

  committed
  89f50e9

  Copy full SHA for 89f50e9

Commits on Apr 9, 2019

• converted from dispense ticks to dispense ml

  RichGibson

  committed
  4024a3c

  Copy full SHA for 4024a3c

Commits on Apr 12, 2019

• tweaks to get it to run

  RichGibson

  committed
  1bbfc60

  Copy full SHA for 1bbfc60

Commits on Apr 13, 2019

• fixed number of pumps

  RichGibson

  committed
  a81cea6

  Copy full SHA for a81cea6

• 60/100 seconds per ml

  RichGibson

  committed
  ae9497b

  Copy full SHA for ae9497b

• seconds per ml

  RichGibson

  committed
  369e913

  Copy full SHA for 369e913

• hopefully seconds per ml correct

  RichGibson

  committed
  58abcf3

  Copy full SHA for 58abcf3

• fixed explore booze by adding text(), and work on getting stop to work. Incomplete.

  RichGibson

  committed
  a367d09

  Copy full SHA for a367d09

Commits on Apr 22, 2019

• Solved my port/dispenser/sibling mismatches. Now appears to dispense eight pumps correctly

  RichGibson

  committed
  0db8e07

  Copy full SHA for 0db8e07

• removed a bartendro router specific error

  RichGibson

  committed
  a377ecf

  Copy full SHA for a377ecf

Commits on May 5, 2019

• fixed 'trending' by adding 'text' wrapper around sql satements

  RichGibson

  committed
  c3f089c

  Copy full SHA for c3f089c

Commits on May 13, 2019

• added graphic shots menu, with 'image' field in booze table. it points to an image in content/static/images. put an image in that directory, then add the image name to the booze.image field

  

  Rich Gibson

  committed
  dc91d01

  Copy full SHA for dc91d01

Commits on May 22, 2019

• add images for graphical view, start of adding edit of the graphical view images, and start of an api

  

  Rich Gibson

  committed
  79ec506

  Copy full SHA for 79ec506

• includes first torani syrups, and images

  

  Rich Gibson

  committed
  02e7847

  Copy full SHA for 02e7847

• fixed admin->debug by initializing the log. Also wrapped the adafruit 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 har…

  Show description for 261a2ea
  RichGibson

  committed
  261a2ea

  Copy full SHA for 261a2ea

• added api endpoints /booze/all and /booze/loaded. They return json with booze id and booze name

  RichGibson

  committed
  69a03ed

  Copy full SHA for 69a03ed

• Added api endpoints for /drink/all and /drink/available

  RichGibson

  committed
  100fb0f

  Copy full SHA for 100fb0f

Commits on May 30, 2019

• added ws_make_drink/id?size= to the api options

  RichGibson

  committed
  1c225d5

  Copy full SHA for 1c225d5

Commits on Apr 1, 2021

• Modified files to fix active menu issue

  Show description for 5ec7756
  JBG2018

  authored
  5ec7756

  Copy full SHA for 5ec7756

Commits on Apr 2, 2021

• Merge pull request #1 from JBG2018/master

  Show description for 77d4f4b
  RichGibson

  authored
  77d4f4b

  Copy full SHA for 77d4f4b

Commits on Jul 8, 2022

• Changed default database to include the drink image name

  RichGibson

  committed
  7b2971e

  Copy full SHA for 7b2971e

• Wrapped query('foo') calls in text. query(text('foo')) because SQLAlchemy now wants that.

  RichGibson

  committed
  bcdf849

  Copy full SHA for bcdf849

• Added hellodrinkbot quickstart instructions

  RichGibson

  committed
  cd80bb0

  Copy full SHA for cd80bb0

• fixed README

  RichGibson

  committed
  93e147d

  Copy full SHA for 93e147d

• work on converting to python 3

  RichGibson

  committed
  d7dab3d

  Copy full SHA for d7dab3d

Commits on Jul 26, 2022

• debug code, delete soon

  RichGibson

  committed
  5e96637

  Copy full SHA for 5e96637

Commits on Jul 28, 2022

• Lots of changes to get the code to run under Python 3. Also added doc strings, and tried to fix some bugs.

  RichGibson

  committed
  40c7fd0

  Copy full SHA for 40c7fd0

• added doc string, and fixed a type.

  RichGibson

  committed
  a3405ad

  Copy full SHA for a3405ad

Commits on Aug 13, 2022

• Added older dev notes to README_DEV.md

  RichGibson

  committed
  9ad331b

  Copy full SHA for 9ad331b

Commits on Aug 26, 2022

• Needed to make confusing changes to get bartendro to run. Some things were deprecated, and general confusion.

  RichGibson

  committed
  658647c

  Copy full SHA for 658647c

• added ws_dispense_ml api endpoint

  RichGibson

  committed
  588ee5b

  Copy full SHA for 588ee5b

• the big change is that hello_drinkbot_driver is fixed so the pumps are addressed in the expected order.

  RichGibson

  committed
  9292bbd

  Copy full SHA for 9292bbd

• Merging version that had the fixes to fix the dispenser numbering issue.

  RichGibson

  committed
  ff42b30

  Copy full SHA for ff42b30

• ws_dispense_ml mostly works. There is an oddity when called from Ukranian 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…

  Show description for fd542fc
  RichGibson

  committed
  fd542fc

  Copy full SHA for fd542fc

• New ws/dispense api end point

  RichGibson

  committed
  eca1653

  Copy full SHA for eca1653

Commits on Aug 31, 2022

• Fixed bug in 'image' that I created.

  RichGibson

  committed
  8eab950

  Copy full SHA for 8eab950

Commits on Sep 16, 2022

• messing with start script

  RichGibson

  committed
  181b1b0

  Copy full SHA for 181b1b0

• I don't know why this wasn't already merged. Merge branch 'sept2_merge'

  RichGibson

  committed
  645ed8d

  Copy full SHA for 645ed8d

Commits on Jun 27, 2024

• Removed ext style import

  RichGibson

  committed
  dfddfe4

  Copy full SHA for dfddfe4

Commits on Jun 28, 2024

• fixing flask.ext

  RichGibson

  committed
  69d213d

  Copy full SHA for 69d213d