From 43ba5b6619cfd8aab9c5c98c582cff5d687b36f4 Mon Sep 17 00:00:00 2001 From: Michael Blatherwick Date: Thu, 21 May 2020 13:00:55 +0100 Subject: [PATCH] Neaten up the logic to make it less fragile --- cla_common/__init__.py | 2 +- cla_common/call_centre_availability/__init__.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cla_common/__init__.py b/cla_common/__init__.py index 260c070..f9aa3e1 100644 --- a/cla_common/__init__.py +++ b/cla_common/__init__.py @@ -1 +1 @@ -__version__ = "0.3.1" +__version__ = "0.3.2" diff --git a/cla_common/call_centre_availability/__init__.py b/cla_common/call_centre_availability/__init__.py index 3b5cdf0..98a9829 100644 --- a/cla_common/call_centre_availability/__init__.py +++ b/cla_common/call_centre_availability/__init__.py @@ -187,10 +187,10 @@ def available(self, dt, ignore_time=False): if on_day(dt): if hours is None: return False - if not ignore_time and dt not in hours: - return False - - return True + if ignore_time: + return True + return dt in hours + return False def can_schedule_callback(self, dt, ignore_time=False): if in_the_past(dt):