diff --git a/hypha/apply/funds/models/submissions.py b/hypha/apply/funds/models/submissions.py
index e0612b8e5eec2c791712e33da3d7f38577408795..307a21a52ef0e59bab11ea655b5f714180d9a3a5 100644
--- a/hypha/apply/funds/models/submissions.py
+++ b/hypha/apply/funds/models/submissions.py
@@ -254,10 +254,11 @@ class ApplicationSubmissionQueryset(JSONOrderable):
'round',
'lead',
'user',
- 'screening_status',
'previous__page',
'previous__round',
'previous__lead',
+ ).prefetch_related(
+ 'screening_statuses'
)
diff --git a/hypha/apply/funds/tables.py b/hypha/apply/funds/tables.py
index ca2b124a0b7e90753f8fc1987b03a1d282279354..5f0eef29f52a68509e1c69172c2a8fe4cbfa5648 100644
--- a/hypha/apply/funds/tables.py
+++ b/hypha/apply/funds/tables.py
@@ -193,7 +193,7 @@ def get_reviewers(request):
def get_screening_statuses(request):
return ScreeningStatus.objects.filter(
- id__in=ApplicationSubmission.objects.all().values('screening_status__id').distinct('screening_status__id'))
+ id__in=ApplicationSubmission.objects.all().values('screening_statuses__id').distinct('screening_statuses__id'))
def get_meta_terms(request):
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html
index 854d7c9af04a7a8332e7a1f5d7c09db4ce5d2977..04a50440ba46a114a132e7ce5e6dddcef66aa7a5 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html
@@ -49,7 +49,7 @@
{% endblock %}
{% block screening_status %}
- {% include 'funds/includes/screening_status_block.html' %}
+ {% include 'funds/includes/screening_status_block.html' with default_yes=default_yes_screening_status default_no=default_no_screening_status %}
{% endblock %}
{% block meta_terms %}
diff --git a/hypha/apply/funds/templates/funds/includes/screening_status_block.html b/hypha/apply/funds/templates/funds/includes/screening_status_block.html
index 8600cd5f3b5d4199717aad73944a2fa7324bace2..a67aaf4e312bdd1b57e8a19d6b01deb81aac7d4d 100644
--- a/hypha/apply/funds/templates/funds/includes/screening_status_block.html
+++ b/hypha/apply/funds/templates/funds/includes/screening_status_block.html
@@ -1,6 +1,26 @@
<div class="sidebar__inner">
+
<h5>Screening Status</h5>
+ <div style="display: flex;">
+ <div style="margin-right: 2em;">
+ <div>
+ {{ default_yes }}
+ </div>
+ <div>
+ <svg class="icon icon--private-eye" style="margin-right: 2em;"><use xlink:href="#like"></use></svg>
+ </div>
+ </div>
+ <div>
+ <div>
+ {{ default_no }}
+ </div>
+ <div>
+ <svg class="icon icon--private-eye" style="margin-right: 2em;"><use xlink:href="#dislike"></use></svg>
+ </div>
+ </div>
+ </div>
+
<p>
- {% if object.screening_statuses.exists %}{{ object.screening_statuses|default:"Awaiting Screen status" }}{% endif %} <a data-fancybox data-src="#screen-application" class="link link--secondary-change" href="#">Change</a>
+ <!-- {% if object.screening_statuses.exists %}{{ object.screening_statuses|default:"Awaiting Screen status" }}{% endif %} <a data-fancybox data-src="#screen-application" class="link link--secondary-change" href="#">Change</a> -->
</p>
</div>
diff --git a/hypha/apply/funds/views.py b/hypha/apply/funds/views.py
index 0904840ebd30aec4d6774167b3597a24383ad3f0..fa8deffb6b7ff293b8b14efb39e5684df93399c4 100644
--- a/hypha/apply/funds/views.py
+++ b/hypha/apply/funds/views.py
@@ -82,6 +82,7 @@ from .models import (
ReviewerSettings,
RoundBase,
RoundsAndLabs,
+ ScreeningStatus,
)
from .permissions import is_user_has_access_to_view_submission
from .tables import (
@@ -754,10 +755,17 @@ class AdminSubmissionDetailView(ReviewContextMixin, ActivityContextMixin, Delega
other_submissions = other_submissions.exclude(id=self.object.next.id)
public_page = self.object.get_from_parent('detail')()
-
+ default_yes_screening_status = ScreeningStatus.objects.get(
+ default=True, yes=True
+ )
+ default_no_screening_status = ScreeningStatus.objects.get(
+ default=True, yes=False
+ )
return super().get_context_data(
other_submissions=other_submissions,
public_page=public_page,
+ default_yes_screening_status=default_yes_screening_status,
+ default_no_screening_status=default_no_screening_status,
**kwargs,
)
diff --git a/hypha/templates/includes/sprites.html b/hypha/templates/includes/sprites.html
index ebe021589cd7a9834f0b2a19959bdd6434d2c9af..a7d8a02d9c5f5ba5abf9effac76b3e2684b35994 100644
--- a/hypha/templates/includes/sprites.html
+++ b/hypha/templates/includes/sprites.html
@@ -332,4 +332,74 @@
<symbol id="anchor-link" viewBox="0 0 512 512">
<path fill="currentColor" d="M326.612 185.391c59.747 59.809 58.927 155.698.36 214.59-.11.12-.24.25-.36.37l-67.2 67.2c-59.27 59.27-155.699 59.262-214.96 0-59.27-59.26-59.27-155.7 0-214.96l37.106-37.106c9.84-9.84 26.786-3.3 27.294 10.606.648 17.722 3.826 35.527 9.69 52.721 1.986 5.822.567 12.262-3.783 16.612l-13.087 13.087c-28.026 28.026-28.905 73.66-1.155 101.96 28.024 28.579 74.086 28.749 102.325.51l67.2-67.19c28.191-28.191 28.073-73.757 0-101.83-3.701-3.694-7.429-6.564-10.341-8.569a16.037 16.037 0 0 1-6.947-12.606c-.396-10.567 3.348-21.456 11.698-29.806l21.054-21.055c5.521-5.521 14.182-6.199 20.584-1.731a152.482 152.482 0 0 1 20.522 17.197zM467.547 44.449c-59.261-59.262-155.69-59.27-214.96 0l-67.2 67.2c-.12.12-.25.25-.36.37-58.566 58.892-59.387 154.781.36 214.59a152.454 152.454 0 0 0 20.521 17.196c6.402 4.468 15.064 3.789 20.584-1.731l21.054-21.055c8.35-8.35 12.094-19.239 11.698-29.806a16.037 16.037 0 0 0-6.947-12.606c-2.912-2.005-6.64-4.875-10.341-8.569-28.073-28.073-28.191-73.639 0-101.83l67.2-67.19c28.239-28.239 74.3-28.069 102.325.51 27.75 28.3 26.872 73.934-1.155 101.96l-13.087 13.087c-4.35 4.35-5.769 10.79-3.783 16.612 5.864 17.194 9.042 34.999 9.69 52.721.509 13.906 17.454 20.446 27.294 10.606l37.106-37.106c59.271-59.259 59.271-155.699.001-214.959z"></path>
</symbol>
+
+ <symbol id="like" viewBox="0 0 512 512">
+ <rect x="10.667" y="234.667" style="fill:#0277BD;" width="149.333" height="256"/>
+ <path style="fill:#01579B;" d="M160,501.333H10.667C4.776,501.333,0,496.558,0,490.667v-256C0,228.776,4.776,224,10.667,224H160
+ c5.891,0,10.667,4.776,10.667,10.667v256C170.667,496.558,165.891,501.333,160,501.333z M21.333,480h128V245.333h-128V480z"/>
+ <path style="fill:#ECEFF1;" d="M160,448c18.59,13.606,40.965,21.064,64,21.333h197.333c20.571,0.072,37.306-16.546,37.378-37.118
+ c0.036-10.343-4.23-20.236-11.778-27.309c20.37-2.201,35.1-20.499,32.899-40.869c-0.956-8.848-5.061-17.057-11.565-23.131
+ c20.373-2.177,35.124-20.458,32.946-40.831c-1.337-12.508-8.921-23.487-20.146-29.164c20.018-12.432,26.167-38.738,13.735-58.756
+ c-7.763-12.5-21.42-20.118-36.135-20.156H309.333c11.719-30.799,18.905-63.136,21.333-96c0-40-34.667-74.667-53.333-74.667
+ c-11.512,0.168-22.69,3.894-32,10.667v74.667l-64,138.667L160,256V448z"/>
+ <path style="fill:#01579B;" d="M421.333,480H224c-25.865-0.206-50.969-8.783-71.552-24.448c-1.999-2.004-3.12-4.721-3.115-7.552V256
+ c0-4.037,2.279-7.728,5.888-9.536l17.984-9.003l61.461-133.12V32c-0.007-3.242,1.461-6.312,3.989-8.341
+ c11.226-8.25,24.747-12.791,38.677-12.992c24.683,0,64,39.061,64,85.333c-1.612,29.11-7.359,57.842-17.067,85.333h134.4
+ c29.455,0,53.333,23.878,53.333,53.333c0.035,13.237-4.916,26.002-13.867,35.755c18.566,18.691,18.464,48.894-0.227,67.46
+ c-3.591,3.567-7.728,6.54-12.253,8.807c3.32,6.62,5.037,13.928,5.013,21.333c-0.02,18.056-10.212,34.561-26.347,42.667
+ c3.32,6.62,5.037,13.928,5.013,21.333C469.286,458.508,447.82,479.965,421.333,480z M170.667,443.115
+ c16.153,9.666,34.517,15.021,53.333,15.552h197.333C436.056,458.655,447.988,446.723,448,432c0.001-7.328-3.053-14.324-8.427-19.307
+ c-4.291-4.036-4.498-10.787-0.462-15.078c1.729-1.839,4.055-3.005,6.563-3.29c14.517-1.534,25.042-14.547,23.507-29.064
+ c-0.67-6.34-3.609-12.224-8.275-16.568c-4.291-4.036-4.498-10.787-0.462-15.078c1.729-1.839,4.055-3.005,6.563-3.29
+ c14.518-1.53,25.046-14.539,23.516-29.056c-0.946-8.98-6.411-16.856-14.492-20.885c-5.235-2.702-7.289-9.135-4.587-14.371
+ c0.889-1.724,2.232-3.172,3.883-4.189c14.999-9.347,19.581-29.083,10.234-44.082c-5.794-9.298-15.941-14.985-26.896-15.075H309.333
+ c-5.891-0.003-10.664-4.781-10.661-10.672c0.001-1.296,0.237-2.581,0.699-3.792C310.612,158.61,317.559,127.561,320,96
+ c0-34.944-30.976-64-42.667-64c-7.482,0.121-14.815,2.108-21.333,5.781v68.885c-0.002,1.546-0.336,3.074-0.981,4.48l-64,138.667
+ c-1.016,2.192-2.746,3.975-4.907,5.056l-15.445,7.723V443.115z"/>
+ </symbol>
+
+ <symbol id="dislike" viewBox="0 0 512 512">
+ <g transform="matrix(-1,-2.4492935982947064e-16,-2.4492935982947064e-16,1,512.0084838867188,1.1368683772161603e-13)">
+
+ <rect x="10.667" y="21.338" style="fill:#0277BD;" width="149.333" height="256"/>
+ <path style="fill:#01579B;" d="M160,288.005H10.667C4.776,288.005,0,283.229,0,277.338v-256c0-5.891,4.776-10.667,10.667-10.667H160
+ c5.891,0,10.667,4.776,10.667,10.667v256C170.667,283.229,165.891,288.005,160,288.005z M21.333,266.671h128V32.005h-128V266.671z"
+ />
+ <path style="fill:#ECEFF1;" d="M160,64.005c18.59-13.606,40.965-21.064,64-21.333h197.333c20.571-0.072,37.306,16.546,37.378,37.118
+ c0.036,10.343-4.23,20.236-11.778,27.309c20.37,2.201,35.1,20.499,32.899,40.869c-0.956,8.848-5.061,17.057-11.565,23.131
+ c20.373,2.177,35.124,20.458,32.946,40.831c-1.337,12.508-8.921,23.487-20.146,29.164c20.018,12.432,26.167,38.738,13.735,58.756
+ c-7.763,12.5-21.42,20.118-36.135,20.156H309.333c11.719,30.799,18.905,63.136,21.333,96c0,40-34.667,74.667-53.333,74.667
+ c-11.512-0.168-22.69-3.894-32-10.667v-74.667l-64-138.667L160,256.005V64.005z"/>
+ <path style="fill:#01579B;" d="M277.333,501.338c-13.93-0.203-27.45-4.745-38.677-12.992c-2.528-2.03-3.996-5.099-3.989-8.341
+ v-72.341l-61.461-133.12l-17.984-9.003c-3.609-1.808-5.888-5.499-5.888-9.536v-192c-0.005-2.831,1.115-5.548,3.115-7.552
+ C173.032,40.789,198.135,32.212,224,32.005h197.333c26.495,0.035,47.965,21.505,48,48c0.026,7.403-1.684,14.71-4.992,21.333
+ c23.517,11.823,33.053,40.431,21.333,64c23.551,11.806,33.072,40.469,21.266,64.02c-2.268,4.523-5.24,8.657-8.807,12.246
+ c8.944,9.748,13.894,22.504,13.867,35.733c0,29.455-23.878,53.333-53.333,53.333h-134.4c9.713,27.489,15.46,56.223,17.067,85.333
+ C341.333,462.277,302.016,501.338,277.333,501.338z M256,474.223c6.521,3.667,13.853,5.654,21.333,5.781
+ c11.691,0,42.667-29.056,42.667-64c-2.454-31.559-9.4-62.607-20.629-92.203c-2.097-5.505,0.665-11.668,6.171-13.765
+ c1.211-0.461,2.496-0.698,3.792-0.699h149.333c17.672-0.152,31.876-14.602,31.724-32.274c-0.094-10.936-5.766-21.066-15.041-26.862
+ c-5.015-3.09-6.576-9.661-3.485-14.677c1.017-1.651,2.466-2.994,4.189-3.883c13.063-6.516,18.371-22.388,11.855-35.451
+ c-4.033-8.085-11.915-13.55-20.901-14.491c-5.853-0.666-10.058-5.952-9.391-11.805c0.286-2.508,1.451-4.834,3.29-6.563
+ c10.685-9.947,11.283-26.672,1.336-37.357c-4.344-4.666-10.228-7.605-16.568-8.275c-5.853-0.666-10.058-5.952-9.391-11.805
+ c0.286-2.508,1.451-4.834,3.29-6.563c5.375-4.99,8.428-11.994,8.427-19.328c-0.012-14.723-11.944-26.655-26.667-26.667H224
+ c-18.816,0.533-37.18,5.888-53.333,15.552v180.523l15.445,7.701c2.161,1.081,3.891,2.864,4.907,5.056l64,138.667
+ c0.648,1.412,0.983,2.948,0.981,4.501V474.223z"/>
+ <path d="M160,288.005H10.667C4.776,288.005,0,283.229,0,277.338v-256c0-5.891,4.776-10.667,10.667-10.667H160
+ c5.891,0,10.667,4.776,10.667,10.667v256C170.667,283.229,165.891,288.005,160,288.005z M21.333,266.671h128V32.005h-128V266.671z"
+ />
+ <path d="M277.333,501.338c-13.923-0.206-27.435-4.748-38.656-12.992c-2.536-2.025-4.013-5.096-4.011-8.341v-72.341l-61.461-133.12
+ l-17.984-9.003c-5.272-2.633-7.412-9.042-4.779-14.315c2.633-5.272,9.042-7.412,14.315-4.779l21.333,10.667
+ c2.161,1.081,3.891,2.864,4.907,5.056l64,138.667c0.655,1.41,0.997,2.946,1.003,4.501v68.885c6.521,3.667,13.853,5.654,21.333,5.781
+ c11.691,0,42.667-29.056,42.667-64c-2.454-31.559-9.4-62.607-20.629-92.203c-2.097-5.505,0.665-11.668,6.171-13.765
+ c1.211-0.461,2.496-0.698,3.792-0.699h149.333c17.672-0.152,31.876-14.602,31.724-32.274c-0.094-10.936-5.766-21.066-15.041-26.862
+ c-5.015-3.09-6.576-9.661-3.485-14.677c1.017-1.651,2.466-2.994,4.189-3.883c13.063-6.516,18.371-22.388,11.855-35.451
+ c-4.033-8.085-11.915-13.55-20.901-14.491c-5.853-0.666-10.058-5.952-9.391-11.805c0.286-2.508,1.451-4.834,3.29-6.563
+ c10.685-9.947,11.283-26.672,1.336-37.357c-4.344-4.666-10.228-7.605-16.568-8.275c-5.853-0.666-10.058-5.952-9.391-11.805
+ c0.286-2.508,1.451-4.834,3.29-6.563c5.375-4.99,8.428-11.994,8.427-19.328c-0.012-14.723-11.944-26.655-26.667-26.667H224
+ c-20.213,0.3-39.873,6.646-56.448,18.219c-4.237,4.093-10.99,3.975-15.083-0.262c-3.992-4.134-3.992-10.687,0-14.82
+ C173.045,40.807,198.14,32.223,224,32.005h197.333c26.495,0.035,47.965,21.505,48,48c0.026,7.403-1.684,14.71-4.992,21.333
+ c23.517,11.823,33.053,40.431,21.333,64c23.551,11.806,33.072,40.469,21.266,64.02c-2.268,4.523-5.24,8.657-8.807,12.246
+ c8.944,9.748,13.894,22.504,13.867,35.733c0,29.455-23.878,53.333-53.333,53.333h-134.4c9.713,27.489,15.46,56.223,17.067,85.333
+ C341.333,462.277,302.016,501.338,277.333,501.338z"/>
+ </symbol>
</svg>