diff --git a/app/interface/models.py b/app/interface/models.py index eba220e..4057bc1 100644 --- a/app/interface/models.py +++ b/app/interface/models.py @@ -61,7 +61,8 @@ class Ensemble(models.Model): ordering = ('slug', ) def active_projects(self): - return self.projects.filter(active=True, event_date__gte=timezone.now()) + #return self.projects.filter(active=True, event_date__gte=timezone.now()) + return self.projects.active().current() def has_admin(self, user): if not user.is_authenticated: @@ -132,6 +133,8 @@ class Project(models.Model): @property def rough_date(self): + if not self.event_date: + return "No timescale" in_past, s = rough_date(self.event_date) if in_past: return f"{s} ago" diff --git a/app/interface/templates/base.html b/app/interface/templates/base.html index bd9469c..577cb81 100644 --- a/app/interface/templates/base.html +++ b/app/interface/templates/base.html @@ -11,6 +11,7 @@ {% block title %}Polyphonic{% endblock %} {% block media %}{% endblock %} + diff --git a/app/interface/templates/interface/ensemble_detail.html b/app/interface/templates/interface/ensemble_detail.html index 973ebcb..68482d1 100644 --- a/app/interface/templates/interface/ensemble_detail.html +++ b/app/interface/templates/interface/ensemble_detail.html @@ -23,12 +23,12 @@

Projects for {{ensemble.name }}

{{ ensemble.details|markdown }}

-

Administrators

- +

{% include 'interface/project_items.html' %} diff --git a/app/interface/templates/interface/ensemble_list.html b/app/interface/templates/interface/ensemble_list.html index f51b04a..8f370ff 100644 --- a/app/interface/templates/interface/ensemble_list.html +++ b/app/interface/templates/interface/ensemble_list.html @@ -19,22 +19,18 @@
+
- Placeholder image + Placeholder image
-
+

{{ ensemble.name }}
- {% if ensemble.details %} -
- {{ ensemble.details | markdown }} -
- {% endif %}
{% with projects=ensemble.active_projects.count %} diff --git a/app/interface/templates/interface/project_base.html b/app/interface/templates/interface/project_base.html index 22db8e4..efd1ef1 100644 --- a/app/interface/templates/interface/project_base.html +++ b/app/interface/templates/interface/project_base.html @@ -14,7 +14,7 @@
  • Ensembles
  • Projects
    • {% if request.user.is_authenticated %} -
  • Library
    • +
  • Collections
    • {% endif %} diff --git a/app/interface/templates/interface/project_items.html b/app/interface/templates/interface/project_items.html index 7b92ab8..6db05e6 100644 --- a/app/interface/templates/interface/project_items.html +++ b/app/interface/templates/interface/project_items.html @@ -12,14 +12,17 @@

    {{ project.rough_date }}

    -
    -
    +
    +
    {{ project.description | markdown }} - {% if not ensemble %} -
    With {{ project.ensemble }}
    - {% endif %}
    + + {% if not ensemble %} +
    + {{ project.ensemble }} +
    + {% endif %}
    {% empty %} diff --git a/app/library/forms.py b/app/library/forms.py index 8df7fd7..76bd627 100644 --- a/app/library/forms.py +++ b/app/library/forms.py @@ -25,5 +25,9 @@ class PlaylistAddForm(forms.Form): def save(self): self.instance.works.add(self.cleaned_data['work']) +class ProjectEnsembleChoiceField(forms.ModelChoiceField): + def label_from_instance(self, obj): + return f"{obj.ensemble.name} - {obj.name}" + class ProjectSelectForm(BaseForm): - project = forms.ModelChoiceField(queryset=Project.objects.all()) \ No newline at end of file + project = ProjectEnsembleChoiceField(queryset=Project.objects.all()) \ No newline at end of file diff --git a/app/library/views/__init__.py b/app/library/views/__init__.py index ab69c22..071a80d 100644 --- a/app/library/views/__init__.py +++ b/app/library/views/__init__.py @@ -253,7 +253,7 @@ class WorkAddToProject(CollectionMixin, FormView): def get_form(self): f = super(WorkAddToProject, self).get_form() - qs = f.fields['project'].queryset + qs = f.fields['project'].queryset.select_related('ensemble') # Limit to projects for ensembles where we are an admin and they haven't occured yet qs = qs.for_user(self.request.user).current() @@ -262,7 +262,7 @@ class WorkAddToProject(CollectionMixin, FormView): work = self.get_object() qs = qs.exclude(pk__in=work.projects.all()) - f.fields['project'].queryset = qs + f.fields['project'].queryset = qs.order_by('ensemble__name', 'name') return f def form_valid(self, form):