[179] View Evaluator's Submissions

app/controllers/evaluator_submission_assignments_controller.rb

@@ -8,19 +8,24 @@ class EvaluatorSubmissionAssignmentsController < ApplicationController
   before_action :set_assignment, only: [:update]
 
   def index
-    @evaluator_assignments = @phase.evaluator_submission_assignments.where(user_id: @evaluator.id)
+    @evaluator_assignments = @phase.evaluator_submission_assignments.includes(:submission).where(user_id: @evaluator.id)
     @assigned_submissions = @evaluator_assignments.
-      where(status: %i[completed in_progress not_started recused]).
+      where(status: %i[assigned recused]).
+      includes(:evaluation).
       ordered_by_status
     @unassigned_submissions = @evaluator_assignments.
       where(status: %i[unassigned recused_unassigned]).
       ordered_by_status
-    @submissions_count = @assigned_submissions.group('evaluator_submission_assignments.status').count
+    @submissions_count = calculate_submissions_count(@assigned_submissions)
   end
 
   # update only the status of the evaluation submission assignment to unassign or reassign an evaluator
   def update
-    new_status = params[:status]&.to_sym
+    new_status = extract_status_from_params
+
+    unless valid_status?(new_status)
+      return render_invalid_status_error
+    end
 
     if update_assignment_status(new_status)
       handle_successful_update(new_status)
@@ -44,20 +49,47 @@ def set_assignment
     @assignment = @phase.evaluator_submission_assignments.find(params[:id])
   end
 
+  def extract_status_from_params
+    status = params[:status] || params.dig(:evaluator_submission_assignment, :status)
+    status&.to_sym
+  end
+
+  def valid_status?(status)
+    EvaluatorSubmissionAssignment.statuses.keys.map(&:to_sym).include?(status)
+  end
+
+  def render_invalid_status_error
+    render json: { success: false, message: 'Invalid status' }, status: :unprocessable_entity
+  end
+
   def update_assignment_status(new_status)
-    @assignment.update(status: EvaluatorSubmissionAssignment.statuses[new_status])
+    @assignment.update(status: new_status)
+  end
+
+  def calculate_submissions_count(assignments)
+    completed = assignments.count { |a| a.evaluation&.completed_at.present? }
+    in_progress = assignments.count { |a| a.evaluation.present? && a.evaluation.completed_at.nil? }
+    not_started = assignments.count { |a| a.evaluation.nil? }
+    total = completed + in_progress + not_started
+
+    {
+      "completed" => completed,
+      "in_progress" => in_progress,
+      "not_started" => not_started,
+      "total" => total
+    }
   end
 
   def handle_successful_update(new_status)
-    flash.now[:success] = t("evaluator_submission_assignments.#{new_status}.success")
+    flash[:success] = t("evaluator_submission_assignments.#{new_status}.success")
     respond_to do |format|
       format.html { redirect_to_assignment_path }
       format.json { render json: { success: true, message: flash[:success] } }
     end
   end
 
   def handle_failed_update(new_status)
-    flash.now[:error] = t("evaluator_submission_assignments.#{new_status}.failure")
+    flash[:error] = t("evaluator_submission_assignments.#{new_status}.failure")
     respond_to do |format|
       format.html { redirect_to_assignment_path }
       format.json { render json: { success: false, message: flash[:error] }, status: :unprocessable_entity }

app/controllers/evaluators_controller.rb

@@ -21,7 +21,7 @@ def create
     if result[:success]
       redirect_to phase_evaluators_path(@phase), notice: result[:message]
     else
-      flash.now[:alert] = result[:message]
+      flash[:alert] = result[:message]
       @evaluator_invitations = @phase.evaluator_invitations
       @existing_evaluators = @phase.evaluators
       render :index

app/helpers/evaluators_helper.rb

@@ -14,38 +14,34 @@ def assigned_submissions_count(evaluator, challenge, phase)
     if evaluator.is_a?(User)
       evaluator.evaluator_submission_assignments.
         joins(:submission).
