1.1 --- a/actions/EventAggregatorSummary.py Thu Jul 08 22:18:54 2010 +0200
1.2 +++ b/actions/EventAggregatorSummary.py Fri Jul 09 01:56:45 2010 +0200
1.3 @@ -48,6 +48,19 @@
1.4 start_month_list, end_month_list = self.get_month_lists()
1.5 start_year_default, end_year_default = self.get_year_defaults()
1.6
1.7 + # Criteria instead of months and years.
1.8 +
1.9 + start_criteria_default = form.get("start", [""])[0]
1.10 + end_criteria_default = form.get("end", [""])[0]
1.11 +
1.12 + start_criteria_evaluated = EventAggregatorSupport.getParameterMonth(start_criteria_default)
1.13 + end_criteria_evaluated = EventAggregatorSupport.getParameterMonth(end_criteria_default)
1.14 +
1.15 + start_criteria_evaluated = start_criteria_evaluated and \
1.16 + EventAggregatorSupport.getFullMonthLabel(request, start_criteria_evaluated) or ""
1.17 + end_criteria_evaluated = end_criteria_evaluated and \
1.18 + EventAggregatorSupport.getFullMonthLabel(request, end_criteria_evaluated) or ""
1.19 +
1.20 # Descriptions.
1.21
1.22 descriptions = form.get("descriptions", [None])[0]
1.23 @@ -71,11 +84,19 @@
1.24 "category_label" : _("Categories"),
1.25 "category_list" : "\n".join(category_list),
1.26 "start_month_list" : "\n".join(start_month_list),
1.27 - "start_label" : _("Start year and month"),
1.28 + "start_label" : _("Start month and year"),
1.29 "start_year_default" : start_year_default,
1.30 + "start_criteria_label" : _("or special criteria"),
1.31 + "start_criteria_default": start_criteria_default,
1.32 + "start_eval_label" : _(">>"),
1.33 + "start_criteria_eval" : start_criteria_evaluated,
1.34 "end_month_list" : "\n".join(end_month_list),
1.35 - "end_label" : _("End year and month"),
1.36 + "end_label" : _("End month and year"),
1.37 "end_year_default" : end_year_default,
1.38 + "end_criteria_label" : _("or special criteria"),
1.39 + "end_criteria_default" : end_criteria_default,
1.40 + "end_eval_label" : _(">>"),
1.41 + "end_criteria_eval" : end_criteria_evaluated,
1.42 "descriptions_label" : _("Use descriptions from..."),
1.43 "descriptions_list" : "\n".join(descriptions_list),
1.44 "format_label" : _("Summary format"),
1.45 @@ -104,6 +125,14 @@
1.46 </td>
1.47 </tr>
1.48 <tr>
1.49 + <td class="label"><label>%(start_criteria_label)s</label></td>
1.50 + <td>
1.51 + <input name="start" type="text" value="%(start_criteria_default)s" size="12" />
1.52 + <input name="start-eval" type="submit" value="%(start_eval_label)s" />
1.53 + %(start_criteria_eval)s
1.54 + </td>
1.55 + </tr>
1.56 + <tr>
1.57 <td class="label"><label>%(end_label)s</label></td>
1.58 <td>
1.59 <select name="end-month">
1.60 @@ -113,6 +142,14 @@
1.61 </td>
1.62 </tr>
1.63 <tr>
1.64 + <td class="label"><label>%(end_criteria_label)s</label></td>
1.65 + <td>
1.66 + <input name="end" type="text" value="%(end_criteria_default)s" size="12" />
1.67 + <input name="end-eval" type="submit" value="%(end_eval_label)s" />
1.68 + %(end_criteria_eval)s
1.69 + </td>
1.70 + </tr>
1.71 + <tr>
1.72 <td class="label"><label>%(descriptions_label)s</label></td>
1.73 <td class="content">
1.74 <select name="descriptions">