diff --git a/kukv1.py b/kukv1.py index 95000a9..d4c34c7 100644 --- a/kukv1.py +++ b/kukv1.py @@ -75,6 +75,10 @@ def getUpcomingMeals(): meals[-1]['meal_time'] = meals[-1]['meal_date'].strftime('%H:%M') meals[-1]['meal_friendly_date'] = meals[-1]['meal_date'].strftime('%A %d %B') meals[-1]['candidate'] = 'davide' + if (meals[-1]['meal_date'] - datetime.datetime.now()).total_seconds() < 0: + meals[-1]['needs_confirmation'] = True + else: + meals[-1]['needs_confirmation'] = False r.close() return meals diff --git a/templates/meal_list.html b/templates/meal_list.html index 666dca9..9623307 100644 --- a/templates/meal_list.html +++ b/templates/meal_list.html @@ -38,10 +38,14 @@ {% if loop.index != 1 and (meal.meal_friendly_date != meals[loop.index - 2].meal_friendly_date) %}

{{meal.meal_friendly_date}}

{% endif %} + {% if meal.needs_confirmation %} +
+ {% else %}
- {{meal.meal_time}} -

{% if meal.kuk != "" %}    WILL{% else %}    SHOULD{% endif%} cook for
{% for e in meal.eaters %}  {% endfor %}

- {% if meal.friendly_selection_deadline != '' %}Confirmed in {{meal.friendly_selection_deadline}}{% else %}Confirmed.{% endif %} + {% endif %} + {{meal.meal_time}} +

{% if meal.needs_confirmation %}Has  {% endif %}{% if meal.kuk != "" %}   {% if not meal.needs_confirmation %}WILL{% endif %}{% else %}   {% if not meal.needs_confirmation %}SHOULD{% endif %}{% endif%} cook{% if meal.needs_confirmation %}ed{% endif %} for
{% for e in meal.eaters %}  {% endfor %}{% if meal.needs_confirmation %}?{% endif %}

+ {% if meal.needs_confirmation %}Please verify.{% else %}{% if meal.friendly_selection_deadline != '' %}Confirmed in {{meal.friendly_selection_deadline}}{% else %}Confirmed.{% endif %}{% endif %}
{% endfor%}