Changeset 354

Timestamp:

07/19/10 22:27:24 (7 weeks ago)

Author:

nicholas

Message:

Complete month_calendar template tag.

Location:

Python/blog/trunk

Files:

• Changes (modified) (1 diff)
• blog/models.py (modified) (3 diffs)
• blog/templates/blog/tags/calendar.html (modified) (2 diffs)
• blog/templatetags/blog.py (modified) (7 diffs)

Python/blog/trunk/Changes

@@ -5 +5 @@
  - RPC support for Blogger 1.0, MetaWeblog, and MoveableType (Patch
    provided by Carson Gee.)
+ - Added month_calendar template tag.
  
 1.2 (May  3 2010):

Python/blog/trunk/blog/models.py

@@ +1 @@
+import calendar
+import datetime
+
 from django.db import models
 from django.conf import settings
@@ -7 +10 @@
 from django.contrib.comments.moderation import CommentModerator, moderator
 
-import datetime
-
 DRAFT = 1
 PUBLISHED = 2
@@ -14 +15 @@
 class EntryPublishedManager(Manager):
     """Returns published posts that are not in the future.""" 
-    
+    def published_bymonth(self, year, month, **kwargs):
+        "Get all items published in a given month"
+        gte = datetime.date(year, month, 1)
+        lte = datetime.date(year, month, calendar.monthrange(year, month)[1])
+
+        if lte >= datetime.date.today(): # Dont' show the future.
+            lte = datetime.datetime.now()
+
+        return self.get_query_set().filter(status__gte=PUBLISHED, pub_date__gte=gte, pub_date__lte=lte, sites__id__exact=settings.SITE_ID, **kwargs)
+
     def published(self, **kwargs):
+        # If pub_date__lte is not in kwargs add it.
         return self.get_query_set().filter(status__gte=PUBLISHED, pub_date__lte=datetime.datetime.now(), sites__id__exact=settings.SITE_ID, **kwargs)
 

Python/blog/trunk/blog/templates/blog/tags/calendar.html

@@ -1 +1 @@
 <table class="cal_month_calendar">
+<tr>
+    <th colspan="7">    
+                {{ month|date:"F Y" }}
+    </th>
+</tr>
 <tr>
 {% for day in headers %}
@@ -8 +13 @@
 <tr>
 {% for day in week %}
-    <td{% if not day.in_month %} class="cal_not_in_month"{% endif %}>{% if day.event %}<a href="/calendar/{{ day.day|date:"Y/m" }}/">{{ day.day|date:"j" }}</a>{% else %}{{ day.day|date:"j" }}{% endif %}</td>
+    <td{% if not day.in_month %} class="cal_not_in_month"{% endif %}>{% if day.event %}<a href="{% url archive_day day.day|date:"Y" day.day|date:"m" day.day|date:"d" %}">{{ day.day|date:"j" }}</a>{% else %}{{ day.day|date:"j" }}{% endif %}</td>
 {% endfor %}
 </tr>

Python/blog/trunk/blog/templatetags/blog.py

@@ -43 +43 @@
 
 class Calendar(template.Node):
-    def __init__(self, var_name, kind='month', limit=None, author=None):
-        self.var_name = var_name
-        self.kind = kind
-        self.limit = limit 
+    def __init__(self, year, month, author=None):
+        self.year = year 
+        self.month = month 
         self.author = author 
 
     def render(self, context):
-        author = None
+        year = self.year
+        month = self.month
+        author = self.author
 
         if self.author:
@@ -57 +58 @@
             except ObjectDoesNotExist: 
                 pass
-
+           
         if author:
-            list = Entry.objects.published(author=author).dates('pub_date', self.kind, order='DESC')
+            event_list = Entry.objects.published_bymonth(year, month, author=author)
         else: 
-            list = Entry.objects.published().dates('pub_date', self.kind, 
-                                               order='DESC')
-
-        if self.limit:
-            context[self.var_name] = list[:self.limit]
-        else:
-            context[self.var_name] = list
-        return ''
+            event_list = Entry.objects.published_bymonth(year, month)
+
+        # Fix this to just use calendar.* for all math.
+
+        start = datetime.date(year, month, 1)
+        end = datetime.date(year, month, calendar.monthrange(year, month)[1])
+
+        first_day_of_calendar = start - datetime.timedelta(start.weekday()) 
+        last_day_of_calendar = end + datetime.timedelta(7 - end.weekday())
+
+        month_cal = []
+        week = []
+        week_headers = []
+    
+        i = 0
+        day = first_day_of_calendar
+        while day <= last_day_of_calendar:
+            if i < 7:
+                week_headers.append(day)
+            cal_day = {}
+            cal_day['day'] = day
+            cal_day['event'] = False
+            for event in event_list:
+                if day >= event.pub_date.date() and day <= event.pub_date.date():
+                    cal_day['event'] = True
+            if day.month == month:
+                cal_day['in_month'] = True
+            else:
+                cal_day['in_month'] = False  
+            week.append(cal_day)
+            if day.weekday() == 6:
+                month_cal.append(week)
+                week = []
+            i += 1
+            day += datetime.timedelta(1)
+    
+        t = template.loader.get_template('blog/tags/calendar.html')
+
+        return t.render(template.Context({'month': start, 'calendar': month_cal, 'headers': week_headers}, autoescape=context.autoescape))
 
 class TagList(template.Node):
