From 40ce276dfbba255f9e3a46efab4ae68db4df4d97 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 9 Dec 2024 17:24:22 -0500
Subject: [PATCH 01/46] working

---
 app/controllers/submissions_controller.rb     |  2 +-
 app/javascript/controllers/index.js           | 16 +++--
 .../submission_details_controller.js          | 22 +++++++
 .../submissions/_judging_status.html.erb      | 58 +++++++++++++++++++
 app/views/submissions/show.html.erb           |  1 +
 5 files changed, 92 insertions(+), 7 deletions(-)
 create mode 100644 app/javascript/controllers/submission_details_controller.js
 create mode 100644 app/views/submissions/_judging_status.html.erb

diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index b0fa2af9..b5f74a5f 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -19,7 +19,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
diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js
index 076ccf60..994b676b 100644
--- a/app/javascript/controllers/index.js
+++ b/app/javascript/controllers/index.js
@@ -2,12 +2,16 @@
 // Run that command whenever you add a new controller or create them with
 // ./bin/rails generate stimulus controllerName
 
-import { application } from "./application";
-
-import EvaluationFormController from "./evaluation_form_controller";
-import EvaluationCriteriaController from "./evaluation_criteria_controller";
-application.register("evaluation-form", EvaluationFormController);
-application.register("evaluation-criteria", EvaluationCriteriaController);
+import { application } from "./application"
 
 import DeleteEvaluatorModalController from "./delete_evaluator_modal_controller"
 application.register("delete-evaluator-modal", DeleteEvaluatorModalController)
+
+import EvaluationCriteriaController from "./evaluation_criteria_controller"
+application.register("evaluation-criteria", EvaluationCriteriaController)
+
+import EvaluationFormController from "./evaluation_form_controller"
+application.register("evaluation-form", EvaluationFormController)
+
+import SubmissionDetailsController from "./submission_details_controller"
+application.register("submission-details", SubmissionDetailsController)
diff --git a/app/javascript/controllers/submission_details_controller.js b/app/javascript/controllers/submission_details_controller.js
new file mode 100644
index 00000000..81eed370
--- /dev/null
+++ b/app/javascript/controllers/submission_details_controller.js
@@ -0,0 +1,22 @@
+import { Controller } from "@hotwired/stimulus"
+
+// Connects to data-controller="submission-details"
+export default class extends Controller {
+  static targets = ["qualifiedForm", "selectedForm"]
+  
+  selectedSubmit(e) {
+    if (e.target.checked) {
+      e.target.form.submit()
+    } else {
+      this.qualifiedFormTarget.submit()
+    }
+  }
+
+  winnerSubmit(e) {
+    if (e.target.checked) {
+      e.target.form.submit()
+    } else {
+      this.selectedFormTarget.submit()
+    }
+  }
+}
diff --git a/app/views/submissions/_judging_status.html.erb b/app/views/submissions/_judging_status.html.erb
new file mode 100644
index 00000000..addbf995
--- /dev/null
+++ b/app/views/submissions/_judging_status.html.erb
@@ -0,0 +1,58 @@
+<div data-controller="submission-details">
+    <%= form_with(model: @submission, url: submission_path(@submission), class: "width-mobile-lg") do |form| %>
+        <div class="usa-checkbox">
+            <input
+            class="usa-checkbox__input usa-checkbox__input--tile"
+            id="judging-status-selected"
+            type="checkbox"
+            name="submission[judging_status]"
+            value="selected"
+            <%= if @submission.judging_status.in?(["selected", "winner"]) then "checked" end %>
+            data-action="change->submission-details#selectedSubmit"
+            />
+            <label class="usa-checkbox__label" for="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>
+    <% end %>
+    <%= form_with(model: @submission, url: submission_path(@submission), class: "width-mobile-lg") do |form| %>
+        <div class="usa-checkbox">
+            <input
+            class="usa-checkbox__input usa-checkbox__input--tile"
+            id="judging-status-winner"
+            type="checkbox"
+            name="submission[judging_status]"
+            value="winner"
+            <%= if @submission.judging_status == "winner" then "checked" end %>
+            data-action="change->submission-details#winnerSubmit"
+            />
+            <label class="usa-checkbox__label" for="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>
+    <% end %>
+    <%= form_with(model: @submission, url: submission_path(@submission), class: "width-mobile-lg", data: {"submission-details-target": "qualifiedForm"}) do |form| %>
+        <input
+        class="usa-checkbox__input usa-checkbox__input--tile"
+        id="judging-status-selected"
+        type="hidden"
+        name="submission[judging_status]"
+        value="qualified"
+        />
+    <% end %>
+    <%= form_with(model: @submission, url: submission_path(@submission), class: "width-mobile-lg", data: {"submission-details-target": "selectedForm"}) do |form| %>
+        <input
+        class="usa-checkbox__input usa-checkbox__input--tile"
+        id="judging-status-selected"
+        type="hidden"
+        name="submission[judging_status]"
+        value="selected"
+        />
+    <% end %>
+</div>    
\ No newline at end of file
diff --git a/app/views/submissions/show.html.erb b/app/views/submissions/show.html.erb
index 5f74664e..cb13bfea 100644
--- a/app/views/submissions/show.html.erb
+++ b/app/views/submissions/show.html.erb
@@ -1,5 +1,6 @@
 <h1>Submission ID <%= @submission.id %></h1>
 <p class="text-normal">View submission information and assign evaluators to evaluate the submission.</p>
 
+<%= render partial: "judging_status" %>
 <%= render partial: "submission_materials" %>
 <%= render partial: "comment_form" %>
\ No newline at end of file

From 3f1e16da6e0323bc425d841d2c8693eee207fd02 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Tue, 10 Dec 2024 09:29:06 -0500
Subject: [PATCH 02/46] disabling and verbage

---
 app/controllers/submissions_controller.rb      |  2 +-
 app/views/submissions/_judging_status.html.erb | 10 ++++++----
 config/locales/en.yml                          |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index b5f74a5f..93d5f1bc 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -9,7 +9,7 @@ def show; 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
diff --git a/app/views/submissions/_judging_status.html.erb b/app/views/submissions/_judging_status.html.erb
index addbf995..f92f828d 100644
--- a/app/views/submissions/_judging_status.html.erb
+++ b/app/views/submissions/_judging_status.html.erb
@@ -1,5 +1,5 @@
 <div data-controller="submission-details">
-    <%= form_with(model: @submission, url: submission_path(@submission), class: "width-mobile-lg") do |form| %>
+    <%= form_with(model: @submission, url: submission_path(@submission), class: "maxw-mobile-lg") do |form| %>
         <div class="usa-checkbox">
             <input
             class="usa-checkbox__input usa-checkbox__input--tile"
@@ -7,6 +7,7 @@
             type="checkbox"
             name="submission[judging_status]"
             value="selected"
+            <%= if @submission.judging_status == "winner" then "disabled" end %>
             <%= if @submission.judging_status.in?(["selected", "winner"]) then "checked" end %>
             data-action="change->submission-details#selectedSubmit"
             />
@@ -18,7 +19,7 @@
             >
         </div>
     <% end %>
-    <%= form_with(model: @submission, url: submission_path(@submission), class: "width-mobile-lg") do |form| %>
+    <%= form_with(model: @submission, url: submission_path(@submission), class: "maxw-mobile-lg") do |form| %>
         <div class="usa-checkbox">
             <input
             class="usa-checkbox__input usa-checkbox__input--tile"
@@ -26,6 +27,7 @@
             type="checkbox"
             name="submission[judging_status]"
             value="winner"
+            <%= unless @submission.judging_status.in?(["selected", "winner"]) then "disabled" end %>
             <%= if @submission.judging_status == "winner" then "checked" end %>
             data-action="change->submission-details#winnerSubmit"
             />
@@ -37,7 +39,7 @@
             >
         </div>
     <% end %>
-    <%= form_with(model: @submission, url: submission_path(@submission), class: "width-mobile-lg", data: {"submission-details-target": "qualifiedForm"}) do |form| %>
+    <%= form_with(model: @submission, url: submission_path(@submission), data: {"submission-details-target": "qualifiedForm"}) do |form| %>
         <input
         class="usa-checkbox__input usa-checkbox__input--tile"
         id="judging-status-selected"
@@ -46,7 +48,7 @@
         value="qualified"
         />
     <% end %>
-    <%= form_with(model: @submission, url: submission_path(@submission), class: "width-mobile-lg", data: {"submission-details-target": "selectedForm"}) do |form| %>
+    <%= form_with(model: @submission, url: submission_path(@submission), data: {"submission-details-target": "selectedForm"}) do |form| %>
         <input
         class="usa-checkbox__input usa-checkbox__input--tile"
         id="judging-status-selected"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f092aca2..dc5d621d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -33,6 +33,7 @@ en:
   evaluation_form_destroyed: "Evaluation form was successfully destroyed."
   evaluation_form_saved: "Evaluation form was saved successfully."
   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."

From acf9d04c0e4315a51a2474d1fd00b085a9c06eb9 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Tue, 10 Dec 2024 11:32:20 -0500
Subject: [PATCH 03/46] specs

---
 .../submissions/_judging_status.html.erb      |  4 +-
 app/views/submissions/show.html.erb           |  2 +-
 spec/factories/submission.rb                  |  1 +
 spec/system/submission_details_spec.rb        | 43 +++++++++++++++++++
 4 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 spec/system/submission_details_spec.rb

diff --git a/app/views/submissions/_judging_status.html.erb b/app/views/submissions/_judging_status.html.erb
index f92f828d..ccfa3c1b 100644
--- a/app/views/submissions/_judging_status.html.erb
+++ b/app/views/submissions/_judging_status.html.erb
@@ -42,7 +42,7 @@
     <%= form_with(model: @submission, url: submission_path(@submission), data: {"submission-details-target": "qualifiedForm"}) do |form| %>
         <input
         class="usa-checkbox__input usa-checkbox__input--tile"
-        id="judging-status-selected"
+        id="judging-status-qualified-hidden"
         type="hidden"
         name="submission[judging_status]"
         value="qualified"
@@ -51,7 +51,7 @@
     <%= form_with(model: @submission, url: submission_path(@submission), data: {"submission-details-target": "selectedForm"}) do |form| %>
         <input
         class="usa-checkbox__input usa-checkbox__input--tile"
-        id="judging-status-selected"
+        id="judging-status-selected-hidden"
         type="hidden"
         name="submission[judging_status]"
         value="selected"
diff --git a/app/views/submissions/show.html.erb b/app/views/submissions/show.html.erb
index cb13bfea..4d2c4584 100644
--- a/app/views/submissions/show.html.erb
+++ b/app/views/submissions/show.html.erb
@@ -1,5 +1,5 @@
 <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: "judging_status" %>
 <%= render partial: "submission_materials" %>
diff --git a/spec/factories/submission.rb b/spec/factories/submission.rb
index 6f740bb9..f1be95be 100644
--- a/spec/factories/submission.rb
+++ b/spec/factories/submission.rb
@@ -8,5 +8,6 @@
 
     title { Faker::Lorem.sentence }
     status { "draft" }
+    external_url { "www.example.com" }
   end
 end
diff --git a/spec/system/submission_details_spec.rb b/spec/system/submission_details_spec.rb
new file mode 100644
index 00000000..2eed73ba
--- /dev/null
+++ b/spec/system/submission_details_spec.rb
@@ -0,0 +1,43 @@
+# 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_content(submission.id)
+      expect(page).to(be_axe_clean)
+    end
+
+    it "allows manipulation of judging status" do
+      visit submission_path(submission)
+
+      check('This submission is eligible for evaluation', allow_label_click: true)
+      updated_submission = Submission.find(submission.id)
+      expect(updated_submission.judging_status).to eq('selected')
+
+      check('This submission is selected to advance', allow_label_click: true)
+      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

From ff410ccb8cf0a68bdb1f6c1e5b4eb7506f4256c0 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Tue, 10 Dec 2024 11:33:28 -0500
Subject: [PATCH 04/46] reorder

---
 app/views/submissions/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/submissions/show.html.erb b/app/views/submissions/show.html.erb
index 4d2c4584..bb80990e 100644
--- a/app/views/submissions/show.html.erb
+++ b/app/views/submissions/show.html.erb
@@ -2,5 +2,5 @@
 <h2 class="font-body-sm text-normal">View submission information and assign evaluators to evaluate the submission.</h2>
 
 <%= render partial: "judging_status" %>
+<%= render partial: "comment_form" %>
 <%= render partial: "submission_materials" %>
-<%= render partial: "comment_form" %>
\ No newline at end of file

From 21456369f60cdb7cf78bfa2993128da544b68af5 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Tue, 10 Dec 2024 12:56:47 -0500
Subject: [PATCH 05/46] render everything

