# HG changeset patch # User Paul Boddie # Date 1505240858 -7200 # Node ID 333740ca50b667e726056f9c8137635ec1f5ad6d # Parent 3835eb7e67296a4dc5dbf88bf8633e2e2ed31ff7 Consider period replacement status when comparing form periods. diff -r 3835eb7e6729 -r 333740ca50b6 imipweb/data.py --- a/imipweb/data.py Tue Sep 12 18:33:53 2017 +0200 +++ b/imipweb/data.py Tue Sep 12 20:27:38 2017 +0200 @@ -86,7 +86,7 @@ isinstance(self.start, datetime) or isinstance(self.end, datetime), self.tzid, self.origin, - self.replaced + self.replaced and True or False ) def get_form_date(self, dt, attr=None): @@ -119,6 +119,13 @@ def __repr__(self): return "FormPeriod%r" % (self.as_tuple(),) + def __cmp__(self, other): + result = RecurringPeriod.__cmp__(self, other) + if result: + return result + other = form_period_from_period(other) + return cmp(self.replaced, other.replaced) + def as_event_period(self, index=None): """