Skip to content
Snippets Groups Projects
Commit 98b946b7 authored by Fredrik Jonsson's avatar Fredrik Jonsson
Browse files

List partner reviews in reviews block.

parent bce089cb
No related branches found
No related tags found
No related merge requests found
...@@ -20,8 +20,10 @@ ...@@ -20,8 +20,10 @@
{% if object.stage.has_external_review %} {% if object.stage.has_external_review %}
<tr class="tr tr--subchild"><td colspan="4"><hr></td></tr> <tr class="tr tr--subchild"><td colspan="4"><hr></td></tr>
{% if reviewer_reviews or object.reviewers_not_reviewed %} {% if reviewer_reviews or partner_reviews or object.reviewers_not_reviewed %}
{% include 'funds/includes/review_table_row.html' with reviews=reviewer_reviews %} {% include 'funds/includes/review_table_row.html' with reviews=reviewer_reviews %}
<tr class="tr tr--subchild"><td colspan="4"><hr></td></tr>
{% include 'funds/includes/review_table_row.html' with reviews=partner_reviews %}
{% if object.reviewers_not_reviewed %} {% if object.reviewers_not_reviewed %}
{% include 'funds/includes/review_table_row.html' with reviews=object.reviewers_not_reviewed missing=True class="hidden" %} {% include 'funds/includes/review_table_row.html' with reviews=object.reviewers_not_reviewed missing=True class="hidden" %}
<tr><td colspan="4"><a class="link link--bold link--underlined js-toggle-reviewers" href="#">All Assigned Advisors</a></td></tr> <tr><td colspan="4"><a class="link link--bold link--underlined js-toggle-reviewers" href="#">All Assigned Advisors</a></td></tr>
......
...@@ -78,6 +78,9 @@ class ReviewQuerySet(models.QuerySet): ...@@ -78,6 +78,9 @@ class ReviewQuerySet(models.QuerySet):
def by_reviewers(self): def by_reviewers(self):
return self.submitted().filter(author__in=User.objects.reviewers()) return self.submitted().filter(author__in=User.objects.reviewers())
def by_partners(self):
return self.submitted().filter(author__in=User.objects.partners())
def staff_score(self): def staff_score(self):
return self.by_staff().score() return self.by_staff().score()
......
...@@ -23,9 +23,11 @@ class ReviewContextMixin: ...@@ -23,9 +23,11 @@ class ReviewContextMixin:
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
staff_reviews = self.object.reviews.by_staff().select_related('author') staff_reviews = self.object.reviews.by_staff().select_related('author')
reviewer_reviews = self.object.reviews.by_reviewers().exclude(id__in=staff_reviews).select_related('author') reviewer_reviews = self.object.reviews.by_reviewers().exclude(id__in=staff_reviews).select_related('author')
partner_reviews = self.object.reviews.by_partners().exclude(id__in=staff_reviews).select_related('author')
return super().get_context_data( return super().get_context_data(
staff_reviews=staff_reviews, staff_reviews=staff_reviews,
reviewer_reviews=reviewer_reviews, reviewer_reviews=reviewer_reviews,
partner_reviews=partner_reviews,
**kwargs, **kwargs,
) )
......
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