diff --git a/hypha/apply/funds/tables.py b/hypha/apply/funds/tables.py index 45a1352f933d69f31cdc8c2bd8e27809b5743665..90c88a2ea4cdfd6bc2cc4b694c774211215d4e23 100644 --- a/hypha/apply/funds/tables.py +++ b/hypha/apply/funds/tables.py @@ -132,7 +132,7 @@ class LabeledCheckboxColumn(tables.CheckBoxColumn): class BaseAdminSubmissionsTable(SubmissionsTable): lead = tables.Column(order_by=('lead__full_name',)) - reviews_stats = tables.TemplateColumn(template_name='funds/tables/column_reviews.html', verbose_name=mark_safe("Reviews<div>Assgn.\tComp.</div>"), orderable=False) + reviews_stats = tables.TemplateColumn(template_name='funds/tables/column_reviews.html', verbose_name=mark_safe("Reviews<div>Comp. <span class=\"counts-separator\">/</span> Assgn.</div>"), orderable=False) screening_status = tables.Column(verbose_name=_('Screening'), accessor='screening_statuses') class Meta(SubmissionsTable.Meta): diff --git a/hypha/apply/funds/templates/funds/tables/column_reviews.html b/hypha/apply/funds/templates/funds/tables/column_reviews.html index e7c0666c71162315af50875493787a39b6734ce6..1b89d74a34853f342b4b487c3a663fde26dd5af0 100644 --- a/hypha/apply/funds/templates/funds/tables/column_reviews.html +++ b/hypha/apply/funds/templates/funds/tables/column_reviews.html @@ -3,13 +3,16 @@ <table class="reviews-summary"> <tr class="reviews-summary__tr"> <td class="reviews-summary__td"> - {% if record.stage.has_external_review %} - {{ record.review_count|default:'0' }} - {% else %} - {{ record.review_staff_count|default:'0' }} - {% endif %} + <div class="reviews-summary__td-width"> + {{ record.review_submitted_count|default:'0' }} + <span class="counts-separator">/</span> + {% if record.stage.has_external_review %} + {{ record.review_count|default:'0' }} + {% else %} + {{ record.review_staff_count|default:'0' }} + {% endif %} + </div> </td> - <td class="reviews-summary__td">{{ record.review_submitted_count|default:'0' }}</td> <td class="reviews-summary__td">{{ record.review_recommendation|traffic_light }}</td> </tr> </table> diff --git a/hypha/apply/review/templatetags/review_tags.py b/hypha/apply/review/templatetags/review_tags.py index 891c3699fa4e75314fa551373de4253c1d9b0e7d..b240d5ede275b4609e5b991c0fa9001ac7a4ebd8 100644 --- a/hypha/apply/review/templatetags/review_tags.py +++ b/hypha/apply/review/templatetags/review_tags.py @@ -29,7 +29,7 @@ def traffic_light(value): try: return mark_safe(TRAFFIC_LIGHT_TEMPLATE.format(**TRAFFIC_LIGHT_COLORS[value])) except KeyError: - return '-' + return '' @register.filter diff --git a/hypha/static_src/src/sass/apply/components/_reviews-summary.scss b/hypha/static_src/src/sass/apply/components/_reviews-summary.scss index 82005d63b81028ce0f975c07d2c61f5a33eb6638..73d823ad3186b0e74426780235fdc5e71848af17 100644 --- a/hypha/static_src/src/sass/apply/components/_reviews-summary.scss +++ b/hypha/static_src/src/sass/apply/components/_reviews-summary.scss @@ -14,5 +14,14 @@ &__td { padding: 10px; vertical-align: middle; + text-align: center; } + + &__td-width { + width: max-content; + } +} + +.counts-separator { + color: $color--mid-grey; }