Merge lp:~daker/loco-team-portal/fix.793557-712143 into lp:loco-team-portal

[Adnane Belmadiaf]

Added event's location to the iCal
Added event's url to the iCal

=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2012-11-28 00:46:29 +0000
+++ loco_directory/events/models.py	2012-12-03 22:21:20 +0000
@@ -101,6 +101,21 @@
     def get_absolute_url(self):
         return ('team-event-detail', [getattr(self.first_team(), 'lp_name', 'no-team'), str(self.id), slugify(self.name)])
 
+    def as_ical(self, cal):
+        """
+        return a event as ical
+        """
+        event = cal.add('vevent')
+        event.add('uid').value = str(self.id)
+        event.add('dtstart').value = pytz.utc.localize(self.date_begin)
+        event.add('dtend').value = pytz.utc.localize(self.date_end)
+        event.add('categories').value = ['Ubuntu Loco Team Event']
+        event.add('summary').value = self.name or ''
+        event.add('description').value = self.description or ''
+        event.add('location').value = "%s" % self.venue or ''
+        event.add('url').value = "http://loco.ubuntu.com%s" % self.get_absolute_url()
+        event.add('geo').value = "%s;%s" % (self.venue.latitude, self.venue.longitude)
+
     def get_tz(self):
         timezone = 'UTC'
         if self.venue:

=== modified file 'loco_directory/venues/models.py'
--- loco_directory/venues/models.py	2012-06-03 18:23:49 +0000
+++ loco_directory/venues/models.py	2012-12-03 22:21:20 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from django.db import models
 #pylint: disable-msg=E1102
 from django.utils.translation import ugettext_lazy as _
@@ -32,19 +33,19 @@
                                 max_length=200, verify_exists=False, blank=True, null=True)
     comment = models.TextField(help_text=_('Comment about the Venue'), blank=True, null=True)
 
+    objects = VenueManager()
+
     class Meta:
         unique_together = (('name', 'country', 'city'), ('longitude', 'latitude'), )
 
-    #add manager
-    objects = VenueManager()
-
     def __unicode__(self):
-        if self.spr and self.city:
-            return '%(name)s (%(city)s, %(spr)s)' % {'name': self.name, 'city': self.city, 'spr': self.spr}
-        if self.city:
-            return '%(name)s (%(city)s)' % {'name': self.name, 'city': self.city}
+
+        if self.spr and self.city and self.country:
+            return u'%s (%s, %s, %s)' % (self.name, self.city, self.spr, self.country)
+        if self.city and self.country:
+            return u'%s (%s, %s)' % (self.name, self.city, self.country)
         else:
-            return self.name
+            return u'%s' % self.name
 
     @models.permalink
     def get_absolute_url(self):
@@ -54,7 +55,7 @@
         if self.country:
             country = self.country.slug
         else:
-            country = 'no_country'
+            country = u'no_country'
         return ('venue-detail', [country, self.id])
 
     def save(self, *args, **kargs):