Rama mapeveri

events/admin.py

@@ -5,7 +5,7 @@
 from django.http import HttpResponse
 from django.utils.translation import ugettext_lazy as _
 
-from events.models import Event, Registration
+from events.models import Event, Registration, Category, CategoryEvent
 from events.utils import newMail, pendingMail
 
 
@@ -47,7 +47,6 @@ def export_as_csv(modeladmin, request, queryset):
 
     return export_as_csv
 
-
 class RegistrationInline(admin.TabularInline):
     model = Registration
     list_display = ('name', 'email', 'website', 'event', 'twitter',
@@ -57,6 +56,19 @@ class RegistrationInline(admin.TabularInline):
                    'mailme', 'creationDate', 'event']
     search_fields = ['name', 'email']
 
+class CategoryAdmin(admin.ModelAdmin):
+    list_display = ('descrip',)
+    list_filter = ['descrip']
+    search_fields = ['descrip']
+
+    ordering = ['descrip']
+
+class CategoryInline(admin.TabularInline):
+    model = CategoryEvent
+
+    list_display = ('category',)
+    list_filter = ['category']
+    search_fields = ['category']
 
 class EventAdmin(admin.ModelAdmin):
     # Autofill slugs
@@ -68,6 +80,7 @@ class EventAdmin(admin.ModelAdmin):
 
     inlines = [
         RegistrationInline,
+        CategoryInline,
     ]
 
     # TinyMCE
@@ -129,4 +142,5 @@ class RegistrationAdmin(admin.ModelAdmin):
 
 admin.site.register(Event, EventAdmin)
 admin.site.register(Registration, RegistrationAdmin)
+admin.site.register(Category, CategoryAdmin)
 

events/models.py

@@ -101,7 +101,7 @@ def peopleAttended(self):
 
     def __unicode__(self):
         return self.name
-    
+
 class Registration(models.Model):
     '''
         Model for individual registrations
@@ -152,3 +152,22 @@ def save(self):
 
     def __unicode__(self):
         return self.name
+
+class Category(models.Model):
+    '''
+        Model for categories of events
+    '''
+
+    id = models.AutoField(primary_key=True)
+    descrip = models.CharField(_("Category"), max_length=100, default="")
+
+    def __unicode__(self):
+        return self.descrip
+
+class CategoryEvent(models.Model):
+    '''
+        Model for relationship between Event and Cateogry
+    '''
+
+    event = models.ForeignKey(Event)
+    category = models.ForeignKey(Category, verbose_name=_("Category"))

events/urls.py

@@ -2,11 +2,12 @@
 
 
 urlpatterns = patterns('events.views',
-    url(r'^(?P<id>\d+)/(?P<slug>[-\w]+)/registration/confirm/(?P<hash>\w+)$',
+	url(r'^(?P<id>\d+)/(?P<slug>[-\w]+)/registration/confirm/(?P<hash>\w+)$',
         'confirmation'),
-    url(r'^(?P<id>\d+)/(?P<slug>[-\w]+)/registration/decline/(?P<hash>\w+)$',
+	url(r'^(?P<id>\d+)/(?P<slug>[-\w]+)/registration/decline/(?P<hash>\w+)$',
         'decline'),
-    url(r'^(?P<id>\d+)/(?P<slug>[-\w]+)/registration/$', 'registration'),
-    url(r'^(?P<id>\d+)/(?P<slug>[-\w]+)/tweets/$', 'tweets'),
-    url(r'^(?P<id>\d+)/(?P<slug>[-\w]+)/$', 'detail'),
+	url(r'^(?P<id>\d+)/(?P<slug>[-\w]+)/registration/$', 'registration'),
+	url(r'^(?P<id>\d+)/(?P<slug>[-\w]+)/tweets/$', 'tweets'),
+	url(r'^(?P<id>\d+)/(?P<slug>[-\w]+)/$', 'detail'),
+	url(r'^events/category/(?P<id>\d+)/$','events_category'),
 )

events/views.py

@@ -12,7 +12,7 @@
 from django.views.generic import TemplateView
 
 from events.forms import RegistrationForm
-from events.models import Event, Registration
+from events.models import Event, Registration, Category, CategoryEvent
 from events.utils import newMail, pendingMail
 
 
@@ -25,21 +25,27 @@ def index(request):
     oldEvents = Event.objects.filter(
         active=True, eventDate__lt=now).order_by('-eventDate')
 
+    categorys = Category.objects.all()
+
     data = {
         'nextEvents': nextEvents,
         'oldEvents': oldEvents,
+        'categorys': categorys,
     }
 
     return render_to_response(
         'index.html', data, context_instance=RequestContext(request))
 
-
 def detail(request, id, slug):
     """Event details page."""
     event = get_object_or_404(Event, id=id, active=True)
 
+    """Get all the categories related to the event"""
+    categorys = CategoryEvent.objects.filter(event_id=id)
+
     data = {
         'event': event,
+        'categorys': categorys,
     }
 
     return render_to_response(
@@ -219,3 +225,20 @@ def stats(request):
 
     return render_to_response(
         'stats/index.html', data, context_instance=RequestContext(request))
+
+def events_category(request, id):
+    """
+        Filter evets for category
+    """
+    events = CategoryEvent.objects.filter(category_id=id)
+
+    ct = Category.objects.get(id=id)
+    category = ct.descrip
+
+    data = {
+        'events': events,
+        'category': category,
+    }
+
+    return render_to_response(
+        'events/events_categorys.html', data, context_instance=RequestContext(request))