work on admin interface

programs/admin.py

@@ -11,22 +11,22 @@ from aircox.programs.models import *
 #
 # Inlines
 #
-class SoundInline (admin.TabularInline):
+class SoundInline(admin.TabularInline):
     model = Sound
 
 
-class ScheduleInline (admin.TabularInline):
+class ScheduleInline(admin.TabularInline):
     model = Schedule
     extra = 1
 
-class StreamInline (admin.TabularInline):
+class StreamInline(admin.TabularInline):
     fields = ['delay', 'begin', 'end']
     model = Stream
     extra = 1
 
 
 # from suit.admin import SortableTabularInline, SortableModelAdmin
-#class TrackInline (SortableTabularInline):
+#class TrackInline(SortableTabularInline):
 #    fields = ['artist', 'name', 'tags', 'position']
 #    form = TrackForm
 #    model = Track
@@ -34,7 +34,7 @@ class StreamInline (admin.TabularInline):
 #    extra = 10
 
 
-class NameableAdmin (admin.ModelAdmin):
+class NameableAdmin(admin.ModelAdmin):
     fields = [ 'name' ]
 
     list_display = ['id', 'name']
@@ -43,7 +43,7 @@ class NameableAdmin (admin.ModelAdmin):
 
 
 @admin.register(Sound)
-class SoundAdmin (NameableAdmin):
+class SoundAdmin(NameableAdmin):
     fields = None
     list_display = ['id', 'name', 'duration', 'type', 'mtime', 'good_quality', 'removed', 'public']
     fieldsets = [
@@ -55,17 +55,17 @@ class SoundAdmin (NameableAdmin):
 
 
 @admin.register(Stream)
-class StreamAdmin (admin.ModelAdmin):
+class StreamAdmin(admin.ModelAdmin):
     list_display = ('id', 'program', 'delay', 'begin', 'end')
 
 
 @admin.register(Station)
-class StationAdmin (NameableAdmin):
+class StationAdmin(NameableAdmin):
     fields = NameableAdmin.fields + [ 'active', 'public', 'fallback' ]
 
 @admin.register(Program)
-class ProgramAdmin (NameableAdmin):
-    def schedule (self, obj):
+class ProgramAdmin(NameableAdmin):
+    def schedule(self, obj):
         return Schedule.objects.filter(program = obj).count() > 0
     schedule.boolean = True
     schedule.short_description = _("Schedule")
@@ -76,7 +76,7 @@ class ProgramAdmin (NameableAdmin):
     inlines = [ ScheduleInline, StreamInline ]
 
     # SO#8074161
-    #def get_form (self, request, obj=None, **kwargs):
+    #def get_form(self, request, obj=None, **kwargs):
         #if obj:
         #    if Schedule.objects.filter(program = obj).count():
         #        self.inlines.remove(StreamInline)
@@ -84,22 +84,38 @@ class ProgramAdmin (NameableAdmin):
         #        self.inlines.remove(ScheduleInline)
         #return super().get_form(request, obj, **kwargs)
 
+
+class DiffusionInline(admin.StackedInline):
+    model = Diffusion
+    extra = 0
+    fields = ['type', 'start', 'end']
+
 @admin.register(Diffusion)
-class DiffusionAdmin (admin.ModelAdmin):
-    def archives (self, obj):
+class DiffusionAdmin(admin.ModelAdmin):
+    def archives(self, obj):
         sounds = [ str(s) for s in obj.get_archives()]
         return ', '.join(sounds) if sounds else ''
 
-    def conflicts (self, obj):
+    def conflicts(self, obj):
         if obj.type == Diffusion.Type.unconfirmed:
             return ', '.join([ str(d) for d in obj.get_conflicts()])
         return ''
 
-    list_display = ('id', 'type', 'start', 'end', 'program', 'initial', 'archives', 'conflicts')
+    def end_time(self, obj):
+        return obj.end.strftime('%H:%M')
+    end_time.short_description = _('end')
+
+    def first(self, obj):
+        return obj.initial.start if obj.initial else ''
+
+    list_display = ('id', 'program', 'start', 'end_time', 'type', 'first', 'archives', 'conflicts')
     list_filter = ('type', 'start', 'program')
-    list_editable = ('type', 'start', 'end')
+    list_editable = ('type',)
+    ordering = ('-start', 'id')
 
     fields = ['type', 'start', 'end', 'initial', 'program', 'sounds']
+    inlines = [ DiffusionInline ]
+
 
     def get_form(self, request, obj=None, **kwargs):
         if request.user.has_perm('aircox_program.programming'):
@@ -111,32 +127,40 @@ class DiffusionAdmin (admin.ModelAdmin):
             self.readonly_fields += ['program', 'sounds']
         return super().get_form(request, obj, **kwargs)
 
+    def get_object(self, *args, **kwargs):
+        """
+        We want rerun to redirect to the given object.
+        """
+        obj = super().get_object(*args, **kwargs)
+        if obj.initial:
+            obj = obj.initial
+        return obj
+
     def get_queryset(self, request):
-        qs = super(DiffusionAdmin, self).get_queryset(request)
-        if ('_changelist_filters' in request.GET or \
-            'type__exact' in request.GET) and \
-                str(Diffusion.Type.unconfirmed) in request.GET['type__exact']:
+        qs = super().get_queryset(request)
+        if request.GET and '_changelist_filters' in request.GET and \
+                request.GET.get('type__exact') == Diffusion.Type.unconfirmed:
             return qs
         return qs.exclude(type = Diffusion.Type.unconfirmed)
 
 
 @admin.register(Log)
-class LogAdmin (admin.ModelAdmin):
+class LogAdmin(admin.ModelAdmin):
     list_display = ['id', 'date', 'source', 'comment', 'related_object']
     list_filter = ['date', 'source', 'related_type']
 
 
 @admin.register(Schedule)
-class ScheduleAdmin (admin.ModelAdmin):
-    def program_name (self, obj):
+class ScheduleAdmin(admin.ModelAdmin):
+    def program_name(self, obj):
         return obj.program.name
     program_name.short_description = _('Program')
 
-    def day (self, obj):
+    def day(self, obj):
         return obj.date.strftime('%A')
     day.short_description = _('Day')
 
-    def rerun (self, obj):
+    def rerun(self, obj):
         return obj.initial != None
     rerun.short_description = _('Rerun')
     rerun.boolean = True