diff --git a/kukv1.py b/kukv1.py index 923cc92..61c1a3a 100644 --- a/kukv1.py +++ b/kukv1.py @@ -80,10 +80,7 @@ def getUpcomingMeals(): meals = [] for row in r: meals.append(dict(row)) - print (meals) - print ('deadline ' + str(meals[-1]['selection_deadline'] )) seconds_to_deadline = (meals[-1]['selection_deadline'] - datetime.datetime.now()).total_seconds() - print(str(seconds_to_deadline) + ' s to dead') if seconds_to_deadline < 0: meals[-1]['selection_deadline'] = 'Deadline passed' elif seconds_to_deadline > 3600: @@ -93,6 +90,8 @@ def getUpcomingMeals(): meals[-1]['selection_deadline'] = str(days_td) + ' days ' + str(hours_td) + ' hours' else: meals[-1]['selection_deadline'] = str(round(seconds_to_deadline / 60)) + ' minutes' + meals[-1]['meal_time'] = meals[-1]['meal_date'].strftime('%H:%M') + meals[-1]['meal_date'] = meals[-1]['meal_date'].strftime('%A %d %B') r.close() return meals diff --git a/static/style.css b/static/style.css index 5cc3a66..bf87d02 100644 --- a/static/style.css +++ b/static/style.css @@ -92,7 +92,7 @@ h2 { .flex-card p { font-size: 14px; text-align: center; - line-height: 200%; + line-height: 280%; } .rect-button span { diff --git a/templates/meal_list.html b/templates/meal_list.html index 2cfeb86..7f64720 100644 --- a/templates/meal_list.html +++ b/templates/meal_list.html @@ -33,13 +33,16 @@
{% if meal.kuk != "" %} WILL cook for
{% for e in meal.eaters %} {% endfor %}{% else %} SHOULD cook for
{% for e in meal.eaters %} {% endfor %}{% endif %}