From 0b760577c66522f00e95cda006356201170f5c58 Mon Sep 17 00:00:00 2001 From: Davide Bongiovanni Date: Sat, 1 Dec 2018 18:25:08 +0100 Subject: [PATCH] Preserving datetime objects in upcoming meals passed to template --- kukv1.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kukv1.py b/kukv1.py index 1dd4186..95000a9 100644 --- a/kukv1.py +++ b/kukv1.py @@ -64,16 +64,16 @@ def getUpcomingMeals(): meals.append(dict(row)) seconds_to_deadline = (meals[-1]['selection_deadline'] - datetime.datetime.now()).total_seconds() if seconds_to_deadline < 0: - meals[-1]['selection_deadline'] = 'Deadline passed' + meals[-1]['friendly_selection_deadline'] = '' elif seconds_to_deadline > 3600: hours_td = round(seconds_to_deadline / 3600) days_td = int(hours_td / 24) hours_td = hours_td % 24 - meals[-1]['selection_deadline'] = str(days_td) + ' days ' + str(hours_td) + ' hours' + meals[-1]['friendly_selection_deadline'] = str(days_td) + ' days ' + str(hours_td) + ' hours' else: - meals[-1]['selection_deadline'] = str(round(seconds_to_deadline / 60)) + ' minutes' + meals[-1]['friendly_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') + meals[-1]['meal_friendly_date'] = meals[-1]['meal_date'].strftime('%A %d %B') meals[-1]['candidate'] = 'davide' r.close() return meals