---
 app/views/submissions/_submission_details.html.erb | 2 ++
 app/views/submissions/show.html.erb                | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)
 create mode 100644 app/views/submissions/_submission_details.html.erb

diff --git a/app/views/submissions/_submission_details.html.erb b/app/views/submissions/_submission_details.html.erb
new file mode 100644
index 00000000..e6a177ed
--- /dev/null
+++ b/app/views/submissions/_submission_details.html.erb
@@ -0,0 +1,2 @@
+<%= render partial: 'judging_status' %>
+<%= render partial: 'comment_form' %>
diff --git a/app/views/submissions/show.html.erb b/app/views/submissions/show.html.erb
index deb2a524..ba16d732 100644
--- a/app/views/submissions/show.html.erb
+++ b/app/views/submissions/show.html.erb
@@ -1,10 +1,4 @@
 <h1>Submission ID <%= @submission.id %></h1>
 <h2 class="font-body-sm text-normal">View submission information and assign evaluators to evaluate the submission.</h2>
 
-<<<<<<< HEAD
-<%= render partial: "judging_status" %>
-<%= render partial: "comment_form" %>
-<%= render partial: "submission_materials" %>
-=======
-<%= render partial: "layouts/hotdog", locals: {left: 'submissions/comment_form', right: 'submissions/submission_materials', name: 'Submission Materials'} %>
->>>>>>> dev
+<%= render partial: "layouts/hotdog", locals: {left: 'submissions/submission_details', right: 'submissions/submission_materials', name: 'Submission Materials'} %>

From a10efbb1ab2945a93132bd8efd5282482ffa2d02 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Tue, 10 Dec 2024 13:24:44 -0500
Subject: [PATCH 06/46] fix spec

---
 app/views/submissions/_judging_status.html.erb | 4 ++--
 spec/system/submission_details_spec.rb         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/submissions/_judging_status.html.erb b/app/views/submissions/_judging_status.html.erb
index ccfa3c1b..c15eeca1 100644
--- a/app/views/submissions/_judging_status.html.erb
+++ b/app/views/submissions/_judging_status.html.erb
@@ -1,6 +1,6 @@
 <div data-controller="submission-details">
     <%= form_with(model: @submission, url: submission_path(@submission), class: "maxw-mobile-lg") do |form| %>
-        <div class="usa-checkbox">
+        <div class="usa-checkbox" id="eligible-for-evaluation">
             <input
             class="usa-checkbox__input usa-checkbox__input--tile"
             id="judging-status-selected"
@@ -20,7 +20,7 @@
         </div>
     <% end %>
     <%= form_with(model: @submission, url: submission_path(@submission), class: "maxw-mobile-lg") do |form| %>
-        <div class="usa-checkbox">
+        <div class="usa-checkbox" id="selected-to-advance">
             <input
             class="usa-checkbox__input usa-checkbox__input--tile"
             id="judging-status-winner"
diff --git a/spec/system/submission_details_spec.rb b/spec/system/submission_details_spec.rb
index 2eed73ba..d40d7cfa 100644
--- a/spec/system/submission_details_spec.rb
+++ b/spec/system/submission_details_spec.rb
@@ -21,11 +21,11 @@
     it "allows manipulation of judging status" do
       visit submission_path(submission)
 
-      check('This submission is eligible for evaluation', allow_label_click: true)
+      find('#eligible-for-evaluation').click
       updated_submission = Submission.find(submission.id)
       expect(updated_submission.judging_status).to eq('selected')
 
-      check('This submission is selected to advance', allow_label_click: true)
+      find('#selected-to-advance').click
       updated_submission = Submission.find(submission.id)
       expect(updated_submission.judging_status).to eq('winner')
     end

From 55401a69d18292457f94655e6accf9bfe343ff81 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Thu, 12 Dec 2024 11:43:51 -0500
Subject: [PATCH 07/46] initialize

---
 app/views/submissions/_submission_details.html.erb    | 5 +++++
 app/views/submissions/_submission_evaluation.html.erb | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 app/views/submissions/_submission_evaluation.html.erb

diff --git a/app/views/submissions/_submission_details.html.erb b/app/views/submissions/_submission_details.html.erb
index e6a177ed..85b43c55 100644
--- a/app/views/submissions/_submission_details.html.erb
+++ b/app/views/submissions/_submission_details.html.erb
@@ -1,2 +1,7 @@
 <%= render partial: 'judging_status' %>
 <%= render partial: 'comment_form' %>
+<% if @submission.judging_status.in?(["selected", "winner"]) %>
+    <%= render partial: 'submission_evaluation' %>
+<% end %>
+
+
diff --git a/app/views/submissions/_submission_evaluation.html.erb b/app/views/submissions/_submission_evaluation.html.erb
new file mode 100644
index 00000000..6313a735
--- /dev/null
+++ b/app/views/submissions/_submission_evaluation.html.erb
@@ -0,0 +1 @@
+Submission Evaluation
\ No newline at end of file

From e321bf7cfa79bbc25be7a69b4425f713bac01eec Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Thu, 12 Dec 2024 14:13:00 -0500
Subject: [PATCH 08/46] missing evaluation form

---
 app/views/shared/_alert_error.html.erb                | 2 +-
 app/views/submissions/_submission_evaluation.html.erb | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/_alert_error.html.erb b/app/views/shared/_alert_error.html.erb
index dce010d2..c817ce60 100644
--- a/app/views/shared/_alert_error.html.erb
+++ b/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>
diff --git a/app/views/submissions/_submission_evaluation.html.erb b/app/views/submissions/_submission_evaluation.html.erb
index 6313a735..1612e4ff 100644
--- a/app/views/submissions/_submission_evaluation.html.erb
+++ b/app/views/submissions/_submission_evaluation.html.erb
@@ -1 +1,6 @@
-Submission Evaluation
\ No newline at end of file
+<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 %>
+  Assigned Evaluators
+<% end %>
\ No newline at end of file

From c40525984f1b719e5287377ada88bb2694862551 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <51140224+stonefilipczak@users.noreply.github.com>
Date: Mon, 16 Dec 2024 09:57:53 -0500
Subject: [PATCH 09/46] Update spec/system/submission_details_spec.rb

Co-authored-by: Stephen Chudleigh <stepchud@users.noreply.github.com>
---
 spec/system/submission_details_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/system/submission_details_spec.rb b/spec/system/submission_details_spec.rb
index d40d7cfa..dae65cf6 100644
--- a/spec/system/submission_details_spec.rb
+++ b/spec/system/submission_details_spec.rb
@@ -21,7 +21,7 @@
     it "allows manipulation of judging status" do
       visit submission_path(submission)
 
-      find('#eligible-for-evaluation').click
+      find_by_id('eligible-for-evaluation').click
       updated_submission = Submission.find(submission.id)
       expect(updated_submission.judging_status).to eq('selected')
 

From 9d313a15e1d9457a3583749073826192b161efea Mon Sep 17 00:00:00 2001
From: Stone Filipczak <51140224+stonefilipczak@users.noreply.github.com>
Date: Mon, 16 Dec 2024 09:58:01 -0500
Subject: [PATCH 10/46] Update spec/system/submission_details_spec.rb

Co-authored-by: Stephen Chudleigh <stepchud@users.noreply.github.com>
---
 spec/system/submission_details_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/system/submission_details_spec.rb b/spec/system/submission_details_spec.rb
index dae65cf6..c40986cd 100644
--- a/spec/system/submission_details_spec.rb
+++ b/spec/system/submission_details_spec.rb
@@ -25,7 +25,7 @@
       updated_submission = Submission.find(submission.id)
       expect(updated_submission.judging_status).to eq('selected')
 
-      find('#selected-to-advance').click
+      find_by_id('selected-to-advance').click
       updated_submission = Submission.find(submission.id)
       expect(updated_submission.judging_status).to eq('winner')
     end

From 81a802003f417fca438e402f95d78bc2507a83a8 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <51140224+stonefilipczak@users.noreply.github.com>
Date: Mon, 16 Dec 2024 09:58:08 -0500
Subject: [PATCH 11/46] Update spec/system/submission_details_spec.rb

Co-authored-by: Stephen Chudleigh <stepchud@users.noreply.github.com>
---
 spec/system/submission_details_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/system/submission_details_spec.rb b/spec/system/submission_details_spec.rb
index c40986cd..74972e75 100644
--- a/spec/system/submission_details_spec.rb
+++ b/spec/system/submission_details_spec.rb
@@ -14,7 +14,7 @@
     it "submission details page is accessible" do
       visit submission_path(submission)
       expect(user.role).to eq("challenge_manager")
-      expect(page).to have_content(submission.id)
+      expect(page).to have_css('h1', text: "Submission ID #{submission.id}")
       expect(page).to(be_axe_clean)
     end
 

From f4231db8bf9c94cdf0ac58876b84b32100dc1e16 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <51140224+stonefilipczak@users.noreply.github.com>
Date: Mon, 16 Dec 2024 09:58:17 -0500
Subject: [PATCH 12/46] Update app/views/submissions/_judging_status.html.erb

Co-authored-by: Stephen Chudleigh <stepchud@users.noreply.github.com>
---
 app/views/submissions/_judging_status.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/submissions/_judging_status.html.erb b/app/views/submissions/_judging_status.html.erb
index c15eeca1..d343290c 100644
--- a/app/views/submissions/_judging_status.html.erb
+++ b/app/views/submissions/_judging_status.html.erb
@@ -27,8 +27,8 @@
             type="checkbox"
             name="submission[judging_status]"
             value="winner"
-            <%= unless @submission.judging_status.in?(["selected", "winner"]) then "disabled" end %>
-            <%= if @submission.judging_status == "winner" then "checked" end %>
+            <%= "disabled" unless @submission.judging_status.in?(["selected", "winner"]) %>
+            <%= "checked" if @submission.judging_status == "winner" %>
             data-action="change->submission-details#winnerSubmit"
             />
             <label class="usa-checkbox__label" for="judging-status-winner"

From 1d11c916ffe91ea0a967f42ce5077c9b616baf85 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Tue, 17 Dec 2024 11:20:35 -0500
Subject: [PATCH 13/46] not working single form attempt

---
 .../submission_details_controller.js          | 14 +++--
 app/views/submissions/_comment_form.html.erb  |  9 ---
 .../submissions/_judging_status.html.erb      | 60 -------------------
 .../submissions/_submission_details.html.erb  | 53 +++++++++++++++-
 4 files changed, 60 insertions(+), 76 deletions(-)
 delete mode 100644 app/views/submissions/_comment_form.html.erb
 delete mode 100644 app/views/submissions/_judging_status.html.erb

diff --git a/app/javascript/controllers/submission_details_controller.js b/app/javascript/controllers/submission_details_controller.js
index 81eed370..9b2356ea 100644
--- a/app/javascript/controllers/submission_details_controller.js
+++ b/app/javascript/controllers/submission_details_controller.js
@@ -2,21 +2,25 @@ import { Controller } from "@hotwired/stimulus"
 
 // Connects to data-controller="submission-details"
 export default class extends Controller {
-  static targets = ["qualifiedForm", "selectedForm"]
+  static targets = ["hiddenInput"]
   
   selectedSubmit(e) {
+    console.log(e.target.checked)
     if (e.target.checked) {
-      e.target.form.submit()
+      this.hiddenInputTarget.value = "selected"
+      e.target.setAttribute('checked', true);
     } else {
-      this.qualifiedFormTarget.submit()
+      this.hiddenInputTarget.setAttribute("value", "qualified")
+      e.target.setAttribute('checked', false);
     }
+    console.log(this.hiddenInputTarget)
   }
 
   winnerSubmit(e) {
     if (e.target.checked) {
-      e.target.form.submit()
+      this.hiddenInputTarget.value = "winner"
     } else {
-      this.selectedFormTarget.submit()
+      this.hiddenInputTarget.value = "selected"
     }
   }
 }
