[75] Assign Evaluators to a Submission (WIP)

.zshrc

@@ -0,0 +1 @@
+export PHOENIX_URI="localhost:4000"

app/controllers/evaluator_submission_assignments_controller.rb

@@ -4,8 +4,26 @@
 class EvaluatorSubmissionAssignmentsController < ApplicationController
   before_action -> { authorize_user('challenge_manager') }
   before_action :set_challenge_and_phase
-  before_action :set_evaluator, only: [:index]
+  before_action :set_evaluator, only: [:index, :create]
   before_action :set_assignment, only: [:update]
+  before_action :set_submission, only: [:create]
+
+  def create
+    @evaluator_submission_assignment = EvaluatorSubmissionAssignment.new(
+      user_id: params["evaluator_id"],
+      submission_id: @submission.id,
+      status: :assigned
+      )
+    if @evaluator_submission_assignment.save
+      redirect_to submission_path(@submission), notice: I18n.t("evaluator_submission_assignment_saved")
+    else
+      redirect_to confirmation_evaluation_form_path(@evaluator_submission_assignment), notice: I18n.t("evaluation_form_saved")
+    end
+  end
+
+  def unassign
+
+  end  
 
   def index
     @evaluator_assignments = @phase.evaluator_submission_assignments.includes(:submission).where(user_id: @evaluator.id)
@@ -49,6 +67,10 @@ def set_assignment
     @assignment = @phase.evaluator_submission_assignments.find(params[:id])
   end
 
+  def set_submission
+    @submission = @phase.submissions.find(params[:submission_id])
+  end  
+
   def status_from_params
     status = params[:status] || params.dig(:evaluator_submission_assignment, :status)
     status&.to_sym

app/controllers/submissions_controller.rb

@@ -5,11 +5,13 @@ class SubmissionsController < ApplicationController
   before_action -> { authorize_user('challenge_manager') }
   before_action :set_submission, only: [:show, :update]
 
-  def show; end
+  def show
+    @available_evaluators = @submission.phase.evaluators - @submission.evaluators
+  end  
 
   def update
     if @submission.update!(submission_params)
-      flash.now[:success] = I18n.t("comments_saved")
+      flash.now[:success] = I18n.t("submission_updated")
       render :show, submission: @submission
     else
       render :show, status: :unprocessable_entity, submission: @submission
@@ -19,7 +21,7 @@ def update
   private
 
   def submission_params
-    params.require(:submission).permit(:comments)
+    params.require(:submission).permit(:comments, :judging_status)
   end
 
   # User access enforced by role

app/javascript/controllers/index.js

@@ -22,5 +22,8 @@ application.register("evaluation-form", EvaluationFormController);
 import HotdogController from "./hotdog_controller";
 application.register("hotdog", HotdogController);
 
+import SubmissionDetailsController from "./submission_details_controller";
+application.register("submission-details", SubmissionDetailsController);
+
 import ModalController from "./modal_controller";
 application.register("modal", ModalController);

app/javascript/controllers/submission_details_controller.js

@@ -0,0 +1,23 @@
+import { Controller } from "@hotwired/stimulus"
+
+// Connects to data-controller="submission-details"
+export default class extends Controller {
+
+  eligibleCheck(e) {
+    const hiddenInput = e.target.form.elements["judging-status-hidden"]
+    if (e.target.checked) {
+      hiddenInput.value = "selected"
+    } else {
+      hiddenInput.value = "qualified"
+    }
+  }
+
+  selectedCheck(e) {
+    const hiddenInput = e.target.form.elements["judging-status-hidden"]
+    if (e.target.checked) {
+      hiddenInput.value = "winner"
+    } else {
+      hiddenInput.value = "selected"
+    }
+  }
+}

app/views/shared/_alert_error.html.erb

@@ -1,5 +1,5 @@
 <div class="grid-row margin-top-105">
-  <div class="grid-col-12 tablet:grid-col-6">
+  <div class="maxw-mobile-lg">
     <div class="usa-alert usa-alert--error padding-top-105" role="alert">
       <div class="usa-alert__body">
         <h4 class="usa-alert__heading"><%= alert_heading %></h4>

app/views/submissions/_assigned_evaluators.html.erb

@@ -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| %>
+              <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" %>
+                    <% end %>
+                  </div>
+                </td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+  </div>
+</div>

