1.1 --- a/macros/EventAggregator.py Thu Mar 26 01:04:02 2009 +0100
1.2 +++ b/macros/EventAggregator.py Thu Mar 26 01:40:33 2009 +0100
1.3 @@ -45,13 +45,29 @@
1.4 # Macro functions.
1.5
1.6 def getMonth(arg):
1.7 + n = None
1.8 +
1.9 if arg.startswith("current"):
1.10 date = EventAggregatorSupport.getCurrentMonth()
1.11 if len(arg) > 8:
1.12 n = int(arg[7:])
1.13 - date = EventAggregatorSupport.monthupdate(date, n)
1.14 +
1.15 + elif arg.startswith("yearstart"):
1.16 + date = (EventAggregatorSupport.getCurrentYear(), 1)
1.17 + if len(arg) > 10:
1.18 + n = int(arg[9:])
1.19 +
1.20 + elif arg.startswith("yearend"):
1.21 + date = (EventAggregatorSupport.getCurrentYear(), 12)
1.22 + if len(arg) > 8:
1.23 + n = int(arg[7:])
1.24 +
1.25 else:
1.26 date = EventAggregatorSupport.getMonth(arg)
1.27 +
1.28 + if n is not None:
1.29 + date = EventAggregatorSupport.monthupdate(date, n)
1.30 +
1.31 return date
1.32
1.33 def getFormMonth(request, calendar_name, argname):