ctactic/aircox-radiocampus
1
0
Fork 0
forked from rc/aircox
Code Issues 10 Pull Requests Activity

work on archiver / episode item: is now

Browse Source
This commit is contained in:
bkfox 2020-05-29 17:37:04 +02:00
parent d5209206bd
commit d18aeaa9a9
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
aircox/models/log.py
View File

@ -155,6 +155,7 @@ class Log(models.Model):
@classmethod @classmethod
def merge_diffusions(cls, logs, diffs, count=None): def merge_diffusions(cls, logs, diffs, count=None):
# TODO: limit count # TODO: limit count
# FIXME: log may be iterable (in stats view)
logs = list(logs.order_by('-date')) logs = list(logs.order_by('-date'))
diffs = deque(diffs.on_air().before().order_by('-start')) diffs = deque(diffs.on_air().before().order_by('-start'))
object_list = [] object_list = []

5
aircox/templates/aircox/widgets/episode_item.html
View File

@ -12,7 +12,10 @@ Context variables:
{% block title %} {% block title %}
{% if not object.is_published and object.program.is_published %} {% if not object.is_published and object.program.is_published %}
<a href="{{ object.program.get_absolute_url }}">{{ object.title }}</a> <a href="{{ object.program.get_absolute_url }}">
{{ object.title }}
{% if object.is_now %}<span class="has-text-danger fa fa-play-circle"></span>{% endif %}
</a>
{% else %} {% else %}
{{ block.super }} {{ block.super }}
{% endif %} {% endif %}

2
aircox/views/admin.py
View File

@ -33,6 +33,6 @@ class StatisticsView(BaseAdminView, LogListView, ListView):
date = None date = None
def get_object_list(self, logs, *_): def get_object_list(self, logs, *_):
return super().get_object_list(logs, True) super().get_object_list(logs, True)

2
aircox/views/log.py
View File

@ -43,7 +43,7 @@ class LogListMixin(GetDateMixin):
def get_object_list(self, logs, full=False): def get_object_list(self, logs, full=False):
""" """
Return diffusions merged to the provided logs queryset. If Return diffusions merged to the provided logs iterable. If
`full`, sort items by date without merging. `full`, sort items by date without merging.
""" """
diffs = self.get_diffusions_queryset() diffs = self.get_diffusions_queryset()

2
aircox_streamer/templates/aircox_streamer/source_item.html
View File

@ -10,7 +10,7 @@
</span> </span>
[[ source.id ]] [[ source.id ]]
<small v-if="source.isPaused || source.isPlaying">(-[[ source.remainingString ]])</small> <small v-if="source.isPaused || source.isPlaying">([[ source.remainingString ]])</small>
<a v-if="source.data.program !== undefined" <a v-if="source.data.program !== undefined"
:href="'{% url 'admin:aircox_program_change' "$$" %}'.replace('$$', source.data.program)" :href="'{% url 'admin:aircox_program_change' "$$" %}'.replace('$$', source.data.program)"

2
aircox_streamer/templates/aircox_streamer/streamer.html
View File

@ -21,7 +21,7 @@
</div> </div>
<div class="navbar-end"> <div class="navbar-end">
<div class="select navbar-item"> <div class="select navbar-item">
<select ref="selectStreamer" @change.native="selectStreamer" class="control" <select ref="selectStreamer" onchange="selectStreamer" class="control"
title="{% trans "Select a station" %}" title="{% trans "Select a station" %}"
aria-label="{% trans "Select a station" %}"> aria-label="{% trans "Select a station" %}">
<option v-for="streamer of streamers" :value="streamer.id">[[ streamer.data.name ]]</option> <option v-for="streamer of streamers" :value="streamer.id">[[ streamer.data.name ]]</option>