From 1b1a3261152689e6ef65289640afcd7a09d0b8e9 Mon Sep 17 00:00:00 2001
From: Erin Mullaney <erin.mullaney@torchbox.com>
Date: Thu, 21 Feb 2019 13:07:37 -0500
Subject: [PATCH] #962 reconciling files with develop
---
.../applicationsubmission_admin_detail.html | 2 +-
.../funds/includes/review_sidebar.html | 46 ++++++++++++++++++
.../funds/includes/review_sidebar_item.html | 42 +++++++++++++++++
.../funds/includes/review_table.html | 47 -------------------
.../funds/includes/review_table_row.html | 46 ------------------
5 files changed, 89 insertions(+), 94 deletions(-)
create mode 100644 opentech/apply/funds/templates/funds/includes/review_sidebar.html
create mode 100644 opentech/apply/funds/templates/funds/includes/review_sidebar_item.html
delete mode 100644 opentech/apply/funds/templates/funds/includes/review_table.html
delete mode 100644 opentech/apply/funds/templates/funds/includes/review_table_row.html
diff --git a/opentech/apply/funds/templates/funds/applicationsubmission_admin_detail.html b/opentech/apply/funds/templates/funds/applicationsubmission_admin_detail.html
index d39cf28ad..c58e19266 100644
--- a/opentech/apply/funds/templates/funds/applicationsubmission_admin_detail.html
+++ b/opentech/apply/funds/templates/funds/applicationsubmission_admin_detail.html
@@ -22,7 +22,7 @@
<div class="sidebar__inner">
<h5>Reviews & assignees</h5>
- {% include 'funds/includes/review_table.html' %}
+ {% include 'funds/includes/review_sidebar.html' %}
<div class="wrapper wrapper--sidebar-buttons">
{% include 'review/includes/review_button.html' with submission=object class="button--half-width" %}
diff --git a/opentech/apply/funds/templates/funds/includes/review_sidebar.html b/opentech/apply/funds/templates/funds/includes/review_sidebar.html
new file mode 100644
index 000000000..210777f13
--- /dev/null
+++ b/opentech/apply/funds/templates/funds/includes/review_sidebar.html
@@ -0,0 +1,46 @@
+{% load review_tags %}
+<ul class="reviews-sidebar js-reviews-sidebar">
+ {% if reviews_exist %}
+ <li class="reviews-sidebar__item reviews-sidebar__item--header">
+ <div></div>
+ <div>{{ recommendation|traffic_light }}</div>
+ <div></div>
+ </li>
+ {% endif %}
+
+ {% if not assigned_staff %}
+ <li class="reviews-sidebar__no-reviews">No reviews yet</li>
+ {% endif %}
+
+ {% for review_data in reviews_block.role_reviewed %}
+ {% include 'funds/includes/review_sidebar_item.html' with review=review_data.review reviewer=review_data.reviewer role=review_data.role %}
+ {% endfor %}
+
+ {% for review_data in reviews_block.staff_reviewed %}
+ {% include 'funds/includes/review_sidebar_item.html' with review=review_data.review reviewer=review_data.reviewer %}
+ {% endfor %}
+
+ {% for review_data in reviews_block.role_not_reviewed %}
+ {% include 'funds/includes/review_sidebar_item.html' with reviewer=review_data.reviewer role=review_data.role missing=True %}
+ {% endfor %}
+
+ {% for review_data in reviews_block.staff_not_reviewed %}
+ {% include 'funds/includes/review_sidebar_item.html' with reviewer=review_data.reviewer missing=True %}
+ {% endfor %}
+
+ {% if object.stage.has_external_review %}
+ {% if reviews_block.external_reviewed or reviews_block.external_not_reviewed %}
+ <hr class="reviews-sidebar__split">
+
+ {% for review_data in reviews_block.external_reviewed %}
+ {% include 'funds/includes/review_sidebar_item.html' with review=review_data.review reviewer=review_data.reviewer %}
+ {% endfor %}
+
+ {% for review_data in reviews_block.external_not_reviewed %}
+ {% include 'funds/includes/review_sidebar_item.html' with reviewer=review_data.reviewer missing=True class="is-hidden" %}
+ {% endfor %}
+
+ <li><a class="link link--bold link--underlined js-toggle-reviewers" href="#">All Assigned Advisors</a></li>
+ {% endif %}
+ {% endif %}
+</ul>
\ No newline at end of file
diff --git a/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html b/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html
new file mode 100644
index 000000000..6a11896af
--- /dev/null
+++ b/opentech/apply/funds/templates/funds/includes/review_sidebar_item.html
@@ -0,0 +1,42 @@
+{% load wagtailimages_tags %}
+
+<li class="reviews-sidebar__item {{ class }} {% if missing %}no-response{% endif %}">
+ {% if missing %}
+ <div class="reviews-sidebar__name">
+ <span>{{ reviewer }}</span>
+ {% if role %}{% image role.icon max-12x12 %}{% endif %}
+ </div>
+ <div>-</div>
+ <div>-</div>
+ {% else %}
+ {% if request.user.is_apply_staff or request.user == reviewer %}
+ <div>
+ <a href="{% url 'apply:submissions:reviews:review' submission_pk=review.submission.id pk=review.id %}">
+ <div class="reviews-sidebar__name">
+ <span>{{ reviewer }}</span>
+ {% if role %}{% image role.icon max-12x12 %}{% endif %}
+ </div>
+ </a>
+ <div class="reviews-sidebar__date">{{ review.updated_at|date:"Y-m-d" }}</div>
+ </div>
+ {% else %}
+ <div class="reviews-sidebar__name">
+ <span>{{ reviewer }}</span>
+ {% if role %}{% image role.icon max-12x12 %}{% endif %}
+ </div>
+ {% endif %}
+ <div>{{ review.get_recommendation_display }}</div>
+ <div>{{ review.get_score_display }}</div>
+ {% endif %}
+</li>
+
+{% for opinion in review.opinions.all %}
+<li class="reviews-sidebar__item {{ class }}">
+ <div class="reviews-sidebar__name">
+ <span>{{ opinion.author }}</span>
+ {% if opinion.get_author_assignment %}{% image opinion.get_author_assignment.icon max-12x12 %}{% endif %}
+ </div>
+ <div></div>
+ <div>{{ opinion.get_opinion_display }}</div>
+</li>
+{% endfor %}
\ No newline at end of file
diff --git a/opentech/apply/funds/templates/funds/includes/review_table.html b/opentech/apply/funds/templates/funds/includes/review_table.html
deleted file mode 100644
index ef85008ac..000000000
--- a/opentech/apply/funds/templates/funds/includes/review_table.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% load review_tags %}
-<table class="reviews-sidebar js-reviews-sidebar">
- {% if reviews_exist %}
- <tr class="tr tr--subchild light-grey-bg">
- <th colspan="2"></th>
- <th>{{ recommendation|traffic_light }}</th>
- <th></th>
- </tr>
- {% endif %}
-
- {% if not assigned_staff %}
- <tr><td colspan="4" class="reviews-sidebar__no-reviews">No reviews yet</td></tr>
- {% endif %}
-
- {% for review_data in reviews_block.role_reviewed %}
- {% include 'funds/includes/review_table_row.html' with review=review_data.review reviewer=review_data.reviewer role=review_data.role %}
- {% endfor %}
-
- {% for review_data in reviews_block.staff_reviewed %}
- {% include 'funds/includes/review_table_row.html' with review=review_data.review reviewer=review_data.reviewer %}
- {% endfor %}
-
- {% for review_data in reviews_block.role_not_reviewed %}
- {% include 'funds/includes/review_table_row.html' with reviewer=review_data.reviewer role=review_data.role missing=True %}
- {% endfor %}
-
- {% for review_data in reviews_block.staff_not_reviewed %}
- {% include 'funds/includes/review_table_row.html' with reviewer=review_data.reviewer missing=True %}
- {% endfor %}
-
- {% if object.stage.has_external_review %}
- <tr class="tr tr--subchild"><td colspan="4"><hr></td></tr>
- {% if reviews_block.external_reviewed or reviews_block.external_not_reviewed %}
-
- {% for review_data in reviews_block.external_reviewed %}
- {% include 'funds/includes/review_table_row.html' with review=review_data.review reviewer=review_data.reviewer %}
- {% endfor %}
-
- {% for review_data in reviews_block.external_not_reviewed %}
- {% include 'funds/includes/review_table_row.html' with reviewer=review_data.reviewer missing=True class="hidden" %}
- {% endfor %}
-
- <tr><td colspan="4"><a class="link link--bold link--underlined js-toggle-reviewers" href="#">All Assigned Advisors</a></td></tr>
- {% endif %}
- {% endif %}
-
-</table>
diff --git a/opentech/apply/funds/templates/funds/includes/review_table_row.html b/opentech/apply/funds/templates/funds/includes/review_table_row.html
deleted file mode 100644
index 1e30276ad..000000000
--- a/opentech/apply/funds/templates/funds/includes/review_table_row.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{% load wagtailimages_tags %}
-
-<tr class="tr--subchild {{ class }} {% if missing %}no-response{% endif %}">
- {% if missing %}
- <td class="reviews-sidebar__author" colspan="2">
- <span>
- {{ reviewer }}
- {% if role %}{% image role.icon max-12x12 %}{% endif %}
- </span>
- </td>
- <td>-</td>
- <td>-</td>
- {% else %}
- <td class="reviews-sidebar__author" colspan="2">
- {% if request.user.is_apply_staff or request.user == reviewer %}
- <a href="{% url 'apply:submissions:reviews:review' submission_pk=review.submission.id pk=review.id %}">
- <span>
- {{ reviewer }}
- {% if role %}{% image role.icon max-12x12 %}{% endif %}
- </span>
- </a>
- <div class="reviews-sidebar__date">{{ review.updated_at|date:"Y-m-d" }}</div>
- {% else %}
- <span>
- {{ reviewer }}
- {% if role %}{% image role.icon max-12x12 %}{% endif %}
- </span>
- {% endif %}
- </td>
- <td>{{ review.get_recommendation_display }}</td>
- <td>{{ review.get_score_display }}</td>
- {% endif %}
-</tr>
-
-{% for opinion in review.opinions.all %}
-<tr class="tr--subchild">
- <td class="reviews-sidebar__author" colspan="2">
- <span>
- {{ opinion.author }}
- {% if opinion.get_author_assignment %}{% image opinion.get_author_assignment.icon max-12x12 %}{% endif %}
- </span>
- </td>
- <td></td>
- <td>{{ opinion.get_opinion_display }}</td>
-</tr>
-{% endfor %}
\ No newline at end of file
--
GitLab