1.1 --- a/actions/EventAggregatorSummary.py Sun Jan 16 19:30:01 2011 +0100
1.2 +++ b/actions/EventAggregatorSummary.py Mon Jan 17 02:26:17 2011 +0100
1.3 @@ -25,22 +25,13 @@
1.4
1.5 "A summary dialogue requesting various parameters."
1.6
1.7 - def get_evaluated_label(self, evaluated):
1.8 - _ = self._
1.9 - request = self.request
1.10 -
1.11 - if isinstance(evaluated, EventAggregatorSupport.Date):
1.12 - return EventAggregatorSupport.getFullDateLabel(request, evaluated)
1.13 - elif isinstance(evaluated, EventAggregatorSupport.Month):
1.14 - return EventAggregatorSupport.getFullMonthLabel(request, evaluated)
1.15 - else:
1.16 - return ""
1.17 -
1.18 def get_form_html(self, buttons_html):
1.19 _ = self._
1.20 request = self.request
1.21 form = self.get_form()
1.22
1.23 + resolution = form.get("resolution", ["month"])[0]
1.24 +
1.25 category_list = []
1.26 category_pagenames = form.get("category", [])
1.27
1.28 @@ -64,13 +55,18 @@
1.29 start_criteria_default = form.get("start", [""])[0]
1.30 end_criteria_default = form.get("end", [""])[0]
1.31
1.32 - start_criteria_evaluated = EventAggregatorSupport.getParameterDate(start_criteria_default) or \
1.33 - EventAggregatorSupport.getParameterMonth(start_criteria_default)
1.34 - end_criteria_evaluated = EventAggregatorSupport.getParameterDate(end_criteria_default) or \
1.35 - EventAggregatorSupport.getParameterMonth(end_criteria_default)
1.36 + if resolution == "date":
1.37 + get_parameter = EventAggregatorSupport.getParameterDate
1.38 + get_label = EventAggregatorSupport.getFullDateLabel
1.39 + else:
1.40 + get_parameter = EventAggregatorSupport.getParameterMonth
1.41 + get_label = EventAggregatorSupport.getFullMonthLabel
1.42
1.43 - start_criteria_evaluated = self.get_evaluated_label(start_criteria_evaluated)
1.44 - end_criteria_evaluated = self.get_evaluated_label(end_criteria_evaluated)
1.45 + start_criteria_evaluated = get_parameter(start_criteria_default)
1.46 + end_criteria_evaluated = get_parameter(end_criteria_default)
1.47 +
1.48 + start_criteria_evaluated = get_label(request, start_criteria_evaluated)
1.49 + end_criteria_evaluated = get_label(request, end_criteria_evaluated)
1.50
1.51 # Descriptions.
1.52
1.53 @@ -267,18 +263,18 @@
1.54
1.55 if isinstance(calendar_start, EventAggregatorSupport.Date):
1.56 if isinstance(calendar_end, EventAggregatorSupport.Date):
1.57 - mode = "day"
1.58 + resolution = "date"
1.59 else:
1.60 calendar_start = calendar_start.as_month()
1.61 - mode = "month"
1.62 + resolution = "month"
1.63 else:
1.64 - mode = "month"
1.65 + resolution = "month"
1.66 if isinstance(calendar_end, EventAggregatorSupport.Date):
1.67 calendar_end = calendar_end.as_month()
1.68
1.69 events, shown_events, all_shown_events, earliest, latest = \
1.70 EventAggregatorSupport.getEvents(request, category_names, calendar_start, calendar_end,
1.71 - mode == "day" and "day" or "month")
1.72 + resolution)
1.73
1.74 latest_timestamp = EventAggregatorSupport.setEventTimestamps(request, all_shown_events)
1.75