diff --git a/app/views/submissions/_comment_form.html.erb b/app/views/submissions/_comment_form.html.erb
deleted file mode 100644
index 54a920d6..00000000
--- a/app/views/submissions/_comment_form.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= form_with(model: @submission, url: submission_path(@submission), class: "max-width-mobile-lg") do |form| %>
-    <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 %>
\ No newline at end of file
diff --git a/app/views/submissions/_judging_status.html.erb b/app/views/submissions/_judging_status.html.erb
deleted file mode 100644
index d343290c..00000000
--- a/app/views/submissions/_judging_status.html.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-<div data-controller="submission-details">
-    <%= 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"
-            id="judging-status-selected"
-            type="checkbox"
-            name="submission[judging_status]"
-            value="selected"
-            <%= if @submission.judging_status == "winner" then "disabled" end %>
-            <%= if @submission.judging_status.in?(["selected", "winner"]) then "checked" end %>
-            data-action="change->submission-details#selectedSubmit"
-            />
-            <label class="usa-checkbox__label" for="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>
-    <% end %>
-    <%= form_with(model: @submission, url: submission_path(@submission), class: "maxw-mobile-lg") do |form| %>
-        <div class="usa-checkbox" id="selected-to-advance">
-            <input
-            class="usa-checkbox__input usa-checkbox__input--tile"
-            id="judging-status-winner"
-            type="checkbox"
-            name="submission[judging_status]"
-            value="winner"
-            <%= "disabled" unless @submission.judging_status.in?(["selected", "winner"]) %>
-            <%= "checked" if @submission.judging_status == "winner" %>
-            data-action="change->submission-details#winnerSubmit"
-            />
-            <label class="usa-checkbox__label" for="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>
-    <% end %>
-    <%= form_with(model: @submission, url: submission_path(@submission), data: {"submission-details-target": "qualifiedForm"}) do |form| %>
-        <input
-        class="usa-checkbox__input usa-checkbox__input--tile"
-        id="judging-status-qualified-hidden"
-        type="hidden"
-        name="submission[judging_status]"
-        value="qualified"
-        />
-    <% end %>
-    <%= form_with(model: @submission, url: submission_path(@submission), data: {"submission-details-target": "selectedForm"}) do |form| %>
-        <input
-        class="usa-checkbox__input usa-checkbox__input--tile"
-        id="judging-status-selected-hidden"
-        type="hidden"
-        name="submission[judging_status]"
-        value="selected"
-        />
-    <% end %>
-</div>    
\ No newline at end of file
diff --git a/app/views/submissions/_submission_details.html.erb b/app/views/submissions/_submission_details.html.erb
index e6a177ed..bc33e439 100644
--- a/app/views/submissions/_submission_details.html.erb
+++ b/app/views/submissions/_submission_details.html.erb
@@ -1,2 +1,51 @@
-<%= render partial: 'judging_status' %>
-<%= render partial: 'comment_form' %>
+<div data-controller="submission-details">
+    <%= 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"
+            id="judging-status-selected"
+            type="checkbox"
+            name="judging-status-selected-check"
+            value="selected"
+            <%= if @submission.judging_status == "winner" then "disabled" end %>
+            <%= "checked" if @submission.judging_status.in?(["selected", "winner"]) %>
+            data-action="change->submission-details#selectedSubmit"
+            />
+            <label class="usa-checkbox__label" for="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="judging-status-winner"
+            type="checkbox"
+            <%= "disabled" unless @submission.judging_status.in?(["selected", "winner"]) %>
+            <%= "checked" if @submission.judging_status == "winner" %>
+            data-action="change->submission-details#winnerSubmit"
+            />
+            <label class="usa-checkbox__label" for="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-qualified-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>
\ No newline at end of file

From ff79c482bda27d8dc39acaedf451c0bc5e2a3724 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 18 Dec 2024 15:16:26 -0500
Subject: [PATCH 14/46] weird WIP

---
 .zshrc                                              |  1 +
 app/views/submissions/_assigned_evaluators.html.erb | 13 +++++++++++++
 app/views/submissions/_judging_status.html.erb      |  5 +++--
 .../submissions/_submission_evaluation.html.erb     |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 .zshrc
 create mode 100644 app/views/submissions/_assigned_evaluators.html.erb

diff --git a/.zshrc b/.zshrc
new file mode 100644
index 00000000..8880f898
--- /dev/null
+++ b/.zshrc
@@ -0,0 +1 @@
+export PHOENIX_URI="localhost:4000"
\ No newline at end of file
diff --git a/app/views/submissions/_assigned_evaluators.html.erb b/app/views/submissions/_assigned_evaluators.html.erb
new file mode 100644
index 00000000..9079e032
--- /dev/null
+++ b/app/views/submissions/_assigned_evaluators.html.erb
@@ -0,0 +1,13 @@
+<h2 class="usa-accordion__heading">
+  <button
+    type="button"
+    class="usa-accordion__button display-flex flex-justify icon-white"
+    aria-expanded="true"
+  >
+    <div>Assigned Evaluators</div>
+  </button>
+</h2>
+
+<div class="usa-accordion__content">
+    List of evaluators
+</div>
\ No newline at end of file
diff --git a/app/views/submissions/_judging_status.html.erb b/app/views/submissions/_judging_status.html.erb
index c15eeca1..2d806f71 100644
--- a/app/views/submissions/_judging_status.html.erb
+++ b/app/views/submissions/_judging_status.html.erb
@@ -1,9 +1,10 @@
 <div data-controller="submission-details">
     <%= form_with(model: @submission, url: submission_path(@submission), class: "maxw-mobile-lg") do |form| %>
         <div class="usa-checkbox" id="eligible-for-evaluation">
+            <% rand = SecureRandom.hex(8) %>
             <input
             class="usa-checkbox__input usa-checkbox__input--tile"
-            id="judging-status-selected"
+            id="<%= "#{rand}-judging-status-selected" %>"
             type="checkbox"
             name="submission[judging_status]"
             value="selected"
@@ -11,7 +12,7 @@
             <%= if @submission.judging_status.in?(["selected", "winner"]) then "checked" end %>
             data-action="change->submission-details#selectedSubmit"
             />
-            <label class="usa-checkbox__label" for="judging-status-selected"
+            <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
diff --git a/app/views/submissions/_submission_evaluation.html.erb b/app/views/submissions/_submission_evaluation.html.erb
index 1612e4ff..03fda3c0 100644
--- a/app/views/submissions/_submission_evaluation.html.erb
+++ b/app/views/submissions/_submission_evaluation.html.erb
@@ -2,5 +2,5 @@
 <% 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 %>
-  Assigned Evaluators
+    <%= render partial: 'assigned_evaluators' %>
 <% end %>
\ No newline at end of file

From ef9808fdfe1a206888ef9c81edef715321c517c7 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 18 Dec 2024 15:42:24 -0500
Subject: [PATCH 15/46] working single form approach

---
 .../submission_details_controller.js          | 19 ++++++++-----------
 .../submissions/_submission_details.html.erb  | 16 ++++++++--------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/javascript/controllers/submission_details_controller.js b/app/javascript/controllers/submission_details_controller.js
