diff --git a/backend/reviews/admin.py b/backend/reviews/admin.py index 1ef5e305fd..c0359f1121 100644 --- a/backend/reviews/admin.py +++ b/backend/reviews/admin.py @@ -395,11 +395,7 @@ def _review_proposals_recap_view(self, request, review_session): for proposal in proposals: decision = decisions[proposal.id] - - if decision == "accept": - proposal.status = Submission.STATUS.accepted - elif decision == "reject": - proposal.status = Submission.STATUS.rejected + proposal.status = decision Submission.objects.bulk_update( proposals, @@ -466,6 +462,7 @@ def _review_proposals_recap_view(self, request, review_session): review_session_id=review_session_id, audience_levels=conference.audience_levels.all(), review_session_repr=str(review_session), + all_statuses=[choice for choice in Submission.STATUS], title="Recap", ) return TemplateResponse(request, "proposals-recap.html", context) diff --git a/backend/reviews/templates/proposals-recap.html b/backend/reviews/templates/proposals-recap.html index 770337ed03..be25a281da 100644 --- a/backend/reviews/templates/proposals-recap.html +++ b/backend/reviews/templates/proposals-recap.html @@ -22,6 +22,36 @@ width: 100%; } + table.results-table { + border-collapse: separate; + border-spacing: 0; + } + + .results-table thead { + position: sticky; + top: 43px; + } + + .results-table ul { + margin-left: 0; + padding: 0; + list-style-type: none; + list-style-position: inside; + } + + .results-table ul li { + list-style-type: none; + } + + .results-table .votes-list { + max-width: 400px; + } + + .votes-list ul li { + list-style: square; + list-style-position: inside; + } + .decision-input-wrapper label { display: block; } @@ -55,50 +85,51 @@ gap: 50px; } + .reviews-bottom-bar-stats ul { + padding: 0 !important; + } + .reviews-bottom-bar-confirm-bar { max-width: 800px; } - #accepted-proposals-num { - color: #33bc8b; + ul.proposal-ranking { + margin-top: 0; + margin-left: 30px; } - #rejected-proposals-num { - color: #f8b03d; + .hidden { + display: none; } - .results-table ul { - margin-left: 0; - padding: 0; - list-style-type: none; - list-style-position: inside; + #accepted-proposals-num { + color: #48ff5a; } - .results-title ul { - margin-top: 20px; + #rejected-proposals-num { + color: #48ff5a; } - .opt-filter { - display: grid; - grid-template-columns: auto 1fr; + #waitinglist-proposals-num { + color: #48ff5a; } - .opt-filter-values { - display: flex; + .opt-filter { + display: grid; + gap: 10px; + grid-template-columns: max-content auto; align-items: center; + margin-top: 10px; } - .opt-filter-value { - padding: 10px; - } - - .hidden { - display: none; + .opt-filter label + label { + margin-left: 10px; } - + + {{forloop.counter}} {{item.title}} -

- Audience level: {{ item.audience_level.name }} -

-

- Languages: {{ item.languages.all|join:", " }} -

+ + + + {{ item.score }} + + - -
-
- {% with speaker_id=item.speaker_id|stringformat:"i" %} -

Speaker name: {{ item.speaker.fullname }} -

Speaker country: {{ item.speaker.country|countryname }}

-

Speaker gender: {{ item.speaker.gender }}

- {% if speaker_id in grants %} - {% with grant=grants|get_item:speaker_id %} -

💰 Requested a grant ({{ grant.status }})

- {% endwith %} - {% endif %} - {% endwith %} -
- {{ item.score }} - - - - - {{item.type}} - {{item.status}} {% if item.pending_status %}
- (pending: {{item.pending_status}}) - {% endif %} + {{item.status}} - - +