diff --git a/opentech/apply/dashboard/templates/dashboard/dashboard.html b/opentech/apply/dashboard/templates/dashboard/dashboard.html
index de14c3caef48d98e96c5c102aa8cdbd8362a1118..d0a54dca98910e400df9fb6b68446f6aa750577f 100644
--- a/opentech/apply/dashboard/templates/dashboard/dashboard.html
+++ b/opentech/apply/dashboard/templates/dashboard/dashboard.html
@@ -18,6 +18,11 @@
</div>
<div class="wrapper wrapper--large wrapper--inner-space-medium">
<div class="wrapper wrapper--large wrapper--inner-space-medium">
+
+ {% if closed_rounds or open_rounds %}
+ {% include "funds/includes/round-block.html" with closed_rounds=closed_rounds open_rounds=open_rounds title=rounds_title %}
+ {% endif %}
+
<h3>Applications to review</h3>
{% if in_review.data %}
{% render_table in_review %}
@@ -30,4 +35,5 @@
{% block extra_js %}
<script src="{% static 'js/apply/submission-tooltips.js' %}"></script>
+ <script src="{% static 'js/apply/tabs.js' %}"></script>
{% endblock %}
diff --git a/opentech/apply/dashboard/views.py b/opentech/apply/dashboard/views.py
index b8703e77d2457cd107d877c81bd101f44ad90d3f..22cba795cec3e3440864a9f85a9cc269ba1656ad 100644
--- a/opentech/apply/dashboard/views.py
+++ b/opentech/apply/dashboard/views.py
@@ -3,7 +3,7 @@ from django.views.generic import TemplateView
from django_tables2 import RequestConfig
from django_tables2.views import SingleTableView
-from opentech.apply.funds.models import ApplicationSubmission
+from opentech.apply.funds.models import ApplicationSubmission, RoundsAndLabs
from opentech.apply.funds.tables import SubmissionsTable, AdminSubmissionsTable
from opentech.apply.utils.views import ViewDispatcher
@@ -15,9 +15,21 @@ class AdminDashboardView(TemplateView):
in_review = SubmissionsTable(qs.in_review_for(request.user), prefix='in-review-')
RequestConfig(request, paginate={'per_page': 10}).configure(in_review)
+ base_query = RoundsAndLabs.objects.with_progress().active().order_by('-end_date')
+ base_query = base_query.by_lead(request.user)
+ open_rounds = base_query.open()[:6]
+ open_query = '?round_state=open'
+ closed_rounds = base_query.closed()[:6]
+ closed_query = '?round_state=closed'
+ rounds_title = 'Your rounds and labs'
return render(request, 'dashboard/dashboard.html', {
'in_review': in_review,
+ 'open_rounds': open_rounds,
+ 'open_query': open_query,
+ 'closed_rounds': closed_rounds,
+ 'closed_query': closed_query,
+ 'rounds_title': rounds_title,
})
diff --git a/opentech/apply/funds/models/applications.py b/opentech/apply/funds/models/applications.py
index 30097f1d3833a2c6f29beef9d29353bddf1c3c80..f2a791dee8cbebd6dd92cb2ba855d519d1728147 100644
--- a/opentech/apply/funds/models/applications.py
+++ b/opentech/apply/funds/models/applications.py
@@ -345,6 +345,9 @@ class RoundsAndLabsQueryset(PageQuerySet):
def closed(self):
return self.filter(end_date__lt=date.today())
+ def by_lead(self, user):
+ return self.filter(lead_pk=user.pk)
+
class RoundsAndLabsProgressQueryset(RoundsAndLabsQueryset):
def active(self):
@@ -367,6 +370,10 @@ class RoundsAndLabsManager(PageManager):
end_date=F('roundbase__end_date'),
parent_path=Left(F('path'), Length('path') - ApplicationBase.steplen, output_field=CharField()),
fund=Subquery(funds.values('title')[:1]),
+ lead_pk=Coalesce(
+ F('roundbase__lead__pk'),
+ F('labbase__lead__pk'),
+ ),
)
def with_progress(self):
@@ -406,6 +413,9 @@ class RoundsAndLabsManager(PageManager):
def new(self):
return self.get_queryset().new()
+ def by_lead(self, user):
+ return self.get_queryset().by_lead(user)
+
class RoundsAndLabs(Page):
"""
diff --git a/opentech/apply/funds/templates/funds/includes/round-block.html b/opentech/apply/funds/templates/funds/includes/round-block.html
index 8fdca206107d2438cef6a3115d49dfe101260797..98efb329f1b9c5f5ce983a8bbd2bfc41fd20057f 100644
--- a/opentech/apply/funds/templates/funds/includes/round-block.html
+++ b/opentech/apply/funds/templates/funds/includes/round-block.html
@@ -1,6 +1,6 @@
<div class="wrapper wrapper--bottom-space">
<section class="section section--with-options">
- <h4 class="heading heading--normal heading--no-margin">All Rounds and Labs</h4>
+ <h4 class="heading heading--normal heading--no-margin">{{ title }}</h4>
<div class="js-tabs">
<a class="tab__item tab__item--alt" href="#closed-rounds" data-tab="tab-1">Closed</a>
<a class="tab__item tab__item--alt" href="#open-rounds" data-tab="tab-2">Open</a>
diff --git a/opentech/apply/funds/templates/funds/submissions.html b/opentech/apply/funds/templates/funds/submissions.html
index 353450fa78d785a9339a12023d7eb3f69c5f3736..ca70880476eaac1808566d08c7b7a7c21e54ef21 100644
--- a/opentech/apply/funds/templates/funds/submissions.html
+++ b/opentech/apply/funds/templates/funds/submissions.html
@@ -14,6 +14,11 @@
</div>
<div class="wrapper wrapper--large wrapper--inner-space-medium">
+
+ {% if closed_rounds or open_rounds %}
+ {% include "funds/includes/round-block.html" with closed_rounds=closed_rounds open_rounds=open_rounds title=rounds_title %}
+ {% endif %}
+
{% block table %}
{{ block.super }}
{% endblock %}
diff --git a/opentech/apply/funds/tests/models/test_roundsandlabs.py b/opentech/apply/funds/tests/models/test_roundsandlabs.py
index 5eb8709d7b39e407a568deb51dd14ed9ff0ee27c..a41aa04568fc2445992316eaaa4772f3220df3b8 100644
--- a/opentech/apply/funds/tests/models/test_roundsandlabs.py
+++ b/opentech/apply/funds/tests/models/test_roundsandlabs.py
@@ -67,6 +67,18 @@ class BaseRoundsAndLabTestCase:
self.assertEqual(fetched_obj, obj)
self.assertFalse(base_qs.active().exists())
+ def test_by_lead(self):
+ obj = self.base_factory()
+ # Create an additional round which will create a new staff lead
+ round_other_lead = RoundFactory()
+ qs_all = RoundsAndLabs.objects.with_progress()
+ qs_by_lead = qs_all.by_lead(obj.lead)
+ fetched_obj = qs_by_lead.first()
+ self.assertEqual(qs_all.count(), 2)
+ self.assertEqual(qs_by_lead.count(), 1)
+ self.assertEqual(fetched_obj.lead, obj.lead.full_name)
+ self.assertNotEqual(round_other_lead.title, fetched_obj.title)
+
class TestForLab(BaseRoundsAndLabTestCase, TestCase):
base_factory = LabFactory
diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index b75cf12325e6c96bf0015eb74be4c308e69f1380..b3928ac67b89162bdc74a3e49385276cca750266 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -89,17 +89,19 @@ class SubmissionOverviewView(AllActivityContextMixin, BaseAdminSubmissionsTable)
return super().get_table_data().order_by(F('last_update').desc(nulls_last=True))[:5]
def get_context_data(self, **kwargs):
- base_query = RoundsAndLabs.objects.with_progress().order_by('end_date')
+ base_query = RoundsAndLabs.objects.with_progress().active().order_by('-end_date')
open_rounds = base_query.open()[:6]
open_query = '?round_state=open'
closed_rounds = base_query.closed()[:6]
closed_query = '?round_state=closed'
+ rounds_title = 'All Rounds and Labs'
return super().get_context_data(
open_rounds=open_rounds,
open_query=open_query,
closed_rounds=closed_rounds,
closed_query=closed_query,
+ rounds_title=rounds_title,
**kwargs,
)