index 9b2356ea..5a7771f4 100644
--- a/app/javascript/controllers/submission_details_controller.js
+++ b/app/javascript/controllers/submission_details_controller.js
@@ -2,25 +2,22 @@ import { Controller } from "@hotwired/stimulus"
 
 // Connects to data-controller="submission-details"
 export default class extends Controller {
-  static targets = ["hiddenInput"]
   
-  selectedSubmit(e) {
-    console.log(e.target.checked)
+  eligibleCheck(e) {
+    const hiddenInput = e.target.form.elements["judging-status-hidden"]
     if (e.target.checked) {
-      this.hiddenInputTarget.value = "selected"
-      e.target.setAttribute('checked', true);
+      hiddenInput.value = "selected"
     } else {
-      this.hiddenInputTarget.setAttribute("value", "qualified")
-      e.target.setAttribute('checked', false);
+      hiddenInput.value = "qualified"
     }
-    console.log(this.hiddenInputTarget)
   }
 
-  winnerSubmit(e) {
+  selectedCheck(e) {
+    const hiddenInput = e.target.form.elements["judging-status-hidden"]
     if (e.target.checked) {
-      this.hiddenInputTarget.value = "winner"
+      hiddenInput.value = "winner"
     } else {
-      this.hiddenInputTarget.value = "selected"
+      hiddenInput.value = "selected"
     }
   }
 }
diff --git a/app/views/submissions/_submission_details.html.erb b/app/views/submissions/_submission_details.html.erb
index bc33e439..85109d37 100644
--- a/app/views/submissions/_submission_details.html.erb
+++ b/app/views/submissions/_submission_details.html.erb
@@ -1,17 +1,17 @@
 <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"
-            id="judging-status-selected"
             type="checkbox"
-            name="judging-status-selected-check"
+            id="<%= "#{rand}-judging-status-selected" %>"
             value="selected"
             <%= if @submission.judging_status == "winner" then "disabled" end %>
             <%= "checked" if @submission.judging_status.in?(["selected", "winner"]) %>
-            data-action="change->submission-details#selectedSubmit"
+            data-action="change->submission-details#eligibleCheck"
             />
-            <label class="usa-checkbox__label" for="judging-status-selected"
+            <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
@@ -21,13 +21,13 @@
         <div class="usa-checkbox" id="selected-to-advance">
             <input
             class="usa-checkbox__input usa-checkbox__input--tile"
-            id="judging-status-winner"
+            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#winnerSubmit"
+            data-action="change->submission-details#selectedCheck"
             />
-            <label class="usa-checkbox__label" for="judging-status-winner"
+            <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
@@ -35,7 +35,7 @@
             >
         </div>
         <input
-        id="judging-status-qualified-hidden"
+        id="judging-status-hidden"
         type="hidden"
         name="submission[judging_status]"
         data-submission-details-target="hiddenInput"

From 9d6de873e854b0af5f3ed161acf8abaf949851cc Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 18 Dec 2024 15:45:01 -0500
Subject: [PATCH 16/46] fix test

---
 spec/system/submission_details_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/system/submission_details_spec.rb b/spec/system/submission_details_spec.rb
index 74972e75..0b06b6c9 100644
--- a/spec/system/submission_details_spec.rb
+++ b/spec/system/submission_details_spec.rb
@@ -22,10 +22,12 @@
       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

From efb3ed5d342793f5b9a494935e66a0f7b75ea831 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Thu, 19 Dec 2024 10:26:06 -0500
Subject: [PATCH 17/46] WIP

---
 app/controllers/submissions_controller.rb     |  4 +-
 .../submissions/_assigned_evaluators.html.erb | 64 +++++++++++++++----
 app/views/submissions/_details_form.html.erb  | 51 +++++++++++++++
 .../submissions/_submission_details.html.erb  | 52 +--------------
 4 files changed, 108 insertions(+), 63 deletions(-)
 create mode 100644 app/views/submissions/_details_form.html.erb

diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 93d5f1bc..fefe533a 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -5,7 +5,9 @@ class SubmissionsController < ApplicationController
   before_action -> { authorize_user('challenge_manager') }
   before_action :set_submission, only: [:show, :update]
 
-  def show; end
+  def show
+    @evaluators = @submission.phase.evaluators
+  end  
 
   def update
     if @submission.update!(submission_params)
diff --git a/app/views/submissions/_assigned_evaluators.html.erb b/app/views/submissions/_assigned_evaluators.html.erb
index 9079e032..f79bc2dc 100644
--- a/app/views/submissions/_assigned_evaluators.html.erb
+++ b/app/views/submissions/_assigned_evaluators.html.erb
@@ -1,13 +1,55 @@
-<h2 class="usa-accordion__heading">
-  <button
-    type="button"
-    class="usa-accordion__button display-flex flex-justify icon-white"
-    aria-expanded="true"
-  >
-    <div>Assigned Evaluators</div>
-  </button>
-</h2>
+<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">
-    List of evaluators
+  <div class="usa-accordion__content" id="<%= rand %>">
+      <table class="usa-table usa-table--stacked-header usa-table--borderless width-full gray-header">
+          <thead>
+            <tr>
+              <th scope="col">Evaluator name</th>
+              <th scope="col">Email address</th>
+              <th scope="col">User role</th>
+              <th scope="col">User status</th>
+              <th scope="col">Assigned submissions</th>
+              <th scope="col" aria-label="Actions"></th>
+            </tr>
+          </thead>
+          <tbody>
+            <% @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="Email address" class="text-top"><%= evaluator.email %></td>
+                <td data-label="User role" class="text-top"><%= evaluator.role.titleize %></td>
+                <td data-label="User status" class="text-top"><%= user_status(evaluator) %></td>
+                <td data-label="Assigned submissions" class="text-top"><%= assigned_submissions_count(evaluator, @challenge, @phase) %></td>
+                <td data-label="">
+                  <div class="display-flex flex-no-wrap grid-row">
+                    <%= link_to phase_evaluator_submission_assignments_path(@submission.phase, evaluator_id: evaluator.id), class: 'usa-button font-body-3xs', style: 'white-space: nowrap;' do %>
+                      View Submissions
+                    <% end %>
+                    <%= button_tag "Delete", type: 'button', class: 'usa-button usa-button--outline font-body-3xs', data: { 
+                      action: "click->delete-evaluator-modal#open",
+                      evaluator_id: evaluator.id, 
+                      evaluator_type: 'user', 
+                      challenge_id: @submission.challenge.id, 
+                      phase_id: @submission.phase.id 
+                    } %>
+                  </div>
+                </td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+  </div>
 </div>
\ No newline at end of file
diff --git a/app/views/submissions/_details_form.html.erb b/app/views/submissions/_details_form.html.erb
new file mode 100644
index 00000000..2fa69b99
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/app/views/submissions/_submission_details.html.erb b/app/views/submissions/_submission_details.html.erb
index 3e90806d..34726d5b 100644
--- a/app/views/submissions/_submission_details.html.erb
+++ b/app/views/submissions/_submission_details.html.erb
@@ -1,54 +1,4 @@
-<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"
-            <%= if @submission.judging_status == "winner" then "disabled" end %>
-            <%= "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>
+<%= render partial: 'details_form' %>
 <% if @submission.judging_status.in?(["selected", "winner"]) %>
     <%= render partial: 'submission_evaluation' %>
 <% end %>

From 7779784eb16489f7014c97760f17d0395b6734e0 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Thu, 19 Dec 2024 15:04:12 -0500
Subject: [PATCH 18/46] both accordions working

---
 .../_available_evaluators.html.erb            | 26 +++++++++++++++++++
 .../_submission_evaluation.html.erb           |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 app/views/submissions/_available_evaluators.html.erb

diff --git a/app/views/submissions/_available_evaluators.html.erb b/app/views/submissions/_available_evaluators.html.erb
new file mode 100644
index 00000000..b66c8bf2
--- /dev/null
+++ b/app/views/submissions/_available_evaluators.html.erb
@@ -0,0 +1,26 @@
+<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 %>">
+    <% @evaluators.each do |evaluator| %>
+            <div class="float-left">
+                <%= "#{evaluator.first_name} #{evaluator.last_name}" %> <br/>
+                <%= evaluator.email %>
+            </div> 
+            <div class="float-right">
+                button
+            </div>
+
+    <% end %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/submissions/_submission_evaluation.html.erb b/app/views/submissions/_submission_evaluation.html.erb
index 03fda3c0..c42cb5aa 100644
--- a/app/views/submissions/_submission_evaluation.html.erb
+++ b/app/views/submissions/_submission_evaluation.html.erb
@@ -3,4 +3,5 @@
   <%= 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 %>
\ No newline at end of file

From ad1d718b84eeb323bd26ef39fa9ef670aba99527 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Thu, 19 Dec 2024 19:05:37 -0500
Subject: [PATCH 19/46] succesful assignment

---
 ...uator_submission_assignments_controller.rb | 20 ++++++++++++++++++-
 .../submissions/_assigned_evaluators.html.erb |  2 +-
 .../_available_evaluators.html.erb            |  6 +++++-
 .../_submission_evaluation.html.erb           |  2 +-
 config/locales/en.yml                         |  1 +
 config/routes.rb                              |  2 +-
 6 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/app/controllers/evaluator_submission_assignments_controller.rb b/app/controllers/evaluator_submission_assignments_controller.rb
index a40dd5bf..22baa0c2 100644
--- a/app/controllers/evaluator_submission_assignments_controller.rb
+++ b/app/controllers/evaluator_submission_assignments_controller.rb
@@ -4,8 +4,22 @@
 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 index
     @evaluator_assignments = @phase.evaluator_submission_assignments.includes(:submission).where(user_id: @evaluator.id)
@@ -49,6 +63,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
diff --git a/app/views/submissions/_assigned_evaluators.html.erb b/app/views/submissions/_assigned_evaluators.html.erb
index f79bc2dc..59e83a54 100644
--- a/app/views/submissions/_assigned_evaluators.html.erb
+++ b/app/views/submissions/_assigned_evaluators.html.erb
@@ -12,7 +12,7 @@
   </h2>
 
   <div class="usa-accordion__content" id="<%= rand %>">
-      <table class="usa-table usa-table--stacked-header usa-table--borderless width-full gray-header">
+      <table class="usa-table usa-table--stacked-header usa-table--borderless gray-header">
           <thead>
             <tr>
               <th scope="col">Evaluator name</th>
diff --git a/app/views/submissions/_available_evaluators.html.erb b/app/views/submissions/_available_evaluators.html.erb
index b66c8bf2..a012325b 100644
--- a/app/views/submissions/_available_evaluators.html.erb
+++ b/app/views/submissions/_available_evaluators.html.erb
@@ -18,7 +18,11 @@
                 <%= evaluator.email %>
             </div> 
             <div class="float-right">
-                button
+                <%= 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 %>
diff --git a/app/views/submissions/_submission_evaluation.html.erb b/app/views/submissions/_submission_evaluation.html.erb
index c42cb5aa..ba3f4b98 100644
--- a/app/views/submissions/_submission_evaluation.html.erb
+++ b/app/views/submissions/_submission_evaluation.html.erb
@@ -2,6 +2,6 @@
 <% 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: 'assigned_evaluators' %> %>
     <%= render partial: 'available_evaluators' %>
 <% end %>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b3a6e2f8..ef48861b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -32,6 +32,7 @@ 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."
diff --git a/config/routes.rb b/config/routes.rb
index a2c4adfd..43a0f0a4 100644
--- a/config/routes.rb
+++ b/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]
 

From 63aa36b484691028dc80f8729c293639d6d3d24b Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Thu, 19 Dec 2024 19:22:48 -0500
Subject: [PATCH 20/46] working everything

---
 app/controllers/submissions_controller.rb     |  2 +-
 .../submissions/_assigned_evaluators.html.erb | 14 ++---
 .../_available_evaluators.html.erb            |  2 +-
 .../submissions/_judging_status.html.erb      | 61 -------------------
 .../_submission_evaluation.html.erb           |  2 +-
 5 files changed, 8 insertions(+), 73 deletions(-)
 delete mode 100644 app/views/submissions/_judging_status.html.erb

diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index fefe533a..b4d20263 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -6,7 +6,7 @@ class SubmissionsController < ApplicationController
   before_action :set_submission, only: [:show, :update]
 
   def show
-    @evaluators = @submission.phase.evaluators
+    @available_evaluators = @submission.phase.evaluators - @submission.evaluators
   end  
 
   def update
diff --git a/app/views/submissions/_assigned_evaluators.html.erb b/app/views/submissions/_assigned_evaluators.html.erb
index 59e83a54..83deef5d 100644
--- a/app/views/submissions/_assigned_evaluators.html.erb
+++ b/app/views/submissions/_assigned_evaluators.html.erb
@@ -16,23 +16,19 @@
           <thead>
             <tr>
               <th scope="col">Evaluator name</th>
-              <th scope="col">Email address</th>
-              <th scope="col">User role</th>
-              <th scope="col">User status</th>
-              <th scope="col">Assigned submissions</th>
+              <th scope="col">Evaluation Status</th>
+              <th scope="col">Score</th>
               <th scope="col" aria-label="Actions"></th>
             </tr>
           </thead>
           <tbody>
-            <% @evaluators.each do |evaluator| %>
+            <% @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="Email address" class="text-top"><%= evaluator.email %></td>
-                <td data-label="User role" class="text-top"><%= evaluator.role.titleize %></td>
-                <td data-label="User status" class="text-top"><%= user_status(evaluator) %></td>
-                <td data-label="Assigned submissions" class="text-top"><%= assigned_submissions_count(evaluator, @challenge, @phase) %></td>
+                <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">
                     <%= link_to phase_evaluator_submission_assignments_path(@submission.phase, evaluator_id: evaluator.id), class: 'usa-button font-body-3xs', style: 'white-space: nowrap;' do %>
diff --git a/app/views/submissions/_available_evaluators.html.erb b/app/views/submissions/_available_evaluators.html.erb
index a012325b..3d5cd1bf 100644
--- a/app/views/submissions/_available_evaluators.html.erb
+++ b/app/views/submissions/_available_evaluators.html.erb
@@ -12,7 +12,7 @@
   </h2>
 
   <div class="usa-accordion__content background-primary-lighter" id="<%= rand %>">
-    <% @evaluators.each do |evaluator| %>
+    <% @available_evaluators.each do |evaluator| %>
             <div class="float-left">
                 <%= "#{evaluator.first_name} #{evaluator.last_name}" %> <br/>
                 <%= evaluator.email %>
diff --git a/app/views/submissions/_judging_status.html.erb b/app/views/submissions/_judging_status.html.erb
deleted file mode 100644
index 2d806f71..00000000
--- a/app/views/submissions/_judging_status.html.erb
+++ /dev/null
@@ -1,61 +0,0 @@
-<div data-controller="submission-details">
-    <%= form_with(model: @submission, url: submission_path(@submission), class: "maxw-mobile-lg") do |form| %>
-        <div class="usa-checkbox" id="eligible-for-evaluation">
-            <% rand = SecureRandom.hex(8) %>
-            <input
-            class="usa-checkbox__input usa-checkbox__input--tile"
-            id="<%= "#{rand}-judging-status-selected" %>"
-            type="checkbox"
-            name="submission[judging_status]"
-            value="selected"
-            <%= if @submission.judging_status == "winner" then "disabled" end %>
-            <%= if @submission.judging_status.in?(["selected", "winner"]) then "checked" end %>
-            data-action="change->submission-details#selectedSubmit"
-            />
-            <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>
-    <% end %>
-    <%= form_with(model: @submission, url: submission_path(@submission), class: "maxw-mobile-lg") do |form| %>
-        <div class="usa-checkbox" id="selected-to-advance">
-            <input
-            class="usa-checkbox__input usa-checkbox__input--tile"
-            id="judging-status-winner"
-            type="checkbox"
-            name="submission[judging_status]"
-            value="winner"
-            <%= unless @submission.judging_status.in?(["selected", "winner"]) then "disabled" end %>
-            <%= if @submission.judging_status == "winner" then "checked" end %>
-            data-action="change->submission-details#winnerSubmit"
-            />
-            <label class="usa-checkbox__label" for="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>
-    <% end %>
-    <%= form_with(model: @submission, url: submission_path(@submission), data: {"submission-details-target": "qualifiedForm"}) do |form| %>
-        <input
-        class="usa-checkbox__input usa-checkbox__input--tile"
-        id="judging-status-qualified-hidden"
-        type="hidden"
-        name="submission[judging_status]"
-        value="qualified"
-        />
-    <% end %>
-    <%= form_with(model: @submission, url: submission_path(@submission), data: {"submission-details-target": "selectedForm"}) do |form| %>
-        <input
-        class="usa-checkbox__input usa-checkbox__input--tile"
-        id="judging-status-selected-hidden"
-        type="hidden"
-        name="submission[judging_status]"
-        value="selected"
-        />
-    <% end %>
-</div>    
\ No newline at end of file
diff --git a/app/views/submissions/_submission_evaluation.html.erb b/app/views/submissions/_submission_evaluation.html.erb
index ba3f4b98..c42cb5aa 100644
--- a/app/views/submissions/_submission_evaluation.html.erb
+++ b/app/views/submissions/_submission_evaluation.html.erb
@@ -2,6 +2,6 @@
 <% 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: 'assigned_evaluators' %>
     <%= render partial: 'available_evaluators' %>
 <% end %>
\ No newline at end of file

From f0548ee4a26ef49497e807ee690f05d00addc85c Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Fri, 20 Dec 2024 09:02:20 -0500
Subject: [PATCH 21/46] unassign

---
 .../evaluator_submission_assignments_controller.rb  |  4 ++++
 app/views/submissions/_assigned_evaluators.html.erb | 13 ++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/controllers/evaluator_submission_assignments_controller.rb b/app/controllers/evaluator_submission_assignments_controller.rb
index 22baa0c2..ad659d47 100644
--- a/app/controllers/evaluator_submission_assignments_controller.rb
+++ b/app/controllers/evaluator_submission_assignments_controller.rb
@@ -21,6 +21,10 @@ def create
     end
   end
 
+  def unassign
+    
+  end  
+
   def index
     @evaluator_assignments = @phase.evaluator_submission_assignments.includes(:submission).where(user_id: @evaluator.id)
     @assigned_submissions = @evaluator_assignments.
diff --git a/app/views/submissions/_assigned_evaluators.html.erb b/app/views/submissions/_assigned_evaluators.html.erb
index 83deef5d..501a78ea 100644
--- a/app/views/submissions/_assigned_evaluators.html.erb
+++ b/app/views/submissions/_assigned_evaluators.html.erb
@@ -31,16 +31,11 @@
                 <td data-label="Score" class="text-top"></td>
                 <td data-label="">
                   <div class="display-flex flex-no-wrap grid-row">
-                    <%= link_to phase_evaluator_submission_assignments_path(@submission.phase, evaluator_id: evaluator.id), class: 'usa-button font-body-3xs', style: 'white-space: nowrap;' do %>
-                      View Submissions
+                    <%= 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 %>
-                    <%= button_tag "Delete", type: 'button', class: 'usa-button usa-button--outline font-body-3xs', data: { 
-                      action: "click->delete-evaluator-modal#open",
-                      evaluator_id: evaluator.id, 
-                      evaluator_type: 'user', 
-                      challenge_id: @submission.challenge.id, 
-                      phase_id: @submission.phase.id 
-                    } %>
                   </div>
                 </td>
               </tr>

From c942ba27d94f8d4c5b31966749a673492c261b8a Mon Sep 17 00:00:00 2001
From: Stephen Chudleigh <stephen@smartlogic.io>
Date: Fri, 20 Dec 2024 11:24:39 -0600
Subject: [PATCH 22/46] move form to partial

---
 app/views/submissions/_details_form.html.erb  |  4 +-
 .../submissions/_submission_details.html.erb  | 54 +------------------
 2 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/app/views/submissions/_details_form.html.erb b/app/views/submissions/_details_form.html.erb
index 2fa69b99..1ebed836 100644
--- a/app/views/submissions/_details_form.html.erb
+++ b/app/views/submissions/_details_form.html.erb
@@ -10,6 +10,7 @@
             <%= "disabled" if @submission.judging_status == "winner" %>
             <%= "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.
@@ -26,6 +27,7 @@
             <%= "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.
@@ -38,7 +40,7 @@
         id="judging-status-hidden"
         type="hidden"
         name="submission[judging_status]"
-        data-submission-details-target="hiddenInput"
+        data-submission-details-target="judgingStatusHidden"
         />
         <div class="usa-form-group">
             <%= form.label :comments, "Comments and notes:", class: "usa-label" %>
diff --git a/app/views/submissions/_submission_details.html.erb b/app/views/submissions/_submission_details.html.erb
index 92fa6853..34726d5b 100644
--- a/app/views/submissions/_submission_details.html.erb
+++ b/app/views/submissions/_submission_details.html.erb
@@ -1,56 +1,4 @@
-<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"
-            <%= if @submission.judging_status == "winner" then "disabled" end %>
-            <%= "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>
+<%= render partial: 'details_form' %>
 <% if @submission.judging_status.in?(["selected", "winner"]) %>
     <%= render partial: 'submission_evaluation' %>
 <% end %>

From 2e9236e4b8bbe2a7d6fc249e603eeeadf78f8223 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 30 Dec 2024 10:21:03 -0500
Subject: [PATCH 23/46] extract available evaluators to helper method

---
 app/controllers/submissions_controller.rb     |  1 -
 app/helpers/submissions_helper.rb             |  4 +++
 .../_available_evaluators.html.erb            | 31 +++++++++++--------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index b4d20263..615d0038 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -6,7 +6,6 @@ class SubmissionsController < ApplicationController
   before_action :set_submission, only: [:show, :update]
 
   def show
-    @available_evaluators = @submission.phase.evaluators - @submission.evaluators
   end  
 
   def update
diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb
index 6e6f7f93..f81695df 100644
--- a/app/helpers/submissions_helper.rb
+++ b/app/helpers/submissions_helper.rb
@@ -9,4 +9,8 @@ def eligible_for_evaluation?(submission)
   def selected_to_advance?(submission)
     submission.judging_status.in?(%w[winner])
   end
+
+  def available_evaluators(submission)
+    submission.phase.evaluators - submission.evaluators || []
+  end  
 end
diff --git a/app/views/submissions/_available_evaluators.html.erb b/app/views/submissions/_available_evaluators.html.erb
index 3d5cd1bf..44775181 100644
--- a/app/views/submissions/_available_evaluators.html.erb
+++ b/app/views/submissions/_available_evaluators.html.erb
@@ -1,3 +1,4 @@
+<% @available_evaluators = available_evaluators(@submission) %>
 <div class="usa-accordion">
   <% rand = SecureRandom.hex(8) %>
   <h2 class="usa-accordion__heading" id="<%= "#{rand}-accordion-heading" %>">
@@ -12,19 +13,23 @@
   </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>
+    <% unless @available_evaluators.empty? %>
+      <% @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 %>
+      <% end %>
+    <% else %>
+      No available evaluators.
+    <% end %>  
   </div>
 </div>
\ No newline at end of file

From fef1d883f69c5a42475bea6fb613df487c8542c7 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 6 Jan 2025 12:57:42 -0500
Subject: [PATCH 24/46] unassign and reassign

---
 ...uator_submission_assignments_controller.rb | 12 ++++++++----
 app/helpers/submissions_helper.rb             |  2 +-
 .../submissions/_assigned_evaluators.html.erb |  8 ++++----
 .../_available_evaluators.html.erb            | 19 ++++++++++++++-----
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/controllers/evaluator_submission_assignments_controller.rb b/app/controllers/evaluator_submission_assignments_controller.rb
index ad659d47..0ace3d5d 100644
--- a/app/controllers/evaluator_submission_assignments_controller.rb
+++ b/app/controllers/evaluator_submission_assignments_controller.rb
@@ -90,10 +90,14 @@ def update_assignment_status(new_status)
 
   def handle_successful_update(new_status)
     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
+    if request.referrer && request.referrer.include?("submissions") 
+      redirect_to request.referrer
+    else   
+      respond_to do |format|
+        format.html { redirect_to_assignment_path }
+        format.json { render json: { success: true, message: flash[:success] } }
+      end
+    end  
   end
 
   def handle_failed_update(new_status)
diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb
index f81695df..d3fea99a 100644
--- a/app/helpers/submissions_helper.rb
+++ b/app/helpers/submissions_helper.rb
@@ -11,6 +11,6 @@ def selected_to_advance?(submission)
   end
 
   def available_evaluators(submission)
-    submission.phase.evaluators - submission.evaluators || []
+    submission.phase.evaluators - submission.evaluators + submission.evaluators.where("evaluator_submission_assignments.status" => ["unassigned"])
   end  
 end
diff --git a/app/views/submissions/_assigned_evaluators.html.erb b/app/views/submissions/_assigned_evaluators.html.erb
index 501a78ea..1843b506 100644
--- a/app/views/submissions/_assigned_evaluators.html.erb
+++ b/app/views/submissions/_assigned_evaluators.html.erb
@@ -22,7 +22,7 @@
             </tr>
           </thead>
           <tbody>
-            <% @submission.evaluators.each do |evaluator| %>
+            <% @submission.evaluators.where("evaluator_submission_assignments.status" => ["assigned", "recused"]).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>
@@ -31,9 +31,9 @@
                 <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 %>
+                    <%= form_with url: phase_evaluator_submission_assignment_path(@submission.phase, evaluator.evaluator_submission_assignments.where(submission_id: @submission.id).first.id), method: "PATCH" do |f| %>
+                      <%= f.hidden_field :phase_id, value: @submission.phase.id %>
+                      <%= f.hidden_field :status, value: "unassigned" %>
                       <%= f.submit "Unassign" %>
                     <% end %>
                   </div>
diff --git a/app/views/submissions/_available_evaluators.html.erb b/app/views/submissions/_available_evaluators.html.erb
index 44775181..80719510 100644
--- a/app/views/submissions/_available_evaluators.html.erb
+++ b/app/views/submissions/_available_evaluators.html.erb
@@ -20,11 +20,20 @@
                   <%= 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 %>
+                  <% assignment = evaluator.evaluator_submission_assignments.where(submission_id: @submission.id).first %>
+                  <% if assignment %>
+                    <%= form_with url: phase_evaluator_submission_assignment_path(@submission.phase, assignment.id), method: "PATCH" do |f| %>
+                      <%= f.hidden_field :phase_id, value: @submission.phase.id %>
+                      <%= f.hidden_field :status, value: "assigned" %>
+                      <%= f.submit "Reassign" %>
+                    <% end %>
+                  <% else %>
+                    <%= 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 %>
+                  <% end %>  
               </div>
 
       <% end %>

From 413abf744fe3706924588cd514d7efc739f451ad Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 6 Jan 2025 13:20:05 -0500
Subject: [PATCH 25/46] remove .zshrc

---
 .zshrc | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .zshrc

diff --git a/.zshrc b/.zshrc
deleted file mode 100644
index 8880f898..00000000
--- a/.zshrc
+++ /dev/null
@@ -1 +0,0 @@
-export PHOENIX_URI="localhost:4000"
\ No newline at end of file

From 7cf56154a85b3f25d23436f33b58126ccc0d1d6e Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 6 Jan 2025 13:22:06 -0500
Subject: [PATCH 26/46] remove unneeded action

---
 .../evaluator_submission_assignments_controller.rb            | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/controllers/evaluator_submission_assignments_controller.rb b/app/controllers/evaluator_submission_assignments_controller.rb
index 0ace3d5d..18efa59c 100644
--- a/app/controllers/evaluator_submission_assignments_controller.rb
+++ b/app/controllers/evaluator_submission_assignments_controller.rb
@@ -21,10 +21,6 @@ def create
     end
   end
 
-  def unassign
-    
-  end  
-
   def index
     @evaluator_assignments = @phase.evaluator_submission_assignments.includes(:submission).where(user_id: @evaluator.id)
     @assigned_submissions = @evaluator_assignments.

From 5c6ed4d553974994d57c29698c161cf3de72db08 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 6 Jan 2025 13:23:18 -0500
Subject: [PATCH 27/46] rubocop -A

---
 ...uator_submission_assignments_controller.rb | 41 ++++++++++---------
 app/controllers/submissions_controller.rb     |  3 +-
 app/helpers/submissions_helper.rb             |  2 +-
 spec/requests/pages_spec.rb                   | 20 ++++-----
 spec/system/submission_details_spec.rb        |  1 -
 5 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/app/controllers/evaluator_submission_assignments_controller.rb b/app/controllers/evaluator_submission_assignments_controller.rb
index 18efa59c..c461ba4d 100644
--- a/app/controllers/evaluator_submission_assignments_controller.rb
+++ b/app/controllers/evaluator_submission_assignments_controller.rb
@@ -8,19 +8,6 @@ class EvaluatorSubmissionAssignmentsController < ApplicationController
   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 index
     @evaluator_assignments = @phase.evaluator_submission_assignments.includes(:submission).where(user_id: @evaluator.id)
     @assigned_submissions = @evaluator_assignments.
@@ -33,6 +20,20 @@ def index
     @submissions_count = calculate_submissions_count(@assigned_submissions)
   end
 
+  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
+
   # update only the status of the evaluation submission assignment to unassign or reassign an evaluator
   def update
     new_status = status_from_params
@@ -65,7 +66,7 @@ def set_assignment
 
   def set_submission
     @submission = @phase.submissions.find(params[:submission_id])
-  end  
+  end
 
   def status_from_params
     status = params[:status] || params.dig(:evaluator_submission_assignment, :status)
@@ -85,19 +86,19 @@ def update_assignment_status(new_status)
   end
 
   def handle_successful_update(new_status)
-    flash[:success] = t("evaluator_submission_assignments.#{new_status}.success")
-    if request.referrer && request.referrer.include?("submissions") 
-      redirect_to request.referrer
-    else   
+    flash.now[:success] = t("evaluator_submission_assignments.#{new_status}.success")
+    if request.referer&.include?("submissions")
+      redirect_to request.referer
+    else
       respond_to do |format|
         format.html { redirect_to_assignment_path }
         format.json { render json: { success: true, message: flash[:success] } }
       end
-    end  
+    end
   end
 
   def handle_failed_update(new_status)
-    flash[:error] = t("evaluator_submission_assignments.#{new_status}.failure")
+    flash.now[: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 }
diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 615d0038..93d5f1bc 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -5,8 +5,7 @@ class SubmissionsController < ApplicationController
   before_action -> { authorize_user('challenge_manager') }
   before_action :set_submission, only: [:show, :update]
 
-  def show
-  end  
+  def show; end
 
   def update
     if @submission.update!(submission_params)
diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb
index d3fea99a..3ff99131 100644
--- a/app/helpers/submissions_helper.rb
+++ b/app/helpers/submissions_helper.rb
@@ -12,5 +12,5 @@ def selected_to_advance?(submission)
 
   def available_evaluators(submission)
     submission.phase.evaluators - submission.evaluators + submission.evaluators.where("evaluator_submission_assignments.status" => ["unassigned"])
-  end  
+  end
 end
diff --git a/spec/requests/pages_spec.rb b/spec/requests/pages_spec.rb
index a8952447..02c272ae 100644
--- a/spec/requests/pages_spec.rb
+++ b/spec/requests/pages_spec.rb
@@ -2,40 +2,40 @@
 
 RSpec.describe "PagesController" do
   it "get root renders successfully" do
-    stub_request(:get, PagesController::HOST + PagesController::BASE_URL + "/").
-        to_return(status: 200, body: "", headers: {})
+    stub_request(:get, "#{PagesController::HOST}#{PagesController::BASE_URL}/").
+      to_return(status: 200, body: "", headers: {})
 
     get "/"
     expect(response).to be_ok
   end
 
   it "removes full paths to assets so they proxy too" do
-    stub_request(:get, PagesController::HOST + PagesController::BASE_URL + "/").
-        to_return(status: 200, body: PagesController::HOST + PagesController::BASE_URL, headers: {})
+    stub_request(:get, "#{PagesController::HOST}#{PagesController::BASE_URL}/").
+      to_return(status: 200, body: PagesController::HOST + PagesController::BASE_URL, headers: {})
 
     get "/"
     expect(response.body).to eq("/")
   end
 
   it "works for minified js assets" do
-    stub_request(:get, PagesController::HOST + PagesController::BASE_URL + "/assets/uswds.min.js").
-        to_return(status: 200, body: "", headers: {})
+    stub_request(:get, "#{PagesController::HOST}#{PagesController::BASE_URL}/assets/uswds.min.js").
+      to_return(status: 200, body: "", headers: {})
 
     get "/assets/uswds.min.js"
     expect(response).to be_ok
   end
 
   it "works for image assets" do
-    stub_request(:get, PagesController::HOST + PagesController::BASE_URL + "/assets/logo.svg").
-        to_return(status: 200, body: "", headers: {})
+    stub_request(:get, "#{PagesController::HOST}#{PagesController::BASE_URL}/assets/logo.svg").
+      to_return(status: 200, body: "", headers: {})
 
     get "/assets/logo.svg"
     expect(response).to be_ok
   end
 
   it "404s to the dashboard" do
-    stub_request(:get, PagesController::HOST + PagesController::BASE_URL + "/not_found/").
-        to_return(status: 404, body: "", headers: {})
+    stub_request(:get, "#{PagesController::HOST}#{PagesController::BASE_URL}/not_found/").
+      to_return(status: 404, body: "", headers: {})
 
     get "/not_found"
     expect(response).to redirect_to("/dashboard")
diff --git a/spec/system/submission_details_spec.rb b/spec/system/submission_details_spec.rb
index 0b06b6c9..9f9a745f 100644
--- a/spec/system/submission_details_spec.rb
+++ b/spec/system/submission_details_spec.rb
@@ -8,7 +8,6 @@
     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

From aa47a40ac46d7566a276287ef77e9f55cefc181d Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 6 Jan 2025 14:14:10 -0500
Subject: [PATCH 28/46] from flash.now to flash

---
 ...uator_submission_assignments_controller.rb | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/app/controllers/evaluator_submission_assignments_controller.rb b/app/controllers/evaluator_submission_assignments_controller.rb
index c461ba4d..25f05690 100644
--- a/app/controllers/evaluator_submission_assignments_controller.rb
+++ b/app/controllers/evaluator_submission_assignments_controller.rb
@@ -8,6 +8,19 @@ class EvaluatorSubmissionAssignmentsController < ApplicationController
   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 index
     @evaluator_assignments = @phase.evaluator_submission_assignments.includes(:submission).where(user_id: @evaluator.id)
     @assigned_submissions = @evaluator_assignments.
@@ -20,20 +33,6 @@ def index
     @submissions_count = calculate_submissions_count(@assigned_submissions)
   end
 
-  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
-
   # update only the status of the evaluation submission assignment to unassign or reassign an evaluator
   def update
     new_status = status_from_params
@@ -66,7 +65,7 @@ def set_assignment
 
   def set_submission
     @submission = @phase.submissions.find(params[:submission_id])
-  end
+  end  
 
   def status_from_params
     status = params[:status] || params.dig(:evaluator_submission_assignment, :status)
@@ -86,19 +85,19 @@ def update_assignment_status(new_status)
   end
 
   def handle_successful_update(new_status)
-    flash.now[:success] = t("evaluator_submission_assignments.#{new_status}.success")
-    if request.referer&.include?("submissions")
+    flash[:success] = t("evaluator_submission_assignments.#{new_status}.success")
+    if request.referer && request.referer.include?("submissions") 
       redirect_to request.referer
-    else
+    else   
       respond_to do |format|
         format.html { redirect_to_assignment_path }
         format.json { render json: { success: true, message: flash[:success] } }
       end
-    end
+    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 }

