[75] Assign Evaluators to a Submission (WIP) #329
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export PHOENIX_URI="localhost:4000" | ||
|
There was a problem hiding this comment. are you using nix? this value is defined in |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,9 @@ class SubmissionsController < ApplicationController | |
| before_action -> { authorize_user('challenge_manager') } | ||
| before_action :set_submission, only: [:show, :update] | ||
|
|
||
| def show | ||
| @available_evaluators = @submission.phase.evaluators - @submission.evaluators | ||
|
There was a problem hiding this comment. this list needs a bit of tweaking to account for different statuses. available evaluators should include evaluators that were assigned and then unassigned. when you add specs we should test all these scenarios where the evaluators are in different states of assigned/unassigned/recused/recused_unassigned and make sure it's working for each case. There was a problem hiding this comment. See this Figma comment thread.. if the evaluator was unassigned the button CTA should read "Reassign to Submission". |
||
| end | ||
|
|
||
| def update | ||
| if @submission.update!(submission_params) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,46 @@ | ||||||
| <div class="usa-accordion"> | ||||||
| <% rand = SecureRandom.hex(8) %> | ||||||
| <h2 class="usa-accordion__heading" id="<%= "#{rand}-accordion-heading" %>"> | ||||||
| <button | ||||||
| type="button" | ||||||
| class="usa-accordion__button display-flex flex-justify icon-white" | ||||||
| aria-expanded="true" | ||||||
| aria-controls="<%= rand %>" | ||||||
| > | ||||||
| <div>Assigned Evaluators</div> | ||||||
| </button> | ||||||
| </h2> | ||||||
|
|
||||||
| <div class="usa-accordion__content" id="<%= rand %>"> | ||||||
| <table class="usa-table usa-table--stacked-header usa-table--borderless gray-header"> | ||||||
| <thead> | ||||||
| <tr> | ||||||
| <th scope="col">Evaluator name</th> | ||||||
| <th scope="col">Evaluation Status</th> | ||||||
| <th scope="col">Score</th> | ||||||
| <th scope="col" aria-label="Actions"></th> | ||||||
| </tr> | ||||||
| </thead> | ||||||
| <tbody> | ||||||
| <% @submission.evaluators.each do |evaluator| %> | ||||||
|
There was a problem hiding this comment. we should filter this by evaluator_submission_assignments with assigned or recused status. (this should work, or you can assign the filtered list in the controller like you do with @available_evaluators)
Suggested change
|
||||||
| <tr data-evaluator-id="<%= evaluator.id %>" data-evaluator-type="user"> | ||||||
| <th scope="row" data-label="Evaluator name" class="text-top"> | ||||||
| <span class="text-bold text-ls-1 line-height-sans-4"><%= "#{evaluator.first_name} #{evaluator.last_name}" %></span> | ||||||
| </th> | ||||||
| <td data-label="Evaluation Status" class="text-top"></td> | ||||||
| <td data-label="Score" class="text-top"></td> | ||||||
| <td data-label=""> | ||||||
| <div class="display-flex flex-no-wrap grid-row"> | ||||||
| <%= form_with url: phase_evaluator_submission_assignments_path(@submission.phase) do |f| %> | ||||||
| <%= f.hidden_field :evaluator_id, value: evaluator.id %> | ||||||
| <%= f.hidden_field :submission_id, value: @submission.id %> | ||||||
| <%= f.submit "Unassign" %> | ||||||
|
Comment on lines
+34
to
+37
There was a problem hiding this comment. this form routes to the create action when it should issue an update to the existing evaluator_submission_assignment to mark it unassigned if it's assigned and recused_unassigned if it is recused status. |
||||||
| <% end %> | ||||||
| </div> | ||||||
| </td> | ||||||
| </tr> | ||||||
| <% end %> | ||||||
| </tbody> | ||||||
| </table> | ||||||
| </div> | ||||||
| </div> | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <div class="usa-accordion"> | ||
| <% rand = SecureRandom.hex(8) %> | ||
| <h2 class="usa-accordion__heading" id="<%= "#{rand}-accordion-heading" %>"> | ||
| <button | ||
| type="button" | ||
| class="usa-accordion__button display-flex flex-justify icon-white" | ||
| aria-expanded="true" | ||
| aria-controls="<%= rand %>" | ||
| > | ||
| <div>Available Evaluators</div> | ||
| </button> | ||
| </h2> | ||
|
|
||
| <div class="usa-accordion__content background-primary-lighter" id="<%= rand %>"> | ||
| <% @available_evaluators.each do |evaluator| %> | ||
| <div class="float-left"> | ||
| <%= "#{evaluator.first_name} #{evaluator.last_name}" %> <br/> | ||
| <%= evaluator.email %> | ||
| </div> | ||
| <div class="float-right"> | ||
| <%= form_with url: phase_evaluator_submission_assignments_path(@submission.phase) do |f| %> | ||
| <%= f.hidden_field :evaluator_id, value: evaluator.id %> | ||
| <%= f.hidden_field :submission_id, value: @submission.id %> | ||
| <%= f.submit "Assign" %> | ||
| <% end %> | ||
| </div> | ||
|
|
||
| <% end %> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <div data-controller="submission-details"> | ||
| <% rand = SecureRandom.hex(8) %> | ||
| <%= form_with(model: @submission, url: submission_path(@submission), class: "maxw-mobile-lg") do |form| %> | ||
| <div class="usa-checkbox" id="eligible-for-evaluation"> | ||
| <input | ||
| class="usa-checkbox__input usa-checkbox__input--tile" | ||
| type="checkbox" | ||
| id="<%= "#{rand}-judging-status-selected" %>" | ||
| value="selected" | ||
| <%= "disabled" if @submission.judging_status == "winner" %> | ||
|
There was a problem hiding this comment. it looks like #321 will merge first so I wanted to leave a reminder to update this disabled state from that logic once it's merged: Challenge_platform/app/models/submission.rb Lines 78 to 84 in bde972d (also the winner status disabled below) |
||
| <%= "checked" if @submission.judging_status.in?(["selected", "winner"]) %> | ||
| data-action="change->submission-details#eligibleCheck" | ||
| data-submission-details-target="eligibleCheckbox" | ||
| /> | ||
| <label class="usa-checkbox__label" for="<%= "#{rand}-judging-status-selected" %>" | ||
| >This submission is eligible for evaluation. | ||
| <span class="usa-checkbox__label-description" | ||
| >Check the box if the submission is pre-screened and is eligible for the evaluation process.</span | ||
| ></label | ||
| > | ||
| </div> | ||
| <div class="usa-checkbox" id="selected-to-advance"> | ||
| <input | ||
| class="usa-checkbox__input usa-checkbox__input--tile" | ||
| id="<%= "#{rand}-judging-status-winner" %>" | ||
| type="checkbox" | ||
| <%= "disabled" unless @submission.judging_status.in?(["selected", "winner"]) %> | ||
| <%= "checked" if @submission.judging_status == "winner" %> | ||
| data-action="change->submission-details#selectedCheck" | ||
| data-submission-details-target="winnerCheckbox" | ||
| /> | ||
| <label class="usa-checkbox__label" for="<%= "#{rand}-judging-status-winner" %>" | ||
| >This submission is selected to advance. | ||
| <span class="usa-checkbox__label-description" | ||
| >Check the box to select this submission to advance or for award after all evaluations are completed.</span | ||
| ></label | ||
| > | ||
| </div> | ||
| <input | ||
| id="judging-status-hidden" | ||
| type="hidden" | ||
| name="submission[judging_status]" | ||
| data-submission-details-target="judgingStatusHidden" | ||
| /> | ||
| <div class="usa-form-group"> | ||
| <%= form.label :comments, "Comments and notes:", class: "usa-label" %> | ||
| <%= form.text_area :comments, class: "usa-textarea", default: @submission.comments %> | ||
| </div> | ||
| <button type="submit" name="commit" class="usa-button font-body-2xs text-no-wrap margin-y-2"> | ||
| Save | ||
| </button> | ||
| <% end %> | ||
| </div> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,4 @@ | ||
| <%= render partial: 'details_form' %> | ||
| <% if @submission.judging_status.in?(["selected", "winner"]) %> | ||
| <%= render partial: 'submission_evaluation' %> | ||
| <% end %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <h2>Submission Evaluation</h2> | ||
| <% if @submission.phase.evaluation_form.nil? %> | ||
| <%= render 'shared/alert_error', alert_heading: t('alerts.no_evaluation_form.heading'), alert_text: t('alerts.no_evaluation_form.text') %> | ||
| <% else %> | ||
| <%= render partial: 'assigned_evaluators' %> | ||
| <%= render partial: 'available_evaluators' %> | ||
| <% end %> | ||
|
There was a problem hiding this comment. Don't forget the link to "Manage my evaluation panel" |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should probably remove this file, not sure why we need it?