From 360d1e280227e3845d02ced5a4611e9448266bc8 Mon Sep 17 00:00:00 2001 From: David Martin Date: Sat, 26 Aug 2017 19:45:39 +1000 Subject: [PATCH] Store whether financial year wraps instead of re-determining it. It either wraps or it does not depending on how it is set in the config. There is no point in determining it again for each document. Instead we simply store it as a member variable the first time we check. --- src/documents/admin.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/documents/admin.py b/src/documents/admin.py index 85c04405a..e96e0f04a 100644 --- a/src/documents/admin.py +++ b/src/documents/admin.py @@ -38,6 +38,7 @@ class FinancialYearFilter(admin.SimpleListFilter): title = "Financial Year" parameter_name = "fy" + _fy_wraps = None def _fy_start(self, year): """Return date of the start of financial year for the given year.""" @@ -51,12 +52,14 @@ class FinancialYearFilter(admin.SimpleListFilter): def _fy_does_wrap(self): """Return whether the financial year spans across two years.""" - start = "{}".format(settings.FY_START) - start = datetime.strptime(start, "%m-%d").date() - end = "{}".format(settings.FY_END) - end = datetime.strptime(end, "%m-%d").date() + if self._fy_wraps is None: + start = "{}".format(settings.FY_START) + start = datetime.strptime(start, "%m-%d").date() + end = "{}".format(settings.FY_END) + end = datetime.strptime(end, "%m-%d").date() + self._fy_wraps = end < start - return end < start + return self._fy_wraps def _determine_fy(self, date): """Return a (query, display) financial year tuple of the given date."""