From 8fae71559a957889fb5123155b393352fbf34d02 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 6 Jan 2025 16:30:54 -0500
Subject: [PATCH 29/46] code climate

---
 ...uator_submission_assignments_controller.rb | 32 +++++++++----------
 app/helpers/submissions_helper.rb             |  4 ++-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/controllers/evaluator_submission_assignments_controller.rb b/app/controllers/evaluator_submission_assignments_controller.rb
index 25f05690..bca0583e 100644
--- a/app/controllers/evaluator_submission_assignments_controller.rb
+++ b/app/controllers/evaluator_submission_assignments_controller.rb
@@ -8,19 +8,6 @@ class EvaluatorSubmissionAssignmentsController < ApplicationController
   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 index
     @evaluator_assignments = @phase.evaluator_submission_assignments.includes(:submission).where(user_id: @evaluator.id)
     @assigned_submissions = @evaluator_assignments.
@@ -33,6 +20,19 @@ def index
     @submissions_count = calculate_submissions_count(@assigned_submissions)
   end
 
+  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.assigned.success")
+    else
+      redirect_to submission_path(@submission), notice: I18n.t("evaluator_submission_assignment.assigned.failure")
+    end
+  end
+
   # update only the status of the evaluation submission assignment to unassign or reassign an evaluator
   def update
     new_status = status_from_params
