Merge pull request #54 from RahulGopathi/V3

Add rank to events

events/admin.py

@@ -17,7 +17,7 @@ class EventAdmin(admin.ModelAdmin):
     search_fields = ['name']
     inlines = [ContactsAdmin, PanelAdmin]
     fieldsets = (
-        (_('Event Details'), {'fields': ('name', 'type', 'speaker', 'designation', 'description', 'prize', 'external_link', 'venue', 'featured')}),
+        (_('Event Details'), {'fields': ('name', 'type', 'speaker', 'designation', 'description', 'prize', 'external_link', 'venue', 'featured', 'rank')}),
         (_('Event Registration Details'), {'fields': ('participation_type', 'min_team_size', 'max_team_size', 'registration_open')}),
         (_('Event Dates'), {'fields': ('date', 'time', 'end_date', 'end_time', 'event_started')}),
         (_('Event Host'), {'fields': ('host', 'sponsor_image1', 'sponsor_website')}),

events/models.py

@@ -53,6 +53,7 @@ class Event(models.Model):
     youtube_link = models.URLField(max_length=500, null=True, blank=True, verbose_name="youtube Link for streaming")
     webx_link = models.URLField(max_length=500, null=True, blank=True, verbose_name="webX Link for streaming")
     featured = models.BooleanField(verbose_name="Display on home page", default=False, blank=True)
+    rank = models.IntegerField(blank=False, null=False, default=1)
 
     def __str__(self):
         return self.name

events/views.py

@@ -29,10 +29,10 @@ def events(request, type):
                                                    'present_time': datetime.now(),
                                                    })
     elif type == 'talk':
-        events = Event.objects.filter(type=type)
+        events = Event.objects.filter(type=type).order_by('rank')
         return render(request, 'speakers.html', {'events': events, 'type': type, 'brochure': brochure, })
     elif type == 'panel_discussion':
-        events = Event.objects.filter(type=type)
+        events = Event.objects.filter(type=type).order_by('rank')
         panelist = Panel.objects.all()
         return render(request, 'panel.html', {'events': events, 'panelists': panelist, 'type': type})
     else:
@@ -43,7 +43,7 @@ def events(request, type):
         if typeFound is False:
             messages.info(request, 'No event type exists with the given name.')
             return redirect("/")
-        events = Event.objects.filter(type=type)
+        events = Event.objects.filter(type=type).order_by('rank')
         return render(request, 'events.html', {'events': events, 'type': type, 'brochure': brochure, })