-        where(submissions: { challenge:, phase: }).
-        where.not(status: [:unassigned, :recused_unassigned]).
+        where(submissions: { challenge: challenge, phase: phase }).
+        where(status: :assigned).
         count
     else
       0
     end
   end
 
-  def evaluation_status(status)
-    case status.to_sym
-    when :recused
-      'text-accent-warm-dark'
+  def evaluation_submission_assignment_color(assignment)
+    status = assignment.is_a?(EvaluatorSubmissionAssignment) ? assignment.evaluation_status : assignment.to_sym
+
+    case status
     when :not_started
-      'text-secondary-dark'
+      'bg-secondary-dark'
     when :in_progress
-      'text-orange'
+      'bg-orange text-black'
     when :completed
-      'text-green'
-    when :unassigned
-      'text-accent-cool-darker'
-    when :recused_unassigned
-      'text-secondary'
+      'bg-green'
+    when :recused, :unassigned, :recused_unassigned
+      'bg-base'
     else
-      'text-base'
+      'bg-base'
     end
   end
 
   def display_score(assignment)
-    if assignment.completed? && assignment.evaluation&.total_score
-      assignment.evaluation.total_score
-    else
-      'N/A'
-    end
+    return 'N/A' unless assignment.evaluation_status == :completed
+
+    assignment.evaluation.try(:total_score) || 'N/A'
   end
 end

app/javascript/controllers/unassign_evaluator_submission_modal_controller.js