@@ -65,7 +65,7 @@ def set_assignment
 
   def set_submission
     @submission = @phase.submissions.find(params[:submission_id])
-  end  
+  end
 
   def status_from_params
     status = params[:status] || params.dig(:evaluator_submission_assignment, :status)
@@ -86,14 +86,14 @@ def update_assignment_status(new_status)
 
   def handle_successful_update(new_status)
     flash[:success] = t("evaluator_submission_assignments.#{new_status}.success")
-    if request.referer && request.referer.include?("submissions") 
+    if request&.referer&.include?("submissions")
       redirect_to request.referer
     else   
       respond_to do |format|
         format.html { redirect_to_assignment_path }
         format.json { render json: { success: true, message: flash[:success] } }
       end
-    end  
+    end
   end
 
   def handle_failed_update(new_status)
diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb
index 3ff99131..50275702 100644
--- a/app/helpers/submissions_helper.rb
+++ b/app/helpers/submissions_helper.rb
@@ -11,6 +11,8 @@ def selected_to_advance?(submission)
   end
 
   def available_evaluators(submission)
-    submission.phase.evaluators - submission.evaluators + submission.evaluators.where("evaluator_submission_assignments.status" => ["unassigned"])
+    submission.phase.evaluators - 
+    submission.evaluators + 
+    submission.evaluators.where("evaluator_submission_assignments.status" => ["unassigned"])
   end
 end

From 4fc46418b51399cdebe96b2f9f1420ff8ff38f74 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 6 Jan 2025 16:39:15 -0500
Subject: [PATCH 30/46] codeclimactic

---
 .../evaluator_submission_assignments_controller.rb          | 2 +-
 app/helpers/submissions_helper.rb                           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/evaluator_submission_assignments_controller.rb b/app/controllers/evaluator_submission_assignments_controller.rb
index bca0583e..8f53d7d8 100644
--- a/app/controllers/evaluator_submission_assignments_controller.rb
+++ b/app/controllers/evaluator_submission_assignments_controller.rb
@@ -88,7 +88,7 @@ def handle_successful_update(new_status)
     flash[:success] = t("evaluator_submission_assignments.#{new_status}.success")
     if request&.referer&.include?("submissions")
       redirect_to request.referer
-    else   
+    else
       respond_to do |format|
         format.html { redirect_to_assignment_path }
         format.json { render json: { success: true, message: flash[:success] } }
diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb
index 50275702..840f382b 100644
--- a/app/helpers/submissions_helper.rb
+++ b/app/helpers/submissions_helper.rb
@@ -11,8 +11,8 @@ def selected_to_advance?(submission)
   end
 
   def available_evaluators(submission)
-    submission.phase.evaluators - 
-    submission.evaluators + 
-    submission.evaluators.where("evaluator_submission_assignments.status" => ["unassigned"])
+    submission.phase.evaluators -
+      submission.evaluators +
+      submission.evaluators.where("evaluator_submission_assignments.status" => ["unassigned"])
   end
 end

From a98c37fd91bfeb57fb6dd163c213447e56d587b7 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Tue, 7 Jan 2025 08:12:05 -0500
Subject: [PATCH 31/46] buttons and links

---
 app/views/submissions/_assigned_evaluators.html.erb   | 2 +-
 app/views/submissions/_available_evaluators.html.erb  | 4 ++--
 app/views/submissions/_submission_evaluation.html.erb | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/submissions/_assigned_evaluators.html.erb b/app/views/submissions/_assigned_evaluators.html.erb
index 1843b506..4a44dde6 100644
--- a/app/views/submissions/_assigned_evaluators.html.erb
+++ b/app/views/submissions/_assigned_evaluators.html.erb
@@ -34,7 +34,7 @@
                     <%= form_with url: phase_evaluator_submission_assignment_path(@submission.phase, evaluator.evaluator_submission_assignments.where(submission_id: @submission.id).first.id), method: "PATCH" do |f| %>
                       <%= f.hidden_field :phase_id, value: @submission.phase.id %>
                       <%= f.hidden_field :status, value: "unassigned" %>
-                      <%= f.submit "Unassign" %>
+                      <%= f.submit "Unassign", class: "usa-button usa-button--outline font-body-2xs" %>
                     <% end %>
                   </div>
                 </td>
diff --git a/app/views/submissions/_available_evaluators.html.erb b/app/views/submissions/_available_evaluators.html.erb
index 80719510..cef15951 100644
--- a/app/views/submissions/_available_evaluators.html.erb
+++ b/app/views/submissions/_available_evaluators.html.erb
@@ -25,13 +25,13 @@
                     <%= form_with url: phase_evaluator_submission_assignment_path(@submission.phase, assignment.id), method: "PATCH" do |f| %>
                       <%= f.hidden_field :phase_id, value: @submission.phase.id %>
                       <%= f.hidden_field :status, value: "assigned" %>
-                      <%= f.submit "Reassign" %>
+                      <%= f.submit "Reassign", class: "usa-button font-body-2xs" %>
                     <% end %>
                   <% else %>
                     <%= 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" %>
+                      <%= f.submit "Assign", class: "usa-button font-body-2xs" %>
                     <% end %>
                   <% end %>  
               </div>
diff --git a/app/views/submissions/_submission_evaluation.html.erb b/app/views/submissions/_submission_evaluation.html.erb
index c42cb5aa..c107fa05 100644
--- a/app/views/submissions/_submission_evaluation.html.erb
+++ b/app/views/submissions/_submission_evaluation.html.erb
@@ -4,4 +4,5 @@
 <% else %>
     <%= render partial: 'assigned_evaluators' %>
     <%= render partial: 'available_evaluators' %>
+    <%= link_to "Manage Evaluators", phase_evaluators_path(@submission.phase), class: "float-right margin-y-1"  %>
 <% end %>
\ No newline at end of file

From 969b79a294c39248b2edbaeea35156b7259e97d6 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Tue, 7 Jan 2025 08:40:55 -0500
Subject: [PATCH 32/46] recused unassigned

---
 app/views/submissions/_assigned_evaluators.html.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/submissions/_assigned_evaluators.html.erb b/app/views/submissions/_assigned_evaluators.html.erb
index 4a44dde6..ce7a438e 100644
--- a/app/views/submissions/_assigned_evaluators.html.erb
+++ b/app/views/submissions/_assigned_evaluators.html.erb
@@ -31,9 +31,10 @@
                 <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_assignment_path(@submission.phase, evaluator.evaluator_submission_assignments.where(submission_id: @submission.id).first.id), method: "PATCH" do |f| %>
+                    <% assignment = evaluator.evaluator_submission_assignments.where(submission_id: @submission.id).first %>
+                    <%= form_with url: phase_evaluator_submission_assignment_path(@submission.phase, assignment.id), method: "PATCH" do |f| %>
                       <%= f.hidden_field :phase_id, value: @submission.phase.id %>
-                      <%= f.hidden_field :status, value: "unassigned" %>
+                      <%= f.hidden_field :status, value: assignment.recused? ? "recused_unassigned" : "unassigned" %>
                       <%= f.submit "Unassign", class: "usa-button usa-button--outline font-body-2xs" %>
                     <% end %>
                   </div>

From 9da5834cbc7269f0354e72acff0c85a27e2f2c54 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Tue, 7 Jan 2025 10:03:47 -0500
Subject: [PATCH 33/46] testing

---
 spec/system/submission_details_spec.rb | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/spec/system/submission_details_spec.rb b/spec/system/submission_details_spec.rb
index 9f9a745f..87a4f42b 100644
--- a/spec/system/submission_details_spec.rb
+++ b/spec/system/submission_details_spec.rb
@@ -6,7 +6,8 @@
   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) }
