Skip to content
Snippets Groups Projects
Commit a63c46a3 authored by Todd Dembrey's avatar Todd Dembrey
Browse files

Add the basic table for the rounds in

parent de52dc48
No related branches found
No related tags found
No related merge requests found
...@@ -150,3 +150,17 @@ class SubmissionFilter(filters.FilterSet): ...@@ -150,3 +150,17 @@ class SubmissionFilter(filters.FilterSet):
class SubmissionFilterAndSearch(SubmissionFilter): class SubmissionFilterAndSearch(SubmissionFilter):
query = filters.CharFilter(field_name='search_data', lookup_expr="icontains", widget=forms.HiddenInput) query = filters.CharFilter(field_name='search_data', lookup_expr="icontains", widget=forms.HiddenInput)
class RoundsTable(tables.Table):
title = tables.LinkColumn('funds:rounds:detail', args=[A('pk')], orderable=True, text=lambda record: record.title)
fund = tables.Column()
lead = tables.Column(order_by=('lead.full_name',))
start_date = tables.Column()
end_date = tables.Column()
class Meta:
fields = ('title', 'fund', 'lead', 'start_date', 'end_date')
def render_lead(self, value):
return format_html('<span>{}</span>', value)
...@@ -8,33 +8,8 @@ ...@@ -8,33 +8,8 @@
{% block content %} {% block content %}
{% block table %} {% block table %}
<div class="wrapper wrapper--table-actions">
<button class="button button--filters button--contains-icons js-toggle-filters">Filters</button>
<form method="get" role="search" class="form form--search-desktop js-search-form"> {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term %}
<button class="button button--search" type="submit" aria-label="Search">
<svg class="icon icon--magnifying-glass icon--search"><use xlink:href="#magnifying-glass"></use></svg>
</button>
<input class="input input--search js-search-input" type="text" placeholder="Search submissions" name="query"{% if search_term %} value="{{ search_term }}"{% endif %} aria-label="Search input">
</form>
</div>
<div class="filters">
<div class="filters__header">
<button class="filters__button js-clear-filters">Clear</button>
<div>Filter by</div>
<button class="filters__button js-close-filters">Close</button>
</div>
<form action="" method="get" class="form form--filters js-filter-form">
<ul class="form__filters select2">
{{ filter.form.as_ul }}
<li>
<button class="button button--primary" type="submit" value="Filter">Filter</button>
</li>
</ul>
</form>
</div>
{% render_table table %} {% render_table table %}
{% endblock %} {% endblock %}
......
<div class="wrapper wrapper--table-actions">
<button class="button button--filters button--contains-icons js-toggle-filters">Filters</button>
<form method="get" role="search" class="form form--search-desktop js-search-form">
<button class="button button--search" type="submit" aria-label="Search">
<svg class="icon icon--magnifying-glass icon--search"><use xlink:href="#magnifying-glass"></use></svg>
</button>
<input class="input input--search js-search-input" type="text" placeholder="Search submissions" name="query"{% if search_term %} value="{{ search_term }}"{% endif %} aria-label="Search input">
</form>
</div>
<div class="filters">
<div class="filters__header">
<button class="filters__button js-clear-filters">Clear</button>
<div>Filter by</div>
<button class="filters__button js-close-filters">Close</button>
</div>
<form action="" method="get" class="form form--filters js-filter-form">
<ul class="form__filters select2">
{{ filter.form.as_ul }}
<li>
<button class="button button--primary" type="submit" value="Filter">Filter</button>
</li>
</ul>
</form>
</div>
{% extends "base-apply.html" %} {% extends "base-apply.html" %}
{% load static %}
{% load render_table from django_tables2 %}
{% block title %}Rounds{% endblock %} {% block title %}Rounds{% endblock %}
{% block extra_css %}
{{ filter.form.media.css }}
{% endblock %}
{% block content %}
<div class="admin-bar">
<div class="admin-bar__inner">
<div>
<h1 class="gamma heading heading--no-margin heading--bold">Rounds</h1>
<h5>Explore current and past rounds</h5>
</div>
</div>
</div>
<div class="wrapper wrapper--large wrapper--inner-space-medium">
{% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term %}
{% render_table table %}
</div>
{% endblock %}
{% block extra_js %}
{{ filter.form.media.js }}
<script src="https://cdnjs.cloudflare.com/ajax/libs/url-search-params/1.1.0/url-search-params.js"></script>
<script src="{% static 'js/apply/submission-filters.js' %}"></script>
<script src="{% static 'js/apply/submission-tooltips.js' %}"></script>
{% endblock %}
...@@ -33,7 +33,7 @@ from .differ import compare ...@@ -33,7 +33,7 @@ from .differ import compare
from .forms import ProgressSubmissionForm, ScreeningSubmissionForm, UpdateReviewersForm, UpdateSubmissionLeadForm from .forms import ProgressSubmissionForm, ScreeningSubmissionForm, UpdateReviewersForm, UpdateSubmissionLeadForm
from .models import ApplicationSubmission, ApplicationRevision, RoundBase, LabBase from .models import ApplicationSubmission, ApplicationRevision, RoundBase, LabBase
from .models.utils import SubmittableStreamForm from .models.utils import SubmittableStreamForm
from .tables import AdminSubmissionsTable, SubmissionFilterAndSearch from .tables import AdminSubmissionsTable, RoundsTable, SubmissionFilterAndSearch
from .workflow import STAGE_CHANGE_ACTIONS from .workflow import STAGE_CHANGE_ACTIONS
...@@ -467,8 +467,9 @@ class RevisionCompareView(DetailView): ...@@ -467,8 +467,9 @@ class RevisionCompareView(DetailView):
@method_decorator(staff_required, name='dispatch') @method_decorator(staff_required, name='dispatch')
class RoundListView(ListView): class RoundListView(SingleTableMixin, ListView):
template_name = 'funds/rounds.html' template_name = 'funds/rounds.html'
table_class = RoundsTable
def get_queryset(self): def get_queryset(self):
return Page.objects.type(SubmittableStreamForm) return Page.objects.type(SubmittableStreamForm).specific()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment