work on monitor

This commit is contained in:
jeffrey
2016-11-26 17:32:30 +01:00
parent 7e571a6794
commit aa1c21a8c8
38 changed files with 412 additions and 160 deletions

View File

@ -146,10 +146,10 @@ class Station(Nameable):
if not self.__streamer:
self.__streamer = controllers.Streamer(station = self)
self.__dealer = controllers.Source(station = self)
self.__sources = [
self.__sources = [ self.__dealer ] + [
controllers.Source(station = self, program = program)
for program in Program.objects.filter(stream__isnull = False)
] + [ self.__dealer ]
]
@property
def sources(self):
@ -252,7 +252,6 @@ class Station(Nameable):
logs = Log.objects.get_for(model = Track) \
.filter(station = self) \
.order_by('-date')
if date:
logs = logs.filter(date__contains = date)
diffs = Diffusion.objects.get_at(date)
@ -378,6 +377,9 @@ class Program(Nameable):
qs = cl.objects.filter(id = int(path))
return qs[0] if qs else None
def is_show(self):
return self.schedule_set.count() != 0
class Stream(models.Model):
"""