changeset 42 | fa5694ee0f98 |
parent 41 | 36d029a47d37 |
child 46 | 547940cb0e1c |
--- a/svv/cal.py Sat Jan 08 23:52:47 2011 +0200 +++ b/svv/cal.py Sun Jan 09 00:09:40 2011 +0200 @@ -127,6 +127,7 @@ return self.session.query(Order).filter( (Order.event_start.between(start, end)) | (Order.event_end.between(start, end)) + | (db.between(start, Order.event_start, Order.event_end)) ).order_by(Order.event_start).all() def render_week (self, month, week) :