From face54c135748e1a90d31f142fac79210460d156 Mon Sep 17 00:00:00 2001
From: Tilman Vatteroth <tilman.vatteroth@udo.edu>
Date: Wed, 20 Jun 2018 09:46:39 +0200
Subject: [PATCH] * Tageberechnung verbessert.
---
program_info.py | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/program_info.py b/program_info.py
index 90890951..dc80f581 100644
--- a/program_info.py
+++ b/program_info.py
@@ -104,14 +104,25 @@ class ProgramInfo:
requests.get(url="https://ufc.tu-dortmund.de/semesters/current.json").text
)
- def get_next_event(self, day_diff, just_print=False):
+ def get_next_event(self, wanted_day_diff, just_print=False):
# Finde das nächste Event, dass nach heute ist und in `day_diff` Tagen stattfindet.
now = UTC.localize(
datetime.datetime.now()
)
for i in self.semester:
d = date_parser.parse(i["date"])
- if d > now and (d - now).days <= day_diff:
+ if d < now:
+ continue
+
+ diff = (d - now)
+ if now.date() == d.date():
+ day_diff = 0
+ elif now.time() > d.time():
+ day_diff = diff.days + 1
+ elif now.time() <= d.time():
+ day_diff = diff.days
+
+ if d > now and day_diff <= wanted_day_diff:
if just_print:
pprint(i)
else:
--
GitLab