app/views/submissions/_available_evaluators.html.erb

@@ -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>

app/views/submissions/_details_form.html.erb

@@ -0,0 +1,51 @@
+<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" %>
+            <%= "checked" if @submission.judging_status.in?(["selected", "winner"]) %>
+            data-action="change->submission-details#eligibleCheck"
+            />
+            <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"
+            />
+            <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="hiddenInput"
+        />
+        <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>

app/views/submissions/_submission_details.html.erb

@@ -0,0 +1,4 @@
+<%= render partial: 'details_form' %>
+<% if @submission.judging_status.in?(["selected", "winner"]) %>
+    <%= render partial: 'submission_evaluation' %>
+<% end %>

app/views/submissions/_submission_evaluation.html.erb

@@ -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 %>

app/views/submissions/show.html.erb

@@ -1,4 +1,4 @@
 <h1>Submission ID <%= @submission.id %></h1>
-<p class="text-normal">View submission information and assign evaluators to evaluate the submission.</p>
+<h2 class="font-body-sm text-normal">View submission information and assign evaluators to evaluate the submission.</h2>
 
-<%= render partial: "layouts/hotdog", locals: {left: 'submissions/comment_form', right: 'submissions/submission_materials', name: 'Submission Materials'} %>
+<%= render partial: "layouts/hotdog", locals: {left: 'submissions/submission_details', right: 'submissions/submission_materials', name: 'Submission Materials'} %>

config/locales/en.yml

@@ -32,7 +32,9 @@ en:
   already_logged_in_notice: "You are already logged in."
   evaluation_form_destroyed: "Evaluation form was successfully destroyed."
   evaluation_form_saved: "Evaluation form was saved successfully."
+  evaluator_submission_assignment_saved: "Submission assignment was saved succesfully."
   comments_saved: "Comments saved succesfully."
+  submission_updated: "Submission was updated succesfully."
   login_error: "There was an issue with logging in. Please try again."
   please_try_again: "Please try again."
   session_expired_alert: "Your session has expired. Please log in again."

config/routes.rb

@@ -26,7 +26,7 @@
         post 'resend_invite'
       end
     end
-    resources :evaluator_submission_assignments, only: [:index, :update]
+    resources :evaluator_submission_assignments, only: [:index, :update, :create]
   end
   resources :submissions, only: [:index, :show, :update]
 

db/structure.sql

@@ -1109,7 +1109,7 @@ CREATE TABLE public.submissions (
     description_delta text,
     brief_description_delta text,
     pdf_reference character varying(255),
-    comments text
+    comments character varying
 );
 
 

spec/factories/submission.rb

@@ -8,5 +8,6 @@
 
     title { Faker::Lorem.sentence }
     status { "draft" }
+    external_url { "www.example.com" }
   end
 end

spec/system/submission_details_spec.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe "A11y", :js do
+  describe "Logged-in as a Challenge Manager" do
+    let(:user) { create_user(role: "challenge_manager") }
+    let(:challenge) { create_challenge(user: user, title: "Boston Tea Party Cleanup") }
+    let(:submission) { create(:submission, manager: user, challenge: challenge) }
+
+
+    before { system_login_user(user) }
+
+    it "submission details page is accessible" do
+      visit submission_path(submission)
+      expect(user.role).to eq("challenge_manager")
+      expect(page).to have_css('h1', text: "Submission ID #{submission.id}")
+      expect(page).to(be_axe_clean)
+    end
+
+    it "allows manipulation of judging status" do
+      visit submission_path(submission)
+
+      find_by_id('eligible-for-evaluation').click
+      click_on('Save')
+      updated_submission = Submission.find(submission.id)
+      expect(updated_submission.judging_status).to eq('selected')
+
+      find_by_id('selected-to-advance').click
+      click_on('Save')
+      updated_submission = Submission.find(submission.id)
+      expect(updated_submission.judging_status).to eq('winner')
+    end
+
+    it "saves comments" do
+      visit submission_path(submission)
+      comments = Faker::Lorem.sentence
+
+      fill_in "Comments and notes:", with: comments
+      click_on('Save')
+      updated_submission = Submission.find(submission.id)
+      expect(updated_submission.comments).to eq(comments)
+    end
+  end
+end