projects/polyphonic
1
0
Fork 0
Code Issues 8 Pull Requests Releases 1 Wiki Activity

Got my music working again

Browse Source
This commit is contained in:
Tris Forster 2023-02-23 19:29:20 +11:00
parent d7892d355d
commit 928173976b
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/library/forms.py
View File

@ -25,5 +25,5 @@ class PlaylistAddForm(forms.Form):
def save(self): def save(self):
self.instance.works.add(self.cleaned_data['work']) self.instance.works.add(self.cleaned_data['work'])
class ProjectSelectForm(forms.Form): class ProjectSelectForm(BaseForm):
project = forms.ModelChoiceField(queryset=Project.objects.all()) project = forms.ModelChoiceField(queryset=Project.objects.all())

4
app/library/templates/library/item_list.html
View File

@ -63,7 +63,7 @@
<td>{{ forloop.counter }}.</td> <td>{{ forloop.counter }}.</td>
<td> <td>
{% if request.is_admin %} {% if request.is_admin %}
<a href="{% url 'work_detail' item.work.pk %}">{{ item.work.name }}</a> <a href="{% url 'work_detail' item.work.collection.pk item.work.pk %}">{{ item.work.name }}</a>
{% else %} {% else %}
{{ item.work.name }} {{ item.work.name }}
{% endif %} {% endif %}
@ -75,7 +75,7 @@
<select name="instruments"> <select name="instruments">
<option value='-'>None</option> <option value='-'>None</option>
{% for part in item.work.digital_parts %} {% for part in item.work.digital_parts %}
<option value='{{ part.tag }}'>{{ part.instrument }}</option> <option value='{{ part.tag }}'>{{ part.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</span> </span>

10
app/library/views/__init__.py
View File

@ -30,9 +30,7 @@ class ProjectItemListView(ProjectMixin, ListView):
def post(self, request, **kwargs): def post(self, request, **kwargs):
project = self.get_project() project_works = self.project.works.all()
project_works = project.works.all()
instruments = request.POST.getlist('instruments') instruments = request.POST.getlist('instruments')
works = request.POST.getlist('works') works = request.POST.getlist('works')
@ -58,7 +56,7 @@ class ProjectItemListView(ProjectMixin, ListView):
result = extract_and_concat(sections) result = extract_and_concat(sections)
download_name = f'{project.name}.pdf' download_name = f'{self.project.name}.pdf'
response = FileResponse(result, content_type="application/pdf") response = FileResponse(result, content_type="application/pdf")
response['Content-Disposition'] = f'inline; filename="{download_name}"' response['Content-Disposition'] = f'inline; filename="{download_name}"'
@ -74,10 +72,6 @@ class ProjectItemListView(ProjectMixin, ListView):
data['instrument'] = self.request.session.get('instrument', 'Score') data['instrument'] = self.request.session.get('instrument', 'Score')
data['part'] = self.request.session.get('part', '0') data['part'] = self.request.session.get('part', '0')
data['running_time'] = self.get_queryset().aggregate(Sum('work__running_time'))['work__running_time__sum'] data['running_time'] = self.get_queryset().aggregate(Sum('work__running_time'))['work__running_time__sum']
#if running_time:
# data['running_time'] = "{0:d}:{1:02d}".format(int(running_time / 60), running_time % 60)
#else:
# data['running_time'] = "-:--"
return data return data