| {{ item.work.name }} |
- {% firstof item.work.running_time '?' %} |
+ {{ item.work.duration }} |
diff --git a/library/templates/library/project_menu.html b/library/templates/library/project_menu.html
index 0f3a2d4..0d2a90f 100644
--- a/library/templates/library/project_menu.html
+++ b/library/templates/library/project_menu.html
@@ -2,5 +2,5 @@
My Music
{% endif %}
{% if request.is_admin %}
-Works
+Library
{% endif %}
\ No newline at end of file
diff --git a/library/templates/library/work_detail.html b/library/templates/library/work_detail.html
index 01410f1..6652f84 100644
--- a/library/templates/library/work_detail.html
+++ b/library/templates/library/work_detail.html
@@ -6,23 +6,84 @@
{% endblock %}
{% block page %}
-Works / {{ work.name }}
+{{ work.name }} {% if work.running_time %}({{ work.duration }}){% endif %} [{{ work.identifier }}]
+{{ work.composer }}{% if work.version %} - {{ work.version }}{% endif %}
{{ work.notes }}
-Parts
-
- Print part set
+{% if work.collection %}
+Location: {{ work.collection }} [{{ work.collection_index }}]
+{% endif %}
-Original Documents
+{% if work.parent %}
+From {{ work.parent.name }} - {{ work.parent.composer }}
+{% endif %}
+
+{% if work.related_works.count %}
+Related
+
+{% endif %}
+
+Loans
+{% if request.is_admin %}
+
+{% endif %}
+
+
+
+
+ | Ensemble |
+ Project |
+ Checked Out |
+ Due Back |
+
+
+
+ {% for item in work.current_loans %}
+
+ | {{ item.project.ensemble.name }} |
+ {{ item.project.name }} |
+ {{ item.checkout.date|date:"d/m/Y" }} |
+ {{ item.due.date|date:"d/m/Y" }} |
+
+ {% empty %}
+ | No current loans |
+ {% endfor %}
+
+
+
+Printed Parts
+
+{% for inst, c in work.physical_parts %}
+ {{ inst }} ({{ c }})
+{% empty %}
+ No physical parts available
+{% endfor %}
+
+
+Digital Parts
+
+
+
+{% for part in work.digital_parts %}
+ {{ part.instrument }}
+{% empty %}
+ No digital parts available
+{% endfor %}
+
+
+Documents
{% for doc in work.docs.all %}
-
{{ doc.upload.name|basename }}
- [{{ doc.parts.count }} parts]
+ {% with parts=doc.parts.count %}
+ {% if parts %}[{{ parts }} parts]{% endif %}
+ {% endwith %}
{% if request.is_admin %}
{% endif %}
diff --git a/library/templates/library/work_list.html b/library/templates/library/work_list.html
index f7b379d..b735158 100644
--- a/library/templates/library/work_list.html
+++ b/library/templates/library/work_list.html
@@ -1,25 +1,61 @@
{% extends "interface/project_base.html" %}
+{% load url_tools %}
{% block admin %}
Add new
{% endblock %}
{% block page %}
-
Works
-
+Library for {{ view.ensemble }}
+
+
+
+ | Work |
+ Composer |
+ Edition |
+ Orchestration |
+ Collection |
+ Copies |
+
{% for work in object_list %}
- {% with work.docs.count as doc_count %}
- {% with work.parts.count as part_count %}
| {{ work.name }} |
- {{ doc_count }} file{{ doc_count|pluralize }} with {{ part_count }} part{{ part_count|pluralize }} |
+ {{ work.composer|truncatewords:3 }} |
+ {{ work.edition|truncatewords:2 }} |
+ {{ work.orchestration|truncatewords:2}} |
+ {{ work.collection.name }} |
+ {{ work.available }} |
- {% endwith %}
- {% endwith %}
+ {% empty %}
+ | No works found |
{% endfor %}
+
+
+
{% endblock %}
\ No newline at end of file
diff --git a/library/tests.py b/library/tests.py
index 7ce503c..57c2498 100644
--- a/library/tests.py
+++ b/library/tests.py
@@ -1,3 +1,22 @@
from django.test import TestCase
-# Create your tests here.
+from django.contrib.auth.models import User
+from interface.models import Ensemble, Project
+from . import models
+
+class IntegrationTestCase(TestCase):
+
+ def setUp(self):
+ self.homer = User.objects.create(username='homer')
+ self.ned = User.objects.create(username="ned")
+ self.lisa = User.objects.create(username="lisa")
+ self.dewey = User.objects.create(username="dewey")
+
+ self.be_sharps = self.homer.ensembles.create(name='Be Sharps', code="barbershop")
+ self.sesd = self.dewey.ensembles.create(name="Springfield Elementary School Band", code="sax")
+
+ self.sel = self.lisa.collections.create(name="Springfield Elementary Library")
+ self.flanders = self.ned.collections.create(name="Neds Shed")
+
+ def test_integration(self):
+ pass
diff --git a/library/urls.py b/library/urls.py
index b9789fd..625ec42 100644
--- a/library/urls.py
+++ b/library/urls.py
@@ -13,8 +13,12 @@ urlpatterns = [
path('library/works/create', views.WorkAddView.as_view(), name="work_add"),
path('library/works/', views.WorkDetailView.as_view(), name="work_detail"),
path('library/works//partset', views.WorkPartSetView.as_view(), name="work_partset"),
- path('library/works//upload', views.DocumentAddView.as_view(), name="document_add"),
+ path('library/works//add_to_project', views.WorkAddToProject.as_view(), name="work_add_to_project"),
+ path('library/documents//upload', views.DocumentAddView.as_view(), name="document_add"),
path('library/documents//download', views.DocumentDownloadView.as_view(), name="document_download"),
path('library/documents//annotate', views.DocumentAnnotateView.as_view(), name="document_annotate"),
path('library/parts//', views.PartDownloadView.as_view(), name="part_download"),
-]
\ No newline at end of file
+]
+
+from django.views.static import serve
+urlpatterns.append(path('localstorage/', serve, {'document_root': 'local_storage'}))
\ No newline at end of file
diff --git a/library/views.py b/library/views.py
index 4222b6e..a348608 100644
--- a/library/views.py
+++ b/library/views.py
@@ -4,6 +4,8 @@ from django.views.generic.list import ListView, MultipleObjectMixin
from django.views.generic.edit import CreateView, FormView, UpdateView
from django.http import FileResponse, HttpResponse
from django.db import IntegrityError
+from django.db.models import Q, Count
+from django.utils.timezone import now
import json
@@ -98,9 +100,20 @@ class ProjectItemAddView(ProjectMixin, UpdateView):
return self.get_project()
class WorkListView(EnsembleMixin, ListView):
-
+ paginate_by = 20
+
def get_queryset(self):
- return Work.objects.filter(ensemble=self.request.ensemble_id).order_by('name')
+ #works = Work.objects.filter(collection__ensembles=self.request.ensemble_id).order_by('name').select_related('collection')
+ works = Work.objects.filter(collection__allowed_ensembles__ensemble=self.request.ensemble_id).order_by('name').select_related('collection')
+
+ loan_count = Count('project_items', Q(project_items__checkout__lte=now(), project_items__returned=None))
+ works = works.annotate(loan_count=loan_count)
+
+ q = self.request.GET.get('filter')
+ if q:
+ works = works.filter(Q(name__contains=q) | Q(composer__contains=q) | Q(tag_list__contains=q))
+
+ return works
class WorkAddView(EnsembleMixin, FormView):
template_name = "interface/default_form.html"
@@ -108,34 +121,59 @@ class WorkAddView(EnsembleMixin, FormView):
def get_form(self):
f = super(WorkAddView, self).get_form()
- qs = f.fields['orchestration'].queryset
- f.fields['orchestration'].queryset = qs.filter(ensemble_id__isnull=True) | qs.filter(ensemble_id=self.request.ensemble_id)
+ #qs = f.fields['orchestration'].queryset
+ #f.fields['orchestration'].queryset = qs.filter(ensemble_id__isnull=True) | qs.filter(ensemble_id=self.request.ensemble_id)
+ qs = f.fields['collection'].queryset
+ qs = qs.filter(administrators=self.request.user)
+ f.fields['collection'].queryset = qs
return f
def form_valid(self, form):
- obj = form.save(commit=False)
- obj.ensemble_id = self.request.ensemble_id
- try:
- obj.save()
- except IntegrityError:
- form.add_error('name', 'Name must be unique')
- return self.form_invalid(form)
+ work = form.save(commit=False)
+ work.ensemble_id = self.request.ensemble_id
+ work.save()
# handle the files
uploads = self.request.FILES.getlist('uploads')
docs = []
for f in uploads:
- docs.append(obj.docs.create(upload=f).pk)
+ docs.append(work.docs.create(upload=f).pk)
if len(docs) == 1:
return redirect('document_annotate', docs[0])
else:
- return redirect('work_detail', pk=obj.pk)
+ return redirect('work_detail', pk=work.pk)
class WorkDetailView(EnsembleMixin, DetailView):
def get_queryset(self):
- return Work.objects.filter(ensemble=self.request.ensemble_id)
+ return Work.objects.filter(collection__allowed_ensembles__ensemble=self.request.ensemble_id)
+
+class WorkAddToProject(EnsembleMixin, FormView):
+ form_class = forms.ProjectSelectForm
+ template_name = "interface/default_form.html"
+ title = "Select project to add work to"
+
+ def get_object(self):
+ return Work.objects.get(pk=self.kwargs['pk'])
+
+ def get_form(self):
+ f = super(WorkAddToProject, self).get_form()
+ qs = f.fields['project'].queryset
+
+ work = self.get_object()
+ qs = qs.filter(ensemble_id=self.request.ensemble_id).exclude(pk__in=work.projects.all())
+
+ f.fields['project'].queryset = qs
+ return f
+
+ def form_valid(self, form):
+ work = self.get_object()
+ project = form.cleaned_data['project']
+ work.project_items.create(project=project, approved_by=self.request.user, checkout=now())
+ return redirect('item_list', project=project.pk)
+
+
class WorkPartSetView(EnsembleMixin, DetailView):
template_name = "library/work_partset.html"
@@ -162,7 +200,7 @@ class WorkPartSetView(EnsembleMixin, DetailView):
return response
def get_queryset(self):
- return Work.objects.filter(ensemble_id=self.request.ensemble_id)
+ return Version.objects.filter(work__ensemble_id=self.request.ensemble_id)
class DocumentDetailView(EnsembleMixin, DetailView):
@@ -192,7 +230,7 @@ class DocumentDownloadView(EnsembleMixin, SingleObjectMixin, View):
return redirect(self.object.upload.url)
def get_queryset(self):
- return Document.objects.filter(work__ensemble=self.request.ensemble_id)
+ return Document.objects.filter(work__collection__allowed_ensembles__ensemble=self.request.ensemble_id)
class DocumentAnnotateView(EnsembleMixin, DetailView):
template_name = 'library/document_annotate.html'
@@ -228,11 +266,11 @@ class DocumentAnnotateView(EnsembleMixin, DetailView):
for i in range(part.start, (part.end or part.start)+1):
pages[i] = part.tag
- data['json_data'] = {'pageTags': pages, 'instruments': data['document'].work.instruments}
+ data['json_data'] = {'pageTags': pages, 'instruments': data['document'].work.orchestration}
return data
def get_queryset(self):
- return Document.objects.filter(work__ensemble=self.request.ensemble_id).select_related('work')
+ return Document.objects.filter(work__collection__allowed_ensembles__ensemble=self.request.ensemble_id).select_related('work')
class PartDownloadView(EnsembleMixin, SingleObjectMixin, View):
@@ -251,4 +289,4 @@ class PartDownloadView(EnsembleMixin, SingleObjectMixin, View):
return response
def get_queryset(self):
- return Part.objects.filter(doc__work__ensemble=self.request.ensemble_id).select_related('doc', 'doc__work')
\ No newline at end of file
+ return Part.objects.filter(doc__work__collection__allowed_ensembles__ensemble=self.request.ensemble_id).select_related('doc', 'doc__work')
\ No newline at end of file
diff --git a/polyphonic/settings_default.py b/polyphonic/settings_default.py
index a1d8b75..7212ebd 100644
--- a/polyphonic/settings_default.py
+++ b/polyphonic/settings_default.py
@@ -84,6 +84,7 @@ DATABASES = {
}
}
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
# Password validation
# https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators
@@ -126,4 +127,4 @@ STATIC_URL = '/static/'
# Need to set this
AWS_BUCKET = ''
-MEDIA_ROOT = 'media'
\ No newline at end of file
+MEDIA_ROOT = 'media'
diff --git a/requirements.txt b/requirements.txt
index 86c80d1..59f1452 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,14 @@
-asgiref==3.2.10
-boto3==1.15.11
-botocore==1.18.11
-Django==3.1.1
+asgiref==3.4.1
+boto3==1.18.34
+botocore==1.21.34
+Django==3.2.7
+django-byostorage @ git+https://gitea.tfconsulting.com.au/tris/django-byostorage.git@c67d636d2457faa57644cd812ca1b5a916e23766
django-markdown2==0.3.1
jmespath==0.10.0
-markdown2==2.3.9
-python-dateutil==2.8.1
-pytz==2020.1
-s3transfer==0.3.3
-six==1.15.0
-sqlparse==0.3.1
-urllib3==1.25.10
-git+https://gitea.tfconsulting.com.au/tris/django-byostorage.git@master#egg=django_byostorage
+markdown2==2.4.1
+python-dateutil==2.8.2
+pytz==2021.1
+s3transfer==0.5.0
+six==1.16.0
+sqlparse==0.4.1
+urllib3==1.26.6
|