1.1 --- a/imipweb/event.py Mon Sep 28 00:03:47 2015 +0200
1.2 +++ b/imipweb/event.py Mon Sep 28 00:28:39 2015 +0200
1.3 @@ -20,7 +20,7 @@
1.4 """
1.5
1.6 from imiptools.data import get_uri, uri_dict, uri_items, uri_values
1.7 -from imiptools.dates import to_timezone
1.8 +from imiptools.dates import format_datetime, to_timezone
1.9 from imiptools.mail import Messenger
1.10 from imiptools.period import have_conflict
1.11 from imipweb.data import EventPeriod, event_period_from_period, FormPeriod, PeriodError
1.12 @@ -483,6 +483,9 @@
1.13 "Show any counter-proposals for the current object."
1.14
1.15 page = self.page
1.16 + query = self.env.get_query()
1.17 + counter = query.get("counter", [None])[0]
1.18 +
1.19 attendees = self._get_counters(self.uid, self.recurrenceid)
1.20 tzid = self.get_tzid()
1.21
1.22 @@ -508,15 +511,17 @@
1.23 obj = self.get_stored_object(self.uid, self.recurrenceid, "counters", attendee)
1.24 periods = self.get_periods(obj)
1.25
1.26 - page.tr(rowspan=len(periods))
1.27 - page.td(attendee)
1.28 -
1.29 first = True
1.30 for p in periods:
1.31 - if not first:
1.32 - page.tr()
1.33 + identifier = "%s-%s" % (format_datetime(p.get_start_point()), format_datetime(p.get_end_point()))
1.34 + css = identifier == counter and "selected" or ""
1.35 +
1.36 + if first:
1.37 + page.tr(rowspan=len(periods), class_=css)
1.38 + page.td(attendee)
1.39 + first = False
1.40 else:
1.41 - first = False
1.42 + page.tr(class_=css)
1.43
1.44 start = self.format_datetime(to_timezone(p.get_start(), tzid), "long")
1.45 end = self.format_datetime(to_timezone(p.get_end(), tzid), "long")