+    let(:phase) { create(:phase, challenge: challenge) }
+    let(:submission) { create(:submission, manager: user, challenge: challenge, phase: phase, status: "submitted") }
 
     before { system_login_user(user) }
 
@@ -40,5 +41,20 @@
       updated_submission = Submission.find(submission.id)
       expect(updated_submission.comments).to eq(comments)
     end
+
+    it "displays a list of available evaluators" do
+      evaluator1 = create_user(role: "evaluator")
+      evaluator2 = create_user(role: "evaluator")
+      challenge.challenge_phases_evaluators.create(user: evaluator1, phase: phase)
+      challenge.challenge_phases_evaluators.create(user: evaluator2, phase: phase)
+      evaluation_form = create(:evaluation_form, phase: phase, challenge: challenge)
+      visit submission_path(submission)
+      find_by_id('eligible-for-evaluation').click
+      click_on('Save')
+
+      expect(page).to have_content("Available Evaluators")
+      expect(page).to have_content(evaluator1.email)
+      expect(page).to have_content(evaluator1.email)
+    end
   end
-end
+end
\ No newline at end of file

From e0d1dd99bf105c66bb2975952350a9ccc764a167 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Tue, 7 Jan 2025 11:14:50 -0500
Subject: [PATCH 34/46] more tests

---
 ...uator_submission_assignments_controller.rb |  4 +--
 config/locales/en.yml                         |  9 +++--
 spec/system/submission_details_spec.rb        | 34 +++++++++++++++++++
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/app/controllers/evaluator_submission_assignments_controller.rb b/app/controllers/evaluator_submission_assignments_controller.rb
index 8f53d7d8..9d94ecf5 100644
--- a/app/controllers/evaluator_submission_assignments_controller.rb
+++ b/app/controllers/evaluator_submission_assignments_controller.rb
@@ -27,9 +27,9 @@ def create
       status: :assigned
     )
     if @evaluator_submission_assignment.save
-      redirect_to submission_path(@submission), notice: I18n.t("evaluator_submission_assignment.assigned.success")
+      redirect_to submission_path(@submission), notice: I18n.t("evaluator_submission_assignments.assigned.success")
     else
-      redirect_to submission_path(@submission), notice: I18n.t("evaluator_submission_assignment.assigned.failure")
+      redirect_to submission_path(@submission), notice: I18n.t("evaluator_submission_assignments.assigned.failure")
     end
   end
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ef48861b..154ad244 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -76,11 +76,14 @@ en:
     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."
     assigned:
-      success: "Evaluator reassigned successfully"
-      failure: "Failed to reassign evaluator"
+      success: "Evaluator assigned successfully"
+      failure: "Failed to assign evaluator"
     unassigned:
       success: "Evaluator unassigned successfully"
-      failure: "Failed to unassign evaluator"      
+      failure: "Failed to unassign evaluator"
+    recused_unassigned:
+      success: "Recused evaluator unassigned successfully"
+      failure: "Failed to unassign evaluator"           
   evaluations: 
     unique_user_for_evaluation_form_and_submission_error: "already has an evaluation for this form and submission"
     unique_evaluator_submission_assignment: "already has an evaluation"
diff --git a/spec/system/submission_details_spec.rb b/spec/system/submission_details_spec.rb
index 87a4f42b..4fff9028 100644
--- a/spec/system/submission_details_spec.rb
+++ b/spec/system/submission_details_spec.rb
@@ -55,6 +55,40 @@
       expect(page).to have_content("Available Evaluators")
       expect(page).to have_content(evaluator1.email)
       expect(page).to have_content(evaluator1.email)
+      EvaluatorSubmissionAssignment.delete_all
+    end
+
+    it "assigns and unassigns an evaluator to the submission" do
+      evaluator = create_user(role: "evaluator")
+      challenge.challenge_phases_evaluators.create(user: evaluator, phase: phase)
+      evaluation_form = create(:evaluation_form, phase: phase, challenge: challenge)
+      visit submission_path(submission)
+      find_by_id('eligible-for-evaluation').click
+      click_on('Save')
+
+      click_on('Assign')
+      expect(page).to have_css("p.usa-alert__text", text: "Evaluator assigned successfully")
+
+      click_on('Unassign')
+      expect(page).to have_css("p.usa-alert__text", text: "Evaluator unassigned successfully")
+    end
+
+    it "unassigns a recused evaluator from the submission" do
+      evaluator = create_user(role: "evaluator")
+      challenge.challenge_phases_evaluators.create(user: evaluator, phase: phase)
+      evaluation_form = create(:evaluation_form, phase: phase, challenge: challenge)
+      visit submission_path(submission)
+      find_by_id('eligible-for-evaluation').click
+      click_on('Save')
+
+      click_on('Assign')
+      expect(page).to have_css("p.usa-alert__text", text: "Evaluator assigned successfully")
+
+      EvaluatorSubmissionAssignment.where(user_id: evaluator.id, submission_id: submission.id).update!(status: "recused")
+
+      visit submission_path(submission)
+      click_on('Unassign')
+      expect(page).to have_css("p.usa-alert__text", text: "Recused evaluator unassigned successfully")
     end
   end
 end
\ No newline at end of file

From bc3097fbfa88edc70f8b07b3a07c5fe3634ee021 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Tue, 7 Jan 2025 11:54:36 -0500
Subject: [PATCH 35/46] random ids on comment form

---
 app/views/submissions/_details_form.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/submissions/_details_form.html.erb b/app/views/submissions/_details_form.html.erb
index 1ebed836..da4454d2 100644
--- a/app/views/submissions/_details_form.html.erb
+++ b/app/views/submissions/_details_form.html.erb
@@ -43,8 +43,8 @@
         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 %>
+            <%= form.label :comments, "Comments and notes:", class: "usa-label", for: "#{rand}-comments" %>
+            <%= form.text_area :comments, class: "usa-textarea", default: @submission.comments, id: "#{rand}-comments" %>
         </div>
         <button type="submit" name="commit" class="usa-button font-body-2xs text-no-wrap margin-y-2">
             Save

From 7263aa9dddb20fea6276bad7b1250f8b2488b21f Mon Sep 17 00:00:00 2001
From: Stephen Chudleigh <stephen@smartlogic.io>
Date: Tue, 7 Jan 2025 12:23:28 -0800
Subject: [PATCH 36/46] refactor Submission#available_evaluators method

---
 app/helpers/submissions_helper.rb             |  6 ---
 app/models/submission.rb                      |  6 +++
 .../_available_evaluators.html.erb            |  5 +--
 spec/models/submission_spec.rb                | 38 +++++++++++++++++++
 4 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb
index 840f382b..6e6f7f93 100644
--- a/app/helpers/submissions_helper.rb
+++ b/app/helpers/submissions_helper.rb
@@ -9,10 +9,4 @@ def eligible_for_evaluation?(submission)
   def selected_to_advance?(submission)
     submission.judging_status.in?(%w[winner])
   end
-
-  def available_evaluators(submission)
-    submission.phase.evaluators -
-      submission.evaluators +
-      submission.evaluators.where("evaluator_submission_assignments.status" => ["unassigned"])
-  end
 end
diff --git a/app/models/submission.rb b/app/models/submission.rb
index 1dcdaf94..8c605710 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -63,6 +63,12 @@ class Submission < ApplicationRecord
   }
   scope :eligible_for_evaluation, -> { where(judging_status: [:selected, :winner]) }
 
+  # Phase evaluators not currently assigned or recused on the submission
+  def available_evaluators
+    unavailable_evaluators = evaluators.where.not("evaluator_submission_assignments.status" => "unassigned")
+    phase.evaluators.where.not(id: unavailable_evaluators)
+  end
+
   def eligible_for_evaluation?
     selected? or winner?
   end
diff --git a/app/views/submissions/_available_evaluators.html.erb b/app/views/submissions/_available_evaluators.html.erb
index cef15951..5f3601c8 100644
--- a/app/views/submissions/_available_evaluators.html.erb
+++ b/app/views/submissions/_available_evaluators.html.erb
@@ -1,4 +1,3 @@
-<% @available_evaluators = available_evaluators(@submission) %>
 <div class="usa-accordion">
   <% rand = SecureRandom.hex(8) %>
   <h2 class="usa-accordion__heading" id="<%= "#{rand}-accordion-heading" %>">
@@ -13,8 +12,8 @@
   </h2>
 
   <div class="usa-accordion__content background-primary-lighter" id="<%= rand %>">
-    <% unless @available_evaluators.empty? %>
-      <% @available_evaluators.each do |evaluator| %>
+    <% if @submission.available_evaluators.any? %>
+      <% @submission.available_evaluators.each do |evaluator| %>
               <div class="float-left">
                   <%= "#{evaluator.first_name} #{evaluator.last_name}" %> <br/>
                   <%= evaluator.email %>
diff --git a/spec/models/submission_spec.rb b/spec/models/submission_spec.rb
index fc3e416f..0ce774ff 100644
--- a/spec/models/submission_spec.rb
+++ b/spec/models/submission_spec.rb
@@ -69,4 +69,42 @@
       end
     end
   end
+
+  describe "#available_evaluators" do
+    let(:challenge) { create(:challenge) }
+    let(:phase) { create(:phase, challenge:) }
+    let(:evaluator) do
+      evaluator = create(:user, role: "evaluator")
+      evaluator.challenge_phases_evaluators.create(challenge:, phase:)
+      evaluator
+    end
+    let(:submission) { create(:submission, challenge:, phase:) }
+
+    it "includes evaluators that have not been assigned yet" do
+      expect(submission.phase.evaluators).to include(evaluator)
+      expect(EvaluatorSubmissionAssignment.find_by(evaluator:)).to be_nil
+      expect(submission.available_evaluators).to include(evaluator)
+    end
+
+    it "includes evaluators that have been unassigned from the submission" do
+      expect(submission.phase.evaluators).to include(evaluator)
+      submission.evaluator_submission_assignments.create(evaluator:, submission:, status: "unassigned")
+      expect(submission.available_evaluators).to include(evaluator)
+    end
+
+    it "does not include evaluators that have been assigned" do
+      expect(submission.phase.evaluators).to include(evaluator)
+      submission.evaluator_submission_assignments.create(evaluator:, submission:, status: "assigned")
+      expect(submission.available_evaluators).not_to include(evaluator)
+    end
+
+    it "does not include evaluators that have recused" do
+      expect(submission.phase.evaluators).to include(evaluator)
+      esa = submission.evaluator_submission_assignments.create(evaluator:, submission:, status: "recused")
+      expect(submission.available_evaluators).not_to include(evaluator)
+      # unassigned after recusing
+      esa.update!(status: "recused_unassigned")
+      expect(submission.available_evaluators).not_to include(evaluator)
+    end
+  end
 end

From 24150af99b12a54b70c0ef9e55fd9f86e41924c9 Mon Sep 17 00:00:00 2001
From: Stephen Chudleigh <stephen@smartlogic.io>
Date: Tue, 7 Jan 2025 12:40:13 -0800
Subject: [PATCH 37/46] update spec

---
 spec/models/submission_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/submission_spec.rb b/spec/models/submission_spec.rb
index 0ce774ff..b8acf1c1 100644
--- a/spec/models/submission_spec.rb
+++ b/spec/models/submission_spec.rb
@@ -82,7 +82,7 @@
 
     it "includes evaluators that have not been assigned yet" do
       expect(submission.phase.evaluators).to include(evaluator)
-      expect(EvaluatorSubmissionAssignment.find_by(evaluator:)).to be_nil
+      expect(EvaluatorSubmissionAssignment.find_by(evaluator:, submission:)).to be_nil
       expect(submission.available_evaluators).to include(evaluator)
     end
 

From c8ed7f9e69ed9f7cc15378f7af56aed6380f5914 Mon Sep 17 00:00:00 2001
From: Stephen Chudleigh <stephen@smartlogic.io>
Date: Tue, 7 Jan 2025 16:23:42 -0800
Subject: [PATCH 38/46] update disabled checkbox state

---
 app/views/submissions/_details_form.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/submissions/_details_form.html.erb b/app/views/submissions/_details_form.html.erb
index da4454d2..cee25d68 100644
--- a/app/views/submissions/_details_form.html.erb
+++ b/app/views/submissions/_details_form.html.erb
@@ -7,7 +7,7 @@
             type="checkbox"
             id="<%= "#{rand}-judging-status-selected" %>"
             value="selected"
-            <%= "disabled" if @submission.judging_status == "winner" %>
+            <%= "disabled" if @submission.evaluators_assigned? %>
             <%= "checked" if @submission.judging_status.in?(["selected", "winner"]) %>
             data-action="change->submission-details#eligibleCheck"
             data-submission-details-target="eligibleCheckbox"
@@ -24,7 +24,7 @@
             class="usa-checkbox__input usa-checkbox__input--tile"
             id="<%= "#{rand}-judging-status-winner" %>"
             type="checkbox"
