--- a/web/views/old_calendar.py Wed Sep 23 19:26:38 2009 +0200
+++ b/web/views/old_calendar.py Wed Sep 23 19:40:19 2009 +0200
@@ -44,15 +44,15 @@
next1 = next_month(date, smallshift)
prev2 = previous_month(date, bigshift)
next2 = next_month(date, bigshift)
- rql = self.rset.printable_rql()
+ rql = self.cw_rset.printable_rql()
return self.NAV_HEADER % (
- xml_escape(self.build_url(rql=rql, vid=self.id, year=prev2.year,
+ xml_escape(self.build_url(rql=rql, vid=self.__regid__, year=prev2.year,
month=prev2.month)),
- xml_escape(self.build_url(rql=rql, vid=self.id, year=prev1.year,
+ xml_escape(self.build_url(rql=rql, vid=self.__regid__, year=prev1.year,
month=prev1.month)),
- xml_escape(self.build_url(rql=rql, vid=self.id, year=next1.year,
+ xml_escape(self.build_url(rql=rql, vid=self.__regid__, year=next1.year,
month=next1.month)),
- xml_escape(self.build_url(rql=rql, vid=self.id, year=next2.year,
+ xml_escape(self.build_url(rql=rql, vid=self.__regid__, year=next2.year,
month=next2.month)))
@@ -86,13 +86,13 @@
rows.append(u'<tr>%s%s</tr>' % (WEEKNUM_CELL % day.isocalendar()[1], ''.join(current_row)))
current_row = []
current_row.extend([NO_CELL] * (6-day.weekday()))
- rql = self.rset.printable_rql()
+ rql = self.cw_rset.printable_rql()
if day.weekday() != 6:
rows.append(u'<tr>%s%s</tr>' % (WEEKNUM_CELL % day.isocalendar()[1], ''.join(current_row)))
url = self.build_url(rql=rql, vid='calendarmonth',
year=first_day.year, month=first_day.month)
monthlink = u'<a href="%s">%s</a>' % (xml_escape(url), umonth)
- return CALENDAR(self.req) % (monthlink, '\n'.join(rows))
+ return CALENDAR(self._cw) % (monthlink, '\n'.join(rows))
def _mk_schedule(self, begin, end, itemvid='calendaritem'):
"""private method that gathers information from resultset
@@ -106,12 +106,12 @@
day2 : { hour : [views] } ... }
"""
# put this here since all sub views are calling this method
- self.req.add_css('cubicweb.calendar.css')
+ self._cw.add_css('cubicweb.calendar.css')
schedule = {}
- for row in xrange(len(self.rset.rows)):
- entity = self.rset.get_entity(row,0)
+ for row in xrange(len(self.cw_rset.rows)):
+ entity = self.cw_rset.get_entity(row,0)
infos = u'<div class="event">'
- infos += self.view(itemvid, self.rset, row=row)
+ infos += self.view(itemvid, self.cw_rset, row=row)
infos += u'</div>'
for date_ in entity.matching_dates(begin, end):
day = date(date_.year, date_.month, date_.day)
@@ -167,8 +167,8 @@
def call(self, year=None, month=None):
"""this view renders a 3x3 calendars' table"""
- year = year or int(self.req.form.get('year', date.today().year))
- month = month or int(self.req.form.get('month', date.today().month))
+ year = year or int(self._cw.form.get('year', date.today().year))
+ month = month or int(self._cw.form.get('month', date.today().month))
center_date = date(year, month, 1)
begin, end = self.get_date_range(day=center_date)
schedule = self._mk_schedule(begin, end)
@@ -185,8 +185,8 @@
title = _('calendar (semester)')
def call(self, year=None, month=None):
- year = year or int(self.req.form.get('year', date.today().year))
- month = month or int(self.req.form.get('month', date.today().month))
+ year = year or int(self._cw.form.get('year', date.today().year))
+ month = month or int(self._cw.form.get('month', date.today().month))
begin = previous_month(date(year, month, 1), 2)
end = next_month(date(year, month, 1), 3)
schedule = self._mk_schedule(begin, end)
@@ -198,15 +198,15 @@
def build_calendars(self, schedule, begin, end):
self.w(u'<tr>')
- rql = self.rset.printable_rql()
+ rql = self.cw_rset.printable_rql()
for cur_month in date_range(begin, end, incmonth=1):
umonth = u'%s %s' % (self.format_date(cur_month, '%B'), cur_month.year)
- url = self.build_url(rql=rql, vid=self.id,
+ url = self.build_url(rql=rql, vid=self.__regid__,
year=cur_month.year, month=cur_month.month)
self.w(u'<th colspan="2"><a href="%s">%s</a></th>' % (xml_escape(url),
umonth))
self.w(u'</tr>')
- _ = self.req._
+ _ = self._cw._
for day_num in xrange(31):
self.w(u'<tr>')
for cur_month in date_range(begin, end, incmonth=1):
@@ -233,8 +233,8 @@
title = _('calendar (month)')
def call(self, year=None, month=None):
- year = year or int(self.req.form.get('year', date.today().year))
- month = month or int(self.req.form.get('month', date.today().month))
+ year = year or int(self._cw.form.get('year', date.today().year))
+ month = month or int(self._cw.form.get('month', date.today().month))
center_date = date(year, month, 1)
begin, end = self.get_date_range(day=center_date, shift=1)
schedule = self._mk_schedule(begin, end)
@@ -250,8 +250,8 @@
title = _('calendar (week)')
def call(self, year=None, week=None):
- year = year or int(self.req.form.get('year', date.today().year))
- week = week or int(self.req.form.get('week', date.today().isocalendar()[1]))
+ year = year or int(self._cw.form.get('year', date.today().year))
+ week = week or int(self._cw.form.get('week', date.today().isocalendar()[1]))
day0 = date(year, 1, 1)
first_day_of_week = day0 - day0.weekday()*ONEDAY + ONEWEEK
begin, end = first_day_of_week- ONEWEEK, first_day_of_week + 2*ONEWEEK
@@ -266,8 +266,8 @@
self.w(self.nav_header(first_day_of_week))
def build_calendar(self, schedule, weeks):
- rql = self.rset.printable_rql()
- _ = self.req._
+ rql = self.cw_rset.printable_rql()
+ _ = self._cw._
for monday, sunday in weeks:
umonth = self.format_date(monday, '%B %Y')
url = self.build_url(rql=rql, vid='calendarmonth',
@@ -293,12 +293,12 @@
prev2 = date - ONEWEEK * bigshift
next1 = date + ONEWEEK * smallshift
next2 = date + ONEWEEK * bigshift
- rql = self.rset.printable_rql()
+ rql = self.cw_rset.printable_rql()
return self.NAV_HEADER % (
- xml_escape(self.build_url(rql=rql, vid=self.id, year=prev2.year, week=prev2.isocalendar()[1])),
- xml_escape(self.build_url(rql=rql, vid=self.id, year=prev1.year, week=prev1.isocalendar()[1])),
- xml_escape(self.build_url(rql=rql, vid=self.id, year=next1.year, week=next1.isocalendar()[1])),
- xml_escape(self.build_url(rql=rql, vid=self.id, year=next2.year, week=next2.isocalendar()[1])))
+ xml_escape(self.build_url(rql=rql, vid=self.__regid__, year=prev2.year, week=prev2.isocalendar()[1])),
+ xml_escape(self.build_url(rql=rql, vid=self.__regid__, year=prev1.year, week=prev1.isocalendar()[1])),
+ xml_escape(self.build_url(rql=rql, vid=self.__regid__, year=next1.year, week=next1.isocalendar()[1])),
+ xml_escape(self.build_url(rql=rql, vid=self.__regid__, year=next2.year, week=next2.isocalendar()[1])))
@@ -311,7 +311,7 @@
umonth = self.format_date(first_day, '%B %Y') # localized month name
rows = [] # each row is: (am,pm), (am,pm) ... week_title
current_row = [(NO_CELL, NO_CELL, NO_CELL)] * first_day.weekday()
- rql = self.rset.printable_rql()
+ rql = self.cw_rset.printable_rql()
for daynum in xrange(0, days_in_month(first_day)):
# build cells day
day = first_day + timedelta(daynum)
@@ -351,7 +351,7 @@
url = self.build_url(rql=rql, vid='ampmcalendarmonth',
year=first_day.year, month=first_day.month)
monthlink = '<a href="%s">%s</a>' % (xml_escape(url), umonth)
- return CALENDAR(self.req) % (monthlink, '\n'.join(formatted_rows))
+ return CALENDAR(self._cw) % (monthlink, '\n'.join(formatted_rows))
@@ -362,15 +362,15 @@
def build_calendars(self, schedule, begin, end):
self.w(u'<tr>')
- rql = self.rset.printable_rql()
+ rql = self.cw_rset.printable_rql()
for cur_month in date_range(begin, end, incmonth=1):
umonth = u'%s %s' % (self.format_date(cur_month, '%B'), cur_month.year)
- url = self.build_url(rql=rql, vid=self.id,
+ url = self.build_url(rql=rql, vid=self.__regid__,
year=cur_month.year, month=cur_month.month)
self.w(u'<th colspan="3"><a href="%s">%s</a></th>' % (xml_escape(url),
umonth))
self.w(u'</tr>')
- _ = self.req._
+ _ = self._cw._
for day_num in xrange(31):
self.w(u'<tr>')
for cur_month in date_range(begin, end, incmonth=1):
@@ -402,7 +402,7 @@
umonth = self.format_date(first_day, '%B %Y') # localized month name
rows = [] # each row is: (am,pm), (am,pm) ... week_title
current_row = [(NO_CELL, NO_CELL, NO_CELL)] * first_day.weekday()
- rql = self.rset.printable_rql()
+ rql = self.cw_rset.printable_rql()
for daynum in xrange(0, days_in_month(first_day)):
# build cells day
day = first_day + timedelta(daynum)
@@ -444,7 +444,7 @@
year=first_day.year, month=first_day.month)
monthlink = '<a href="%s">%s</a>' % (xml_escape(url),
umonth)
- return CALENDAR(self.req) % (monthlink, '\n'.join(formatted_rows))
+ return CALENDAR(self._cw) % (monthlink, '\n'.join(formatted_rows))
@@ -454,9 +454,9 @@
title = _('am/pm calendar (week)')
def build_calendar(self, schedule, weeks):
- rql = self.rset.printable_rql()
+ rql = self.cw_rset.printable_rql()
w = self.w
- _ = self.req._
+ _ = self._cw._
for monday, sunday in weeks:
umonth = self.format_date(monday, '%B %Y')
url = self.build_url(rql=rql, vid='ampmcalendarmonth',