Enhance scheduler (#1286)

Update scheduling to use the track title in the display output instead of
the track name.

Enhance admin panels for events and tracks to allow easier inline editing.

Update field names (translated Italian).

Author: malemburg

conference/migrations/0023_update_field_descriptions.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-05-20 14:15
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('conference', '0022_alter_sponsorincome_tags'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='schedule',
+            name='conference',
+            field=models.CharField(help_text='Name of the conference', max_length=20),
+        ),
+        migrations.AlterField(
+            model_name='track',
+            name='order',
+            field=models.PositiveIntegerField(default=0),
+        ),
+        migrations.AlterField(
+            model_name='track',
+            name='title',
+            field=models.TextField(help_text='HTML supported', verbose_name='Track title'),
+        ),
+        migrations.AlterField(
+            model_name='track',
+            name='track',
+            field=models.CharField(max_length=20, verbose_name='Track name'),
+        ),
+    ]

conference/models.py

@@ -1070,7 +1070,7 @@ class Schedule(models.Model):
     The latter can be the talk of the events or "custom" as the pyBirra,
     and are connected to the track in the "weak" mode, through a tagfield.
     """
-    conference = models.CharField(help_text = 'nome della conferenza', max_length = 20)
+    conference = models.CharField(help_text = 'Name of the conference', max_length = 20)
     slug = models.SlugField()
     date = models.DateField()
     description = models.TextField(blank=True)
@@ -1096,15 +1096,19 @@ def speakers(self):
 
 class Track(models.Model):
     schedule = models.ForeignKey(Schedule, on_delete=models.CASCADE)
-    track = models.CharField('nome track', max_length=20)
-    title = models.TextField('titolo della track', help_text='HTML supportato')
+    # XXX This should really be called "name", not "track"
+    track = models.CharField('Track name', max_length=20) # Internal track name
+    title = models.TextField('Track title', help_text='HTML supported') # Display name
     seats = models.PositiveIntegerField(default=0)
-    order = models.PositiveIntegerField('ordine', default=0)
+    order = models.PositiveIntegerField(default=0)
     translate = models.BooleanField(default=False)
     outdoor = models.BooleanField(default=False)
 
     def __str__(self):
-        return self.track
+        return self.title
+
+    def __repr__(self):
+        return 'Track(track=%r, title=%r)' % (self.track, self.title)
 
 
 class EventManager(models.Manager):

conference/schedule.py

@@ -112,7 +112,10 @@ def schedule(request, day=None, month=None):
     #     )
 
     times = []
+    # Internal track names
     tracks = timetable._tracks
+    # Display names of tracks
+    titles = timetable._titles
     talks = []
 
     all_times = set()
@@ -198,11 +201,16 @@ def schedule(request, day=None, month=None):
     schedule = ScheduleGrid(
         day=schedule_data["date"],
         tracks=tracks,
+        titles=titles,
         talks=talks,
         grid=Grid(times=grid_times, rows=len(all_times), cols=len(tracks)),
     )
 
-    ctx = {"conference": settings.CONFERENCE_CONFERENCE, "schedule": schedule, "days": days}
+    ctx = {
+        "conference": settings.CONFERENCE_CONFERENCE, 
+        "schedule": schedule, 
+        "days": days,
+        }
 
     return render(request, "conference/schedule/schedule.html", ctx)
 
@@ -245,6 +253,7 @@ class Grid:
 class ScheduleGrid:
     day: str
     tracks: typing.List[str]
+    titles: typing.List[str]
     talks: typing.List[Talk]
     grid: Grid
 

conference/utils.py

@@ -134,7 +134,11 @@ def __init__(self, sid, events):
         self._analyzed = False
         self.events = events
         # Track list in the right order
+        #
+        # XXX This logic should really use the track objects or IDs rather than the strings
+        #
         self._tracks = list(Track.objects.filter(schedule=sid).order_by('order').values_list('track', flat=True))
+        self._titles = list(Track.objects.filter(schedule=sid).order_by('order').values_list('title', flat=True))
 
     def __str__(self):
         return 'TimeTable2: %s - %s' % (self.sid, ', '.join(self._tracks))

p3/admin.py

@@ -1,5 +1,7 @@
 from django.urls import reverse
 from django.contrib import admin
+from django.db import models
+from django.forms import TextInput, Textarea
 
 from taggit.forms import TagField
 from taggit_labels.widgets import LabelWidget
@@ -186,23 +188,37 @@ class EventTrackInlineAdmin(admin.TabularInline):
 
 
 class EventAdmin(admin.ModelAdmin):
-    list_display = ('schedule',
+    list_display = ('_conference',
+                    'schedule',
                     'start_time',
                     'duration',
+                    'custom',
                     '_title',
                     '_tracks')
     ordering = ('schedule',
                 'start_time',
                 'tracks',
                 )
-    list_filter = ('schedule',
+    list_filter = ('schedule__conference',
+                   'schedule',
                    'tracks')
+    list_editable = ('custom',
+                    )
     search_fields = ['talk__title',
                      'custom',
                      ]
     inlines = (EventTrackInlineAdmin,
                )
 
+    # Display the custom textarea as TextInput for better layout
+    formfield_overrides = {
+        models.TextField: {'widget': TextInput(attrs={'size':'20', 'style':'min-width: 20em'})},
+    }
+
+
+    def _conference(self, obj):
+        return obj.schedule.conference
+
     def _tracks(self, obj):
         return ", ".join([track.track
                           for track in obj.tracks.all()])
@@ -215,7 +231,8 @@ def _title(self, obj):
 
 
 class TrackAdmin(admin.ModelAdmin):
-    list_display = ('schedule',
+    list_display = ('_conference',
+                    'schedule',
                     '_slug',
                     '_date',
                     'track',
@@ -226,11 +243,13 @@ class TrackAdmin(admin.ModelAdmin):
                 'order',
                 'track',
                 )
-    list_filter = ('schedule',
+    list_filter = ('schedule__conference',
+                   'schedule',
                    'schedule__slug',
                    'track',
                    'title')
     list_editable = ('track',
+                     'title',
                      'order',
                     )
     search_fields = ['schedule__conference',
@@ -242,6 +261,14 @@ class TrackAdmin(admin.ModelAdmin):
                )
     list_select_related = True
 
+    # Display the title textarea as TextInput for better layout
+    formfield_overrides = {
+        models.TextField: {'widget': TextInput(attrs={'size':'20'})},
+    }
+
+    def _conference(self, obj):
+        return obj.schedule.conference
+
     def _slug(self, obj):
         return obj.schedule.slug
 

templates/conference/schedule/schedule.html

@@ -250,8 +250,8 @@
 
         <div>
             <div class="schedule__grid schedule__grid--header schedule__talks_header" style="--cols: {{ schedule.grid.cols }}; --rows: 1;">
-                {% for track in schedule.tracks %}
-                    <div>{{ track }}</div>
+                {% for title in schedule.titles %}
+                    <div>{{ title|safe }}</div>
                 {% endfor %}
             </div>