From: Frédéric Péters Date: Mon, 11 Nov 2019 16:11:00 +0000 (+0100) Subject: keep first program then everything but nonstop slots X-Git-Url: https://git.0d.be/?p=panikweb.git;a=commitdiff_plain;h=a6d50dce1bd1df6b85e24ab7df04e0b1bfccbbb9 keep first program then everything but nonstop slots --- diff --git a/panikweb/paniktags/templatetags/paniktags.py b/panikweb/paniktags/templatetags/paniktags.py index 6a2d2de..c69632c 100644 --- a/panikweb/paniktags/templatetags/paniktags.py +++ b/panikweb/paniktags/templatetags/paniktags.py @@ -162,8 +162,17 @@ def aroundview(year=None, week=None): date = utils.tofirstdayinisoweek(year, week) date = datetime(*date.timetuple()[:3]) + now = date = datetime.now() program = period_program(date, date+timedelta(days=7))[:20] + # keep first program then everything but nonstop slots + program = [program[0]] + [x for x in program if x.get_duration() != 0] + for slot in program: + if slot.get_duration() and slot.datetime > now and slot.end_datetime() < now: + slot.currently_playing = True + break + else: + program[0].currently_playing = True # first slot, nonstop return { 'program': program,