[PATCH coffee-flask] Add new beverage `tea` and make buttons larger
--- coffee_db.sql | 3 ++- templates/user.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/coffee_db.sql b/coffee_db.sql index 5c65d11..23011af 100644 --- a/coffee_db.sql +++ b/coffee_db.sql @@ -16,7 +16,8 @@ insert or ignore into flavors values ("cappuccino", 1), ("latte macchiato", 4), ("Club-Mate 0,5 l", 5), - ("Club-Mate 0,33 l", 6) + ("Club-Mate 0,33 l", 6), + ("tea", 7) ; create table if not exists coffees ( diff --git a/templates/user.html b/templates/user.html index 3b549be..e0be310 100644 --- a/templates/user.html +++ b/templates/user.html @@ -18,11 +18,12 @@ {% if flavors %} <form> {% for flavor in flavors %} - <input type="button" value="{{ flavor }}" onclick="addCoffee(this.value)"> + <input type="button" value="{{ flavor }}" onclick="addCoffee(this.value)" style="padding: 1.2%; margin: 3px"> {% endfor %} </form> {% endif %} </p> + <br /> <p> <form> <label for="username">Username:</label> -- 2.7.4
On Mon, Nov 11, 2019 at 01:31:36PM +0100, Jaroslav Klapalek wrote:
--- coffee_db.sql | 3 ++- templates/user.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/coffee_db.sql b/coffee_db.sql index 5c65d11..23011af 100644 --- a/coffee_db.sql +++ b/coffee_db.sql @@ -16,7 +16,8 @@ insert or ignore into flavors values ("cappuccino", 1), ("latte macchiato", 4), ("Club-Mate 0,5 l", 5), - ("Club-Mate 0,33 l", 6) + ("Club-Mate 0,33 l", 6), + ("tea", 7)
As this is python, I suppose to add yet another `,` at the end to eliminate awkward -++ patches, ie: - ("Club-Mate 0,33 l", 6) + ("Club-Mate 0,33 l", 6), + ("tea", 7),
;
Why this? BTW, what is with the tea? How is it related to coffee machine or payment system? jiri
Dne 12. 11. 19 v 10:03 Jiri Vlasak napsal(a):
On Mon, Nov 11, 2019 at 01:31:36PM +0100, Jaroslav Klapalek wrote:
--- coffee_db.sql | 3 ++- templates/user.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/coffee_db.sql b/coffee_db.sql index 5c65d11..23011af 100644 --- a/coffee_db.sql +++ b/coffee_db.sql @@ -16,7 +16,8 @@ insert or ignore into flavors values ("cappuccino", 1), ("latte macchiato", 4), ("Club-Mate 0,5 l", 5), - ("Club-Mate 0,33 l", 6) + ("Club-Mate 0,33 l", 6), + ("tea", 7) As this is python, I suppose to add yet another `,` at the end to eliminate awkward -++ patches, ie:
- ("Club-Mate 0,33 l", 6) + ("Club-Mate 0,33 l", 6), + ("tea", 7), As this is not Python, but SQL, we should probably leave it this way. :-) (But maybe SQL can handle this as well.)
; Why this?
BTW, what is with the tea? How is it related to coffee machine or payment system?
Just to show that we also like our schedule-oriented coworkers. :-)
jiri
J.
On Tue, Nov 12, 2019 at 10:26:37AM +0100, Jaroslav Klapálek wrote:
Dne 12. 11. 19 v 10:03 Jiri Vlasak napsal(a):
On Mon, Nov 11, 2019 at 01:31:36PM +0100, Jaroslav Klapalek wrote:
--- coffee_db.sql | 3 ++- templates/user.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/coffee_db.sql b/coffee_db.sql index 5c65d11..23011af 100644 --- a/coffee_db.sql +++ b/coffee_db.sql @@ -16,7 +16,8 @@ insert or ignore into flavors values ("cappuccino", 1), ("latte macchiato", 4), ("Club-Mate 0,5 l", 5), - ("Club-Mate 0,33 l", 6) + ("Club-Mate 0,33 l", 6), + ("tea", 7) As this is python, I suppose to add yet another `,` at the end to eliminate awkward -++ patches, ie:
- ("Club-Mate 0,33 l", 6) + ("Club-Mate 0,33 l", 6), + ("tea", 7), As this is not Python, but SQL, we should probably leave it this way. :-) (But maybe SQL can handle this as well.)
; Why this?
Oh, I got it now. So I am proposing to reverse all the entries then, ie: ("Club-Mate 0,33 l", 6), ... ("...", 2), ("cappuccino", 1) To get rid of the awkward patches.
BTW, what is with the tea? How is it related to coffee machine or payment system?
Just to show that we also like our schedule-oriented coworkers. :-)
I am not strongly against this. However, I think that adding tea with no bindig to coffee machine nor payment system introduces undesired and unenforceable overhead. jiri
On Tue, Nov 12 2019, Jiri Vlasak wrote:
BTW, what is with the tea? How is it related to coffee machine or payment system?
Just to show that we also like our schedule-oriented coworkers. :-)
I am not strongly against this. However, I think that adding tea with no bindig to coffee machine nor payment system introduces undesired and unenforceable overhead.
But another use for the coffee terminal is to produce data for nice drink-related statistics of your department. And I can imagine that tea drinkers are sad due to not appearing in those statistics :-) So I'll apply this patch. -Michal
participants (4)
-
Jaroslav Klapalek -
Jaroslav Klapálek
-
Jiri Vlasak -
Michal Sojka