-            <%= "disabled" unless @submission.judging_status.in?(["selected", "winner"]) %>
+            <%= "disabled" if @submission.evaluations_missing_or_incomplete? %>
             <%= "checked" if @submission.judging_status == "winner" %>
             data-action="change->submission-details#selectedCheck"
             data-submission-details-target="winnerCheckbox"

From 62d1ba0a8f62a01e06e8815124fd759cc5614202 Mon Sep 17 00:00:00 2001
From: Stephen Chudleigh <stephen@smartlogic.io>
Date: Tue, 7 Jan 2025 16:27:21 -0800
Subject: [PATCH 39/46] codeclimate caught my merge conflict resolution error

---
 app/models/submission.rb | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/app/models/submission.rb b/app/models/submission.rb
index 6ff3691b..b4ce0246 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -93,19 +93,6 @@ def eligible_for_evaluation?
     selected? or winner?
   end
 
-  def selected_to_advance?
-    winner?
-  end
-
-  def average_score
-    avg = evaluations.average(:total_score)
-    avg ? avg.round : 0
-  end
-
-  def eligible_for_evaluation?
-    selected? or winner?
-  end
-
   def average_score
     avg = evaluations.joins(:evaluator_submission_assignment).
       where(evaluator_submission_assignments: { status: :assigned }).

From cc73e9eb4c8acb7db3d6936a67c33b981fa75888 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 8 Jan 2025 09:39:47 -0500
Subject: [PATCH 40/46] warning messages

---
 .../submissions/_assigned_evaluators.html.erb | 71 +++++++++++--------
 .../_available_evaluators.html.erb            | 10 ++-
 2 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/app/views/submissions/_assigned_evaluators.html.erb b/app/views/submissions/_assigned_evaluators.html.erb
index ce7a438e..d10f2dea 100644
--- a/app/views/submissions/_assigned_evaluators.html.erb
+++ b/app/views/submissions/_assigned_evaluators.html.erb
@@ -12,36 +12,47 @@
   </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.where("evaluator_submission_assignments.status" => ["assigned", "recused"]).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">
-                    <% assignment = evaluator.evaluator_submission_assignments.where(submission_id: @submission.id).first %>
-                    <%= form_with url: phase_evaluator_submission_assignment_path(@submission.phase, assignment.id), method: "PATCH" do |f| %>
-                      <%= f.hidden_field :phase_id, value: @submission.phase.id %>
-                      <%= f.hidden_field :status, value: assignment.recused? ? "recused_unassigned" : "unassigned" %>
-                      <%= f.submit "Unassign", class: "usa-button usa-button--outline font-body-2xs" %>
-                    <% end %>
-                  </div>
-                </td>
+    <% assigned_evaluators = @submission.evaluators.where("evaluator_submission_assignments.status" => ["assigned", "recused"]) %>
+      <% if assigned_evaluators.any? %>
+        <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>
-            <% end %>
-          </tbody>
-        </table>
+            </thead>
+            <tbody>
+              <% assigned_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">
+                      <% assignment = evaluator.evaluator_submission_assignments.where(submission_id: @submission.id).first %>
+                      <%= form_with url: phase_evaluator_submission_assignment_path(@submission.phase, assignment.id), method: "PATCH" do |f| %>
+                        <%= f.hidden_field :phase_id, value: @submission.phase.id %>
+                        <%= f.hidden_field :status, value: assignment.recused? ? "recused_unassigned" : "unassigned" %>
+                        <%= f.submit "Unassign", class: "usa-button usa-button--outline font-body-2xs" %>
+                      <% end %>
+                    </div>
+                  </td>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
+        <% else %>
+          <div class="usa-alert usa-alert--warning">
+            <div class="usa-alert__body">
+              <p class="usa-alert__text font-body-2xs">
+                You currently do not have any evaluators assigned to this submission. Please use the section below to review and assign available evaluators.
+              </p>
+            </div>
+          </div>
+        <% end %>  
   </div>
 </div>
\ No newline at end of file
diff --git a/app/views/submissions/_available_evaluators.html.erb b/app/views/submissions/_available_evaluators.html.erb
index 5f3601c8..b4302c8b 100644
--- a/app/views/submissions/_available_evaluators.html.erb
+++ b/app/views/submissions/_available_evaluators.html.erb
@@ -11,7 +11,7 @@
     </button>
   </h2>
 
-  <div class="usa-accordion__content background-primary-lighter" id="<%= rand %>">
+  <div class="usa-accordion__content background-primary-lighter width-full" id="<%= rand %>">
     <% if @submission.available_evaluators.any? %>
       <% @submission.available_evaluators.each do |evaluator| %>
               <div class="float-left">
@@ -37,7 +37,13 @@
 
       <% end %>
     <% else %>
-      No available evaluators.
+      <div class="usa-alert usa-alert--warning">
+        <div class="usa-alert__body">
+          <p class="usa-alert__text font-body-2xs">
+            There are no evaluators available for this submission. Please visit Evaluation Panel section to manage your list of available evaluators.
+          </p>
+        </div>
+      </div>
     <% end %>  
   </div>
 </div>
\ No newline at end of file

From b10c6a720ea2dc5e924268c64940c135a49f5104 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 8 Jan 2025 09:40:08 -0500
Subject: [PATCH 41/46] update spec

---
 spec/system/submission_details_spec.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec/system/submission_details_spec.rb b/spec/system/submission_details_spec.rb
index 4fff9028..57957c94 100644
--- a/spec/system/submission_details_spec.rb
+++ b/spec/system/submission_details_spec.rb
@@ -54,8 +54,7 @@
 
       expect(page).to have_content("Available Evaluators")
       expect(page).to have_content(evaluator1.email)
-      expect(page).to have_content(evaluator1.email)
-      EvaluatorSubmissionAssignment.delete_all
+      expect(page).to have_content(evaluator2.email)
     end
 
     it "assigns and unassigns an evaluator to the submission" do

From ba5877be638de26a82109552d6666471f07487d8 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 8 Jan 2025 09:41:59 -0500
Subject: [PATCH 42/46] test for empty list

---
 spec/system/submission_details_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/system/submission_details_spec.rb b/spec/system/submission_details_spec.rb
index 57957c94..54073ae8 100644
--- a/spec/system/submission_details_spec.rb
+++ b/spec/system/submission_details_spec.rb
@@ -65,6 +65,8 @@
       find_by_id('eligible-for-evaluation').click
       click_on('Save')
 
+      expect(page).to have_content("You currently do not have any evaluators assigned to this submission.")
+
       click_on('Assign')
       expect(page).to have_css("p.usa-alert__text", text: "Evaluator assigned successfully")
 

From 9038443319a4ea1a6ae72326cd21b43173e7f1e8 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 8 Jan 2025 09:58:53 -0500
Subject: [PATCH 43/46] available evaluators styling

---
 .../submissions/_available_evaluators.html.erb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/views/submissions/_available_evaluators.html.erb b/app/views/submissions/_available_evaluators.html.erb
index b4302c8b..355e08ba 100644
--- a/app/views/submissions/_available_evaluators.html.erb
+++ b/app/views/submissions/_available_evaluators.html.erb
@@ -11,30 +11,34 @@
     </button>
   </h2>
 
-  <div class="usa-accordion__content background-primary-lighter width-full" id="<%= rand %>">
+  <div class="usa-accordion__content bg-base-lighter width-full" id="<%= rand %>">
     <% if @submission.available_evaluators.any? %>
-      <% @submission.available_evaluators.each do |evaluator| %>
-              <div class="float-left">
+      <% @submission.available_evaluators.each_with_index do |evaluator, i| %>
+        <div class="display-flex flex-justify margin-y-1">
+              <div>
                   <%= "#{evaluator.first_name} #{evaluator.last_name}" %> <br/>
                   <%= evaluator.email %>
               </div> 
-              <div class="float-right">
+              <div>
                   <% assignment = evaluator.evaluator_submission_assignments.where(submission_id: @submission.id).first %>
                   <% if assignment %>
                     <%= form_with url: phase_evaluator_submission_assignment_path(@submission.phase, assignment.id), method: "PATCH" do |f| %>
                       <%= f.hidden_field :phase_id, value: @submission.phase.id %>
                       <%= f.hidden_field :status, value: "assigned" %>
-                      <%= f.submit "Reassign", class: "usa-button font-body-2xs" %>
+                      <%= f.submit "Reassign", class: "usa-button font-body-2xs margin-top-1" %>
                     <% end %>
                   <% else %>
                     <%= 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", class: "usa-button font-body-2xs" %>
+                      <%= f.submit "Assign", class: "usa-button font-body-2xs margin-top-1" %>
                     <% end %>
                   <% end %>  
               </div>
-
+          </div>
+          <% if i < @submission.available_evaluators.length - 1 %>
+            <hr/>
+          <% end %>  
       <% end %>
     <% else %>
       <div class="usa-alert usa-alert--warning">

From 45f92eac6215e35bb4112f7e335eecce73184553 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 8 Jan 2025 10:07:31 -0500
Subject: [PATCH 44/46] styling minutiae

---
 app/views/submissions/_available_evaluators.html.erb  | 2 +-
 app/views/submissions/_submission_evaluation.html.erb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/submissions/_available_evaluators.html.erb b/app/views/submissions/_available_evaluators.html.erb
index 355e08ba..44c18eb1 100644
--- a/app/views/submissions/_available_evaluators.html.erb
+++ b/app/views/submissions/_available_evaluators.html.erb
@@ -15,7 +15,7 @@
     <% if @submission.available_evaluators.any? %>
       <% @submission.available_evaluators.each_with_index do |evaluator, i| %>
         <div class="display-flex flex-justify margin-y-1">
-              <div>
+              <div style="word-break: break-all">
                   <%= "#{evaluator.first_name} #{evaluator.last_name}" %> <br/>
                   <%= evaluator.email %>
               </div> 
diff --git a/app/views/submissions/_submission_evaluation.html.erb b/app/views/submissions/_submission_evaluation.html.erb
index c107fa05..3331348d 100644
--- a/app/views/submissions/_submission_evaluation.html.erb
+++ b/app/views/submissions/_submission_evaluation.html.erb
@@ -4,5 +4,7 @@
 <% else %>
     <%= render partial: 'assigned_evaluators' %>
     <%= render partial: 'available_evaluators' %>
-    <%= link_to "Manage Evaluators", phase_evaluators_path(@submission.phase), class: "float-right margin-y-1"  %>
+    <div class="display-flex flex-justify-end">
+      <%= link_to "Manage Evaluators", phase_evaluators_path(@submission.phase), class: "margin-y-1"  %>
+    </div>  
 <% end %>
\ No newline at end of file

From 55b392522affde940ed6e33a56d15e240f95d36e Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 8 Jan 2025 10:26:07 -0500
Subject: [PATCH 45/46] make available evaluator name bold

---
 app/views/submissions/_available_evaluators.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/submissions/_available_evaluators.html.erb b/app/views/submissions/_available_evaluators.html.erb
index 44c18eb1..a2f46f56 100644
--- a/app/views/submissions/_available_evaluators.html.erb
+++ b/app/views/submissions/_available_evaluators.html.erb
@@ -16,7 +16,7 @@
       <% @submission.available_evaluators.each_with_index do |evaluator, i| %>
         <div class="display-flex flex-justify margin-y-1">
               <div style="word-break: break-all">
-                  <%= "#{evaluator.first_name} #{evaluator.last_name}" %> <br/>
+                  <span class="text-bold"><%= "#{evaluator.first_name} #{evaluator.last_name}" %></span><br/>
                   <%= evaluator.email %>
               </div> 
               <div>

From 3b2042eb48b80313365cf09ad6937d7caabdb899 Mon Sep 17 00:00:00 2001
From: Stephen Chudleigh <stephen@smartlogic.io>
Date: Wed, 8 Jan 2025 09:28:15 -0800
Subject: [PATCH 46/46] add margin

---
 app/views/submissions/_available_evaluators.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/submissions/_available_evaluators.html.erb b/app/views/submissions/_available_evaluators.html.erb
index a2f46f56..dd2d4fc6 100644
--- a/app/views/submissions/_available_evaluators.html.erb
+++ b/app/views/submissions/_available_evaluators.html.erb
@@ -19,7 +19,7 @@
                   <span class="text-bold"><%= "#{evaluator.first_name} #{evaluator.last_name}" %></span><br/>
                   <%= evaluator.email %>
               </div> 
-              <div>
+              <div class="margin-left-05">
                   <% assignment = evaluator.evaluator_submission_assignments.where(submission_id: @submission.id).first %>
                   <% if assignment %>
                     <%= form_with url: phase_evaluator_submission_assignment_path(@submission.phase, assignment.id), method: "PATCH" do |f| %>