Repository :
http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
---------------------------------------------------------------
commit bc4a200b654b77f22970c3ef212f4b72a0b9f42b
Author: Johan Cwiklinski <johan(a)x-tnd.be>
Date: Sun Nov 4 12:06:27 2012 +0100
Use specific function to build monthly calendar
---------------------------------------------------------------
fedocal/__init__.py | 6 +-----
fedocal/fedocallib/__init__.py | 7 +++++++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index a9bc9a5..2100223 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -43,8 +43,6 @@ import fedocallib as fedocallib
from fedocallib.model import (Calendar, Meeting, Reminder,
Recursive)
-import calendar as pycalendar
-
CONFIG = ConfigParser.ConfigParser()
if os.path.exists('/etc/fedocal.cfg'): # pragma: no cover
CONFIG.readfp(open('/etc/fedocal.cfg'))
@@ -123,9 +121,7 @@ def calendar_fullday(calendar_name, year, month, day):
auth_form = forms.LoginForm()
admin = is_admin()
month_name = fedocallib.MONTH[week_start.month - 1]
- htmlcal = pycalendar.HTMLCalendar()
- curdate = datetime.date.today()
- curmonth_cal = htmlcal.formatmonth(curdate.year, curdate.month)
+ curmonth_cal = fedocallib.getHtmlMonthlyCal()
return flask.render_template('agenda.html',
calendar=calendarobj,
calendars=calendars,
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index a91256e..8143207 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -27,6 +27,7 @@ from sqlalchemy.orm import sessionmaker
from week import Week
from model import Calendar, Reminder, Meeting
+import calendar as pycalendar
MONTH = ['January', 'February', 'March', 'April',
'May', 'June', 'July',
'August', 'September', 'October', 'November',
'December']
@@ -512,3 +513,9 @@ def add_meetings_to_vcal(ical, meetings):
"""
for meeting in meetings:
add_meeting_to_vcal(ical, meeting)
+
+def getHtmlMonthlyCal():
+ htmlcal = pycalendar.HTMLCalendar()
+ curdate = date.today()
+ curmonth_cal_nf = htmlcal.formatmonth(curdate.year, curdate.month)
+ return curmonth_cal_nf