@@ -78 +110 @@
         return ''
 
+@register.tag
 def tag_list_as(parser, token):
     """
@@ -100 +133 @@
         raise TemplateSyntaxError, "'%s' tag requires a single argument: the context name to populate" % bits[0]
     return TagList(bits[1])
-tag_list_as = register.tag(tag_list_as)
-
+
+@register.tag
 def entry_archive(parser, token):
     """
@@ -138 +171 @@
 
     return EntryList(bits[1], type, limit, author)
-entry_archive = register.tag(entry_archive)
-
+
+@register.tag
 def month_calendar(parser, token):
     """
@@ -145 +178 @@
     to that day in the archive.
 
+    If provided a negative difference it will render the month in the
+    past. -1 will render last month, -2 will render two months ago, etc. 
+
     Example::
 
         {% month_calendar <year> <month> [author_ident] %}
+        {% month_calendar <difference> [author_ident] %}
         
         {% load blog %}
 
         {% month_calendar 2010 11 author_ident_here %} 
-
-    """
-    
-    author = None
+        {% month_calendar 2010 11 %} 
+        
+        {% month_calendar -1 author_ident_here %} 
+        {% month_calendar -1 %} 
+
+    """
+   
+    author = difference = None
     year = datetime.date.today().year
     month = datetime.date.today().month
@@ -161 +202 @@
     bits = token.contents.split()
 
-    if len(bits) < 2:
-        raise TemplateSyntaxError, "'%s' tag requires at least the context name to populate" % bits[0]
-    
-    if len(bits) >= 3:
-        (limit, type) = bits[2].split(':') 
+    # AUTHOR -OR- DIFFERENCE
+    if len(bits) == 2:
+        try:
+            difference = int(bits[1])
+        except ValueError:
+            author = bits[1]
+
+    # YYYY MM  -OR- DIFFERENCE AUTHOR
+    if len(bits) == 3:
         try: 
-            limit = int(limit)
-        except ValueError: 
-            limit = None
-
+            year = int(bits[1])
+            month = int(bits[2])
+        except ValueError:
+            difference = bits[1]
+            author = bits[2]
+           
+
+    # YYYY MM AUTHOR
     if len(bits) == 4:
+        year = bits[1]
+        month = bits[2]
         author = bits[3]
 
-    return Calendar(bits[1], type, limit, author)
-entry_archive = register.tag(entry_archive)
-
-def month_cal(parser, token):
-    year=datetime.date.today().year
-    month=datetime.date.today().month
-
-    # Fix this to just use calendar.* for all math.
-
-    first_day_of_month = datetime.date(year, month, 1)
-    last_day_of_month = calendar.monthrange(year, month)
-    first_day_of_calendar = first_day_of_month - datetime.timedelta(first_day_of_month.weekday())
-
-    last_day_of_calendar = datetime.date(year,month,last_day_of_month[1]) + datetime.timedelta(7 - calendar.weekday(year,month,last_day_of_month[1]))
-
-    return last_day_of_calendar
-
-    event_list = Entry.objects.published(pub_date__gte=first_day_of_calendar, pub_date__lte=last_day_of_calendar)
-
-    month_cal = []
-    week = []
-    week_headers = []
-
-    i = 0
-    day = first_day_of_calendar
-    while day <= last_day_of_calendar:
-        if i < 7:
-            week_headers.append(day)
-        cal_day = {}
-        cal_day['day'] = day
-        cal_day['event'] = False
-        for event in event_list:
-            if day >= event.start_date.date() and day <= event.end_date.date():
-                cal_day['event'] = True
-        if day.month == month:
-            cal_day['in_month'] = True
+    if difference:
+        today = datetime.date.today()
+        year = today.year
+        month = today.month
+
+        if difference > 0:
+            month += difference
+            while month > 12:
+                month -= 12
+                year += 1
         else:
-            cal_day['in_month'] = False  
-        week.append(cal_day)
-        if day.weekday() == 6:
-            month_cal.append(week)
-            week = []
-        i += 1
-        day += datetime.timedelta(1)
-
-    return {'calendar': month_cal, 'headers': week_headers}
-
-register.inclusion_tag('blog/tags/calendar.html')(month_cal)
+            month += difference
+            while month < 0:
+                month += 12
+                year -= 1
+
+    try: 
+        year = int(year)
+    except ValueError: 
+        year = datetime.date.today().year
+    
+    try: 
+        month = int(month)
+    except ValueError: 
+        month = datetime.date.today().month
+
+    return Calendar(year, month, author)