@@ -1,18 +1,18 @@
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
-  static targets = ["modal", "confirmButton"]
+  static targets = ["modal"]
   static values = {
     phaseId: String,
     assignmentId: String
   }
 
   connect() {
-    this.modalTarget.addEventListener('click', this.handleOutsideClick.bind(this))
+    this.modalTarget.addEventListener('click', this.handleOutsideClick.bind(this));
   }
 
   disconnect() {
-    this.modalTarget.removeEventListener('click', this.handleOutsideClick.bind(this))
+    this.modalTarget.removeEventListener('click', this.handleOutsideClick.bind(this));
   }
 
   open(event) {
@@ -21,29 +21,23 @@ export default class extends Controller {
     this.modalTarget.showModal();
   }
 
-
   close() {
-    this.modalTarget.close()
+    this.modalTarget.close();
   }
 
   handleOutsideClick(event) {
     if (event.target === this.modalTarget) {
-      this.close()
+      this.close();
     }
   }
 
-  confirm() {
-    this.unassignEvaluatorSubmission()
-  }
-
   setValues(dataset) {
     this.assignmentIdValue = dataset.assignmentId;
     this.phaseIdValue = dataset.phaseId;
   }
 
   unassignEvaluatorSubmission() {
     const csrfToken = document.querySelector('meta[name="csrf-token"]').content;
-
     fetch(`/phases/${this.phaseIdValue}/evaluator_submission_assignments/${this.assignmentIdValue}`, {
       method: 'PATCH',
       headers: {
@@ -52,7 +46,7 @@ export default class extends Controller {
         'Accept': 'application/json'
       },
       body: JSON.stringify({
-        status: 'unassigned'
+        evaluator_submission_assignment: { status: 'unassigned' }
       })
     })
     .then(response => response.json())

app/models/evaluator_submission_assignment.rb

@@ -22,25 +22,47 @@ class EvaluatorSubmissionAssignment < ApplicationRecord
     assigned: 0,
     unassigned: 1,
     recused: 2,
+    recused_unassigned: 3
+  }
+
+  def evaluation_status
+    if assigned?
+      if evaluation.nil?
+        :not_started
+      elsif evaluation.completed_at.nil?
+        :in_progress
+      else
+        :completed
+      end
+    else
+      status.to_sym
+    end
+  end
+
+  ORDER_VALUES = {
+    recused: 0,
+    unassigned: 1,
+    recused_unassigned: 2,
     not_started: 3,
     in_progress: 4,
-    completed: 5,
-    recused_unassigned: 6
-  }
+    completed: 5
+  }.freeze
+
+  def ordering_priority
+    case evaluation_status
+    when :recused then ORDER_VALUES[:recused]
+    when :unassigned then ORDER_VALUES[:unassigned]
+    when :recused_unassigned then ORDER_VALUES[:recused_unassigned]
+    when :not_started then ORDER_VALUES[:not_started]
+    when :in_progress then ORDER_VALUES[:in_progress]
+    when :completed then ORDER_VALUES[:completed]
+    end
+  end
 
   scope :ordered_by_status, lambda {
-    order(
-      Arel.sql(
-        "CASE evaluator_submission_assignments.status
-          WHEN #{ActiveRecord::Base.connection.quote(statuses[:recused])} THEN 0
-          WHEN #{ActiveRecord::Base.connection.quote(statuses[:unassigned])} THEN 1
-          WHEN #{ActiveRecord::Base.connection.quote(statuses[:recused_unassigned])} THEN 2
-          WHEN #{ActiveRecord::Base.connection.quote(statuses[:not_started])} THEN 3
-          WHEN #{ActiveRecord::Base.connection.quote(statuses[:in_progress])} THEN 4
-          WHEN #{ActiveRecord::Base.connection.quote(statuses[:completed])} THEN 5
-          ELSE 6
-        END"
-      )
-    )
+    select('evaluator_submission_assignments.*, evaluations.id AS evaluation_id, evaluations.completed_at').
+      left_joins(:evaluation).
+      to_a.
+      sort_by(&:ordering_priority)
   }
 end

app/views/evaluator_submission_assignments/_submission_summary.html.erb → app/views/evaluator_submission_assignments/_assignment_stats.html.erb

@@ -8,14 +8,14 @@
       <div class="tablet:flex-fill">
         <div class="display-flex flex-align-center margin-bottom-2 tablet:margin-bottom-0">
           <div class="margin-right-2">
-            <span class="font-sans-3xl text-primary text-bold"><%= @assigned_submissions.count %></span>
+            <span class="font-sans-3xl text-primary text-bold"><%= @submissions_count["total"] %></span>
           </div>
           <div>
             <h3 class="usa-summary-box__heading text-primary margin-bottom-05" id="summary-box-key-information">
               Assigned Submissions
             </h3>
             <p class="usa-summary-box__text text-primary-darker text-bold">
-              Evaluations due by <%= @phase.end_date.strftime('%m/%d/%Y') %>
+              Evaluations due by <%= @phase.evaluation_form.closing_date.strftime('%m/%d/%Y') %>
             </p>
           </div>
         </div>
@@ -28,7 +28,7 @@
           <span class="font-sans-xl text-green text-bold"><%= @submissions_count["completed"] || 0 %></span><br>
           <span class="text-base-sm text-green text-bold">Completed</span>
         </div>
-        <div class="text-center margin-right-5">
+        <div class="text-center margin-right-4">
           <span class="font-sans-xl text-orange text-bold"><%= @submissions_count["in_progress"] || 0 %></span><br>
           <span class="text-base-sm text-orange text-bold">In Progress</span>
         </div>

app/views/evaluator_submission_assignments/_submission_row.html.erb

@@ -1,12 +1,12 @@
 <tr data-evaluator-id="<%= evaluator.id %>" data-evaluator-type="user">
   <td data-label="Submission ID" class="text-top text-bold"><%= assignment.submission.id %></td>
   <td data-label="Evaluation status">
-    <span class="text-top text-bold <%= evaluation_status(assignment.status) %>"><%= assignment.status.titleize %></span>
+    <span class="text-top usa-tag <%= evaluation_submission_assignment_color(assignment) %>"><%= assignment.evaluation_status.to_s.titleize %></span>
   </td>
   <td data-label="Score" class="text-top text-normal"><%= display_score(assignment) %></td>
   <td data-label="">
     <div class="display-flex flex-justify-end">
-      <% if assignment.completed? %>
+      <% if assignment.evaluation_status == :completed %>
         <%= link_to "View Evaluation", submissions_path(@challenge), class: 'usa-button font-body-3xs margin-right-1' %>
       <% end %>
       <%= button_tag "Unassign", type: 'button', class: 'usa-button usa-button--outline font-body-3xs', data: { 

app/views/evaluator_submission_assignments/_unassign_evaluator_submission_modal.html.erb

@@ -18,7 +18,10 @@
       <div class="usa-modal__footer">
         <ul class="usa-button-group">
           <li class="usa-button-group__item">
-          <button type="button" class="usa-button" data-unassign-evaluator-submission-modal-target="confirmButton" data-action="click->unassign-evaluator-submission-modal#confirm">
+          <button
+          type="button"
+          class="usa-button"
+          data-action="click->unassign-evaluator-submission-modal#unassignEvaluatorSubmission">
             Yes
           </button>
           </li>

app/views/evaluator_submission_assignments/_unassigned_submission_row.html.erb

@@ -1,16 +1,16 @@
 <tr data-evaluator-id="<%= evaluator.id %>" data-evaluator-type="user">
   <td data-label="Submission ID" class="text-top text-bold"><%= assignment.submission.id %></td>
   <td data-label="Evaluation status">
-    <span class="text-top text-bold <%= evaluation_status(assignment.status) %>"><%= assignment.status.titleize %></span>
+    <span class="text-top usa-tag <%= evaluation_submission_assignment_color(assignment) %>"><%= assignment.evaluation_status.to_s.titleize %></span>
   </td>
   <td data-label="Score" class="text-top text-light"><%= display_score(assignment) %></td>
   <td data-label="">
     <div class="display-flex flex-justify-end">
       <% if assignment.unassigned? %>
         <%= button_to "Reassign", phase_evaluator_submission_assignment_path(@phase, assignment), 
           method: :patch, 
-          params: { status: :not_started, evaluator_id: evaluator.id }, 
-          class: 'usa-button usa-button--outline font-body-3xs' %>        
+          params: { status: :assigned, evaluator_id: evaluator.id }, 
+          class: 'usa-button usa-button--outline font-body-3xs' %>
       <% end %>
     </div>
   </td>

app/views/evaluator_submission_assignments/index.html.erb

@@ -13,9 +13,7 @@
   <h3 class="font-body-lg">Assigned Submissions</h3>
   <p><%= t('evaluator_submission_assignments.assigned_submissions') %></p>
 
-  <%= render 'submission_summary', assigned_count: @assigned_submissions.count, 
-                                   submissions_count: @submissions_count, 
-                                   phase_end_date: @phase.end_date %>
+  <%= render 'assignment_stats' %>
 
   <% if @assigned_submissions.any? %>
     <%= render layout: 'submission_table' do %>

app/views/shared/_back_link.html.erb

@@ -1,6 +1,6 @@
 <div class="margin-bottom-2 margin-top-3">
   <%= link_to path, class: "usa-link display-inline-flex flex-align-center" do %>
     <%= image_tag('images/usa-icons/arrow_back.svg', class: "usa-icon--size-3", alt: "Back to previous page") %>
-    <span class="margin-left-05 text-primary"><%= 'Back' %></span>
+    <span class="margin-left-05 text-primary">Back</span>
   <% end %>
 </div>

config/locales/en.yml

@@ -67,7 +67,7 @@ en:
     assigned_submissions: "A list of submissions assigned to the user."
     unassigned_submissions: "A list of recused and unassigned submissions. Reassigning a user to a submission will make the submission available for the user to evaluate."
     empty_state: "There currently are no assigned submissions to this evaluator. Please assign submissions to this evaluator to view."
-    not_started:
+    assigned:
       success: "Evaluator reassigned successfully"
       failure: "Failed to reassign evaluator"
     unassigned: