From cd76659ed945cacc19ba7f4a877fe70b1cc89153 Mon Sep 17 00:00:00 2001 From: bkfox Date: Fri, 18 Feb 2022 15:10:52 +0100 Subject: [PATCH] fix #4: more diffusion info on admin dashboard --- aircox/admin_site.py | 2 +- aircox/models/episode.py | 2 +- aircox/templates/admin/index.html | 26 +++++++++++++++++++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/aircox/admin_site.py b/aircox/admin_site.py index 7e9ad63..ad189d8 100644 --- a/aircox/admin_site.py +++ b/aircox/admin_site.py @@ -30,7 +30,7 @@ class AdminSite(admin.AdminSite): 'programs': Program.objects.active().values('pk', 'title') \ .order_by('title'), # today's diffusions - 'diffusions': Diffusion.objects.on_air().date().order_by('start') \ + 'diffusions': Diffusion.objects.date().order_by('start') \ .select_related('episode'), # TODO: only for dashboard # last comments diff --git a/aircox/models/episode.py b/aircox/models/episode.py index 6cb5928..f16ed57 100644 --- a/aircox/models/episode.py +++ b/aircox/models/episode.py @@ -252,7 +252,7 @@ class Diffusion(BaseRerun): return self.type == self.TYPE_ON_AIR and \ self.start <= now and self.end >= now - # TODO: property? + @property def is_live(self): """ True if Diffusion is live (False if there are sounds files). """ return self.type == self.TYPE_ON_AIR and \ diff --git a/aircox/templates/admin/index.html b/aircox/templates/admin/index.html index d3c7bd6..e6b80a0 100644 --- a/aircox/templates/admin/index.html +++ b/aircox/templates/admin/index.html @@ -16,7 +16,31 @@ {{ diffusion.start|time }} - {{ diffusion.end|time }} - {{ episode.title }} + + {{ episode.title }} +   + {% if diffusion.type == diffusion.TYPE_ON_AIR %} + + + {% if diffusion.is_live %} + + {% else %} + + {% endif %} + +   + {{ diffusion.get_type_display }} + + {% elif diffusion.type == diffusion.TYPE_CANCEL %} + + {{ diffusion.get_type_display }} + {% elif diffusion.type == diffusion.TYPE_UNCONFIRMED %} + + {{ diffusion.get_type_display }} + {% endif %} + {% endwith %} {% endfor %}