symposion_app Changeset - 7ae022d2c412

Changeset - 7ae022d2c412

Parent rev.

Child rev.

[Not reviewed]

0 2 1

Scott Bragg - 8 years ago 2016-12-24 04:24:31
jsbragg@scriptforge.org

Added track name to room, added day option to conference schedule view

3 files changed with 24 insertions and 1 deletions:

symposion/schedule/migrations/0006_room_track.py

symposion/schedule/models.py

symposion/schedule/views.py

0 comments (0 inline, 0 general)

symposion/schedule/migrations/0006_room_track.py

➞

Show inline comments

 new file 100644
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-12-24 00:10
 from __future__ import unicode_literals
 from django.db import migrations, models
 class Migration(migrations.Migration):
     dependencies = [
         ('symposion_schedule', '0005_auto_20161210_1736'),
+    ]
     operations = [
         migrations.AddField(
             model_name='room',
             name='track',
             field=models.CharField(blank=True, default=None, max_length=80, null=True, verbose_name='Track'),
         ),
+    ]

symposion/schedule/models.py

➞

Show inline comments

@@ ... / @@ -48,16 +48,17 @@ class Day(models.Model): @@
 @python_2_unicode_compatible
 class Room(models.Model):
     schedule = models.ForeignKey(Schedule, verbose_name=_("Schedule"))
     name = models.CharField(max_length=65, verbose_name=_("Name"))
     track = models.CharField(max_length=80, verbose_name=_("Track"), default=None, blank=True, null=True)
     order = models.PositiveIntegerField(verbose_name=_("Order"))
     def __str__(self):
         return self.name
+        return '%s (%s)' % (self.name, self.track)
     class Meta:
         verbose_name = _("Room")
         verbose_name_plural = _("Rooms")

symposion/schedule/views.py

➞

Show inline comments

@@ ... / @@ -49,14 +49,16 @@ def schedule_conference(request): @@
         days = [TimeTable(day) for day in days_qs]
         sections.append({
             "schedule": schedule,
             "days": days,
         })
     day_switch = request.GET.get('day', None)
     ctx = {
         "sections": sections,
         "day_switch": day_switch
+    }
     return render(request, "symposion/schedule/schedule_conference.html", ctx)
 def schedule_detail(request, slug=None):

0 comments (0 inline, 0 general)