diff --git a/opentech/apply/funds/templates/funds/includes/review_table.html b/opentech/apply/funds/templates/funds/includes/review_table.html index cacd82ba33e77deae9332d836e639a98d5aa2ef6..4120f8b0f18085f36fc2211d7476789ea4f33729 100644 --- a/opentech/apply/funds/templates/funds/includes/review_table.html +++ b/opentech/apply/funds/templates/funds/includes/review_table.html @@ -20,8 +20,10 @@ {% if object.stage.has_external_review %} <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 %} + <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 %} {% 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> diff --git a/opentech/apply/review/models.py b/opentech/apply/review/models.py index 75cfa7c1fad1fd8419eab33dbf4d45997db14aba..cad1a3a1a2a067c6b3f589a9d790724eb7f7aca9 100644 --- a/opentech/apply/review/models.py +++ b/opentech/apply/review/models.py @@ -78,6 +78,9 @@ class ReviewQuerySet(models.QuerySet): def by_reviewers(self): 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): return self.by_staff().score() diff --git a/opentech/apply/review/views.py b/opentech/apply/review/views.py index 0a075b5c11d1b6ed45d76abe6213944378acb7a8..2ef6119c3b029c26e26eff70566e449dd58d4225 100644 --- a/opentech/apply/review/views.py +++ b/opentech/apply/review/views.py @@ -23,9 +23,11 @@ class ReviewContextMixin: def get_context_data(self, **kwargs): 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') + partner_reviews = self.object.reviews.by_partners().exclude(id__in=staff_reviews).select_related('author') return super().get_context_data( staff_reviews=staff_reviews, reviewer_reviews=reviewer_reviews, + partner_reviews=partner_reviews, **kwargs, )