From 38c4ae183dcae001cef46d06bf0524fa89ef1877 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 12 Feb 2025 11:52:38 -0500
Subject: [PATCH 01/31] remove create account and switch task buttons

---
 app/views/layouts/_header.html.erb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index b6db8a9f..b07bd318 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -135,7 +135,7 @@ aria-label="Official website of the United States government"
       <!-- Desktop search and login area --> 
       <section class="display-none desktop:display-flex">
         <section aria-label="Search component">
-          <form class="usa-search usa-search--small" role="search">
+          <form class="usa-search usa-search--small margin-top-2px" role="search">
             <label class="usa-sr-only" for="search-field-desktop">Search</label>
             <input
               class="usa-input"
@@ -154,11 +154,9 @@ aria-label="Official website of the United States government"
           </form>
         </section>
         <% if logged_in? %>
-          <%= button_to("Logout", session_path, method: :delete, class: "usa-button font-body-3xs usa-button--outline text-no-wrap desktop:margin-left-1", type: "button") %>
-          <button class="usa-button font-body-2xs text-no-wrap">Switch Task</button> 
+          <%= button_to("Logout", session_path, method: :delete, class: "usa-button font-body-3xs usa-button--outline text-no-wrap desktop:margin-left-1 desktop:margin-right-3", type: "button") %>
         <% else %>
-          <%= button_to("Login", new_session_path, method: :get, class: "usa-button font-body-3xs usa-button--outline text-no-wrap desktop:margin-left-1", type: "button") %>
-          <button class="usa-button font-body-2xs text-no-wrap">Create Account</button> 
+          <%= button_to("Login", new_session_path, method: :get, class: "usa-button font-body-3xs usa-button--outline text-no-wrap desktop:margin-left-1 desktop:margin-right-3", type: "button") %>
         <% end %>
       </section>
       <!-- mobile search and login area --> 
@@ -187,10 +185,8 @@ aria-label="Official website of the United States government"
             <%= current_user.email %>
           </div>  
           <%= button_to("Logout", session_path, method: :delete, class: "usa-button font-body-3xs usa-button--outline margin-y-1 text-no-wrap desktop:margin-left-1 width-full", type: "button") %>
-          <button class="usa-button font-body-2xs text-no-wrap width-full margin-y-1">Switch Task</button> 
         <% else %>
           <%= button_to("Login", new_session_path, method: :get, class: "usa-button font-body-3xs usa-button--outline margin-y-1 text-no-wrap desktop:margin-left-1 width-full", type: "button") %>
-          <button class="usa-button font-body-2xs text-no-wrap width-full margin-y-1">Create Account</button> 
         <% end %>
       </section>
     </nav>

From 66701ad073facfd685b90d239978ddcab7901456 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 12 Feb 2025 12:27:46 -0500
Subject: [PATCH 02/31] update utility menu links

---
 app/helpers/navigation_helper.rb             |  3 ++-
 app/views/layouts/_utility_menu.erb          |  9 +++------
 spec/requests/dashboard_request_spec.rb      |  1 +
 spec/support/shared_examples/utility_menu.rb | 13 ++++++++-----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/helpers/navigation_helper.rb b/app/helpers/navigation_helper.rb
index 25a93eb2..129144db 100644
--- a/app/helpers/navigation_helper.rb
+++ b/app/helpers/navigation_helper.rb
@@ -6,7 +6,8 @@ def utility_menu_link(image_path, href, _alt, button_label)
     link_to(href,
             class: "display-flex flex-align-center flex-column desktop:flex-row " \
                    "margin-x-1 desktop:margin-x-3 text-white
-                    width-9 tablet:width-auto tablet:text-no-wrap text-center") do
+                    width-9 tablet:width-auto tablet:text-no-wrap text-center",
+            id: "utility-menu-link-#{button_label}") do
       image_tag(
         "images/usa-icons/#{image_path}.svg",
         class: "usa-icon--size-4 desktop:usa-icon--size-3 icon-white desktop:margin-right-1",
diff --git a/app/views/layouts/_utility_menu.erb b/app/views/layouts/_utility_menu.erb
index 4b4d109a..55ac0f56 100644
--- a/app/views/layouts/_utility_menu.erb
+++ b/app/views/layouts/_utility_menu.erb
@@ -1,15 +1,12 @@
 <!-- Utility Menu -->
 <nav aria-label="Utility navigation" class="bg-primary-darker w-full display-flex flex-justify-center desktop:flex-justify-end padding-1 font-body-3xs desktop:font-body-2xs text-white">
-    <%= utility_menu_link('grid_view', dashboard_path, 'dashboard', 'Dashboard') %>
     <% if current_user.role == "challenge_manager" %>
-      <%= utility_menu_link('emoji_events', Rails.configuration.phx_interop[:phx_uri], 'challenges', 'Challenges') %>
-      <%= utility_menu_link('star_half', phases_path, 'Manage Submissions and Evaluations', 'Submissions & Evaluations') %>
-      <%= utility_menu_link('check_circle_outline', evaluation_forms_path, 'Evaluation Forms', 'Evaluation Forms') %>
+      <%= utility_menu_link('grid_view', phases_path, 'Manage Challenges', 'Challenges') %>
     <% end %>
     <% if current_user.role == "evaluator" %>
-      <%= utility_menu_link('star_half', evaluations_path, 'Evaluate Submissions', 'Submissions & Evaluations') %>
+      <%= utility_menu_link('star_half', evaluations_path, 'Evaluate Submissions', 'Evaluations') %>
     <% end %>  
-    <%= utility_menu_link('support', 'https://www.challenge.gov/cm-user-guide/', 'Resources', 'Resources') %>
+    <%= utility_menu_link('support', 'https://www.challenge.gov/cm-user-guide/', 'Support', 'Support') %>
     <div class="display-none desktop:display-flex flex-align-center margin-x-1 margin-top-1">
       |
       <%= image_tag('images/usa-icons/account_circle.svg', class: "usa-icon--size-3 icon-white margin-x-2", alt: "Help") %>
diff --git a/spec/requests/dashboard_request_spec.rb b/spec/requests/dashboard_request_spec.rb
index 0e954144..e76130f6 100644
--- a/spec/requests/dashboard_request_spec.rb
+++ b/spec/requests/dashboard_request_spec.rb
@@ -54,6 +54,7 @@
       end
 
       it_behaves_like "a page with utility menu links for all users"
+      it_behaves_like "a page with utility menu links for an evaluator"
       it_behaves_like "a page with dashboard content for an evaluator"
     end
   end
diff --git a/spec/support/shared_examples/utility_menu.rb b/spec/support/shared_examples/utility_menu.rb
index 9a80dcc3..891d853e 100644
--- a/spec/support/shared_examples/utility_menu.rb
+++ b/spec/support/shared_examples/utility_menu.rb
@@ -1,14 +1,17 @@
 RSpec.shared_examples "a page with utility menu links for all users" do
   it "has links shared across all user roles" do
-    expect(response.body).to include("Dashboard")
-    expect(response.body).to include("Submissions")
-    expect(response.body).to include("Resources")
+    expect(response.body).to have_css("#utility-menu-link-Support")
   end
 end
 
 RSpec.shared_examples "a page with utility menu links for a challenge manager" do
   it "has the right links for a challenge manager" do
-    expect(response.body).to include("Challenges")
-    expect(response.body).to include("Evaluation Forms")
+    expect(response.body).to have_css("#utility-menu-link-Challenges")
+  end
+end
+
+RSpec.shared_examples "a page with utility menu links for an evaluator" do
+  it "has the right links for an evaluator" do
+    expect(response.body).to have_css("#utility-menu-link-Evaluations")
   end
 end

From 7c3d657ded22a25c759186f1afd31b9353ab9439 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 12 Feb 2025 14:21:33 -0500
Subject: [PATCH 03/31] redirect logged in users

---
 app/controllers/dev/accounts_controller.rb | 7 ++++++-
 spec/spec_helper.rb                        | 8 ++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/controllers/dev/accounts_controller.rb b/app/controllers/dev/accounts_controller.rb
index 51098cca..c5173be6 100644
--- a/app/controllers/dev/accounts_controller.rb
+++ b/app/controllers/dev/accounts_controller.rb
@@ -14,7 +14,12 @@ def login
       @current_user = User.find_by(email:)
       renew_session
       session[:userinfo] = [{ "email" => email, "sub" => @current_user.token }]
-      redirect_to dashboard_path
+      case @current_user.role 
+      when "evaluator"  
+        redirect_to evaluations_path
+      else
+        redirect_to phases_path
+      end    
     end
   end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 661a8c8c..d834389d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -35,8 +35,12 @@ def system_login_user(user)
   visit "/dev/accounts"
   fill_in "Email", with: user.email
   click_on "Dev Login"
-  expect(page).to have_current_path(dashboard_path)
-  # expect(page).to have_button('Logout')
+  case user.role
+  when "evaluator"
+    expect(page).to have_current_path(evaluations_path)
+  else
+    expect(page).to have_current_path(phases_path)
+  end  
 end
 
 def system_logout

From 539da9764be942b0cdd34041ae5720152186e439 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 12 Feb 2025 14:52:43 -0500
Subject: [PATCH 04/31] remove dashboard stuff

---
 app/controllers/dashboard_controller.rb      |  6 --
 app/helpers/dashboard_helper.rb              | 39 -------------
 app/views/dashboard/_dashboard.html.erb      |  9 ---
 app/views/dashboard/_dashboard_card.html.erb | 15 -----
 app/views/dashboard/index.html.erb           |  7 ---
 spec/requests/dashboard_request_spec.rb      | 61 --------------------
 spec/requests/evaluations_spec.rb            |  6 ++
 spec/requests/phases_spec.rb                 | 10 ++--
 spec/requests/sessions_request_spec.rb       |  2 +-
 spec/system/logins_spec.rb                   | 13 ++---
 spec/system/skip_to_main_content_spec.rb     | 19 ------
 11 files changed, 17 insertions(+), 170 deletions(-)
 delete mode 100644 app/controllers/dashboard_controller.rb
 delete mode 100644 app/helpers/dashboard_helper.rb
 delete mode 100644 app/views/dashboard/_dashboard.html.erb
 delete mode 100644 app/views/dashboard/_dashboard_card.html.erb
 delete mode 100644 app/views/dashboard/index.html.erb
 delete mode 100644 spec/requests/dashboard_request_spec.rb

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
deleted file mode 100644
index da2ff379..00000000
--- a/app/controllers/dashboard_controller.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-# The dashboard controller serves the logged-in homepage of the app.
-class DashboardController < ApplicationController
-  def index; end
-end
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb
deleted file mode 100644
index f7d4e187..00000000
--- a/app/helpers/dashboard_helper.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-# View helpers for the main dashboard templates supporting various user roles.
-module DashboardHelper
-  def dashboard_cards_by_role
-    {
-      challenge_manager: [
-        { image_path: 'emoji_events', href: Rails.configuration.phx_interop[:phx_uri],
-          alt: 'challenges', title: 'Challenges', subtitle: 'Create and manage challenges.' },
-        { image_path: 'star_half', href: 'phases',
-          alt: 'submissions and evaluations', title: 'Submissions & Evaluations', subtitle:
-           'Manage submissions, evaluations, and evaluators.' },
-        { image_path: 'check_circle_outline', href: 'evaluation_forms',
-          alt: 'evaluation forms', title: 'Evaluation Forms', subtitle: 'Create and manage evaluation forms.' },
-        { image_path: 'mail', href: "#{Rails.configuration.phx_interop[:phx_uri]}/messages",
-          alt: 'help', title: 'Message Center', subtitle: 'View and send messages to Challenge.gov users.' },
-        { image_path: 'assessment', href: "#{Rails.configuration.phx_interop[:phx_uri]}/analytics",
-          alt: 'help', title: 'Analytics', subtitle: 'View web analytics data related to your challenges.' },
-        { image_path: 'support', href: 'https://www.challenge.gov/cm-user-guide/',
-          alt: 'resources', title: 'Resources', subtitle: 'Learn how to make the most of the platform.' }
-      ],
-      evaluator: [
-        { image_path: 'star_half', href: 'evaluations',
-          alt: 'submissions and evaluations', title: 'Evaluations',
-          subtitle: 'View and evaluate submissions assigned to me.' },
-        { image_path: 'support', href: 'https://www.challenge.gov/cm-user-guide/',
-          alt: 'resources', title: 'Resources', subtitle: 'Learn how to make the most of the platform.' }
-      ],
-      solver: []
-    }
-  end
-
-  def dashboard_title
-    {
-      challenge_manager: "Challenge Manager Evaluation Dashboard",
-      evaluator: "Evaluator Dashboard"
-    }
-  end
-end
diff --git a/app/views/dashboard/_dashboard.html.erb b/app/views/dashboard/_dashboard.html.erb
deleted file mode 100644
index 9badc997..00000000
--- a/app/views/dashboard/_dashboard.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="flex-justify-center width-full padding-bottom-4">
-    <h1><%= dashboard_title[role] %></h1>
-    <% dashboard_cards_by_role[role].each_slice(2) do |card1, card2| %>
-        <div class="grid-row grid-gap-2">
-            <%= render partial: "dashboard_card", locals: { card: card1 } %>
-            <%= render partial: "dashboard_card", locals: { card: card2 } if card2 %>
-        </div>
-    <% end %>    
-</div>
\ No newline at end of file
diff --git a/app/views/dashboard/_dashboard_card.html.erb b/app/views/dashboard/_dashboard_card.html.erb
deleted file mode 100644
index 1c53778f..00000000
--- a/app/views/dashboard/_dashboard_card.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="desktop:grid-col-6 margin-y-1">
-    <%= link_to(card[:href],
-        class: "display-flex bg-primary-darker text-white flex-align-center height-card text-no-underline"
-        ) do %>
-        <%= image_tag(
-            "images/usa-icons/#{card[:image_path]}.svg",
-            class: "usa-icon--size-7 icon-white margin-x-2",
-            alt: ""
-        )%>
-        <div class="margin-right-2" >
-            <h2><%= card[:title] %></h2>
-            <p style="max-width: 250px;"><%= card[:subtitle] %></p>
-        </div>    
-    <% end %>    
-</div>
\ No newline at end of file
diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb
deleted file mode 100644
index 36501331..00000000
--- a/app/views/dashboard/index.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="col-md-6">
-    <% if logged_in? %>
-      <%= render partial: "dashboard", locals: { role: current_user.role.to_sym } %>
-    <% else %>
-      <h1 class="usa-card__body">Logged Out Dashboard Index</h1>
-    <% end %>
-</div>
\ No newline at end of file
diff --git a/spec/requests/dashboard_request_spec.rb b/spec/requests/dashboard_request_spec.rb
deleted file mode 100644
index e76130f6..00000000
--- a/spec/requests/dashboard_request_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require "rails_helper"
-
-RSpec.describe "DashboardController" do
-  let(:user) { create_and_log_in_user }
-
-  describe "GET /dashboard" do
-    before { get "/dashboard" }
-
-    it_behaves_like "a page with footer content"
-    it_behaves_like "a page with header content"
-
-    context "when logged in as a super admin on the dashboard" do
-      before do
-        user.update(role: "super_admin")
-        get "/dashboard"
-      end
-
-      it_behaves_like "a page with dashboard content for a super admin"
-    end
-
-    context "when logged in as an admin on the dashboard" do
-      before do
-        user.update(role: "admin")
-        get "/dashboard"
-      end
-
-      it_behaves_like "a page with dashboard content for an admin"
-    end
-
-    context "when logged in as a public solver on the dashboard" do
-      before do
-        user.update(role: "solver")
-        get "/dashboard"
-      end
-
-      it_behaves_like "a page with dashboard content for a public solver"
-    end
-
-    context "when logged in as a challenge manager on the dashboard" do
-      before do
-        user.update(role: "challenge_manager")
-        get "/dashboard"
-      end
-
-      it_behaves_like "a page with utility menu links for all users"
-      it_behaves_like "a page with utility menu links for a challenge manager"
-      it_behaves_like "a page with dashboard content for a challenge manager"
-    end
-
-    context "when logged in as an evaluator on the dashboard" do
-      before do
-        user.update(role: "evaluator")
-        get "/dashboard"
-      end
-
-      it_behaves_like "a page with utility menu links for all users"
-      it_behaves_like "a page with utility menu links for an evaluator"
-      it_behaves_like "a page with dashboard content for an evaluator"
-    end
-  end
-end
diff --git a/spec/requests/evaluations_spec.rb b/spec/requests/evaluations_spec.rb
index 0283cbe4..8dda9148 100644
--- a/spec/requests/evaluations_spec.rb
+++ b/spec/requests/evaluations_spec.rb
@@ -41,8 +41,14 @@
     context "when logged in as an evaluator" do
       before do
         create_and_log_in_user(role: "evaluator")
+        get "/evaluations"
       end
 
+      it_behaves_like "a page with footer content"
+      it_behaves_like "a page with header content"
+      it_behaves_like "a page with utility menu links for all users"
+      it_behaves_like "a page with utility menu links for an evaluator"
+
       it "renders the index view with the correct header" do
         get evaluations_path
 
diff --git a/spec/requests/phases_spec.rb b/spec/requests/phases_spec.rb
index 0ad59618..3c751fd9 100644
--- a/spec/requests/phases_spec.rb
+++ b/spec/requests/phases_spec.rb
@@ -30,18 +30,20 @@
       let(:challenge_user) { create_user(role: "challenge_manager") }
 
       before { log_in_user(challenge_user) }
+      before { get "/phases" }
 
-      it "renders the index view with the correct header" do
-        get phases_path
+      it_behaves_like "a page with footer content"
+      it_behaves_like "a page with header content"
+      it_behaves_like "a page with utility menu links for all users"
+      it_behaves_like "a page with utility menu links for a challenge manager"
 
+      it "renders the index view with the correct header" do
         expect(response).to have_http_status(:success)
         expect(response.body).to include("Submissions & Evaluations")
         expect(response.body).to include("View challenge submissions")
       end
 
       it "renders an empty list" do
-        get phases_path
-
         expect(response.body).to include("You currently do not have any challenges.")
       end
 
diff --git a/spec/requests/sessions_request_spec.rb b/spec/requests/sessions_request_spec.rb
index c83454b9..cce5ace2 100644
--- a/spec/requests/sessions_request_spec.rb
+++ b/spec/requests/sessions_request_spec.rb
@@ -56,7 +56,7 @@
     expect(session[:session_timeout_at]).not_to be_nil
 
     travel_to (session_timeout_in_minutes.to_i + 1).minutes.from_now do
-      get dashboard_path
+      get phases_path
 
       expect(session[:userinfo]).to be_nil
       expect(session[:session_timeout_at]).to be_nil
diff --git a/spec/system/logins_spec.rb b/spec/system/logins_spec.rb
index 54655141..db09bd75 100644
--- a/spec/system/logins_spec.rb
+++ b/spec/system/logins_spec.rb
@@ -15,18 +15,13 @@
       visit "/"
       expect(page).to(be_axe_clean)
     end
-
-    it "dashboard index page is accessible" do
-      visit dashboard_path
-      expect(page).to(be_axe_clean)
-    end
   end
 
   describe "Logged-in as a Challenge Manager" do
     let(:user) { create_user(role: "challenge_manager") }
 
-    it "dashboard index page is accessible" do
-      visit dashboard_path
+    it "challenge phase index page is accessible" do
+      visit phases_path
       expect(user.role).to eq("challenge_manager")
       expect(page).to(be_axe_clean)
     end
@@ -35,8 +30,8 @@
   describe "Logged-in as an Evaluator" do
     let(:user) { create_user(role: "evaluator") }
 
-    it "dashboard index page is accessible" do
-      visit dashboard_path
+    it "evaluations index page is accessible" do
+      visit evaluations_path
       expect(user.role).to eq("evaluator")
       expect(page).to(be_axe_clean)
     end
diff --git a/spec/system/skip_to_main_content_spec.rb b/spec/system/skip_to_main_content_spec.rb
index d96ac152..b11ff730 100644
--- a/spec/system/skip_to_main_content_spec.rb
+++ b/spec/system/skip_to_main_content_spec.rb
@@ -9,25 +9,6 @@
     system_login_user(user)
   end
 
-  context "when on dashboard index page" do
-    before { visit dashboard_path }
-
-    it 'is hidden by default but present in the DOM' do
-      expect(page).to have_css('.usa-skipnav', visible: false)
-    end
-
-    it 'becomes visible when focused via keyboard tab' do
-      find('body').send_keys(:tab)
-      expect(page).to have_css('.usa-skipnav', visible: true)
-    end
-
-    it 'moves focus to main content when using keyboard' do
-      find('body').send_keys(:tab)
-      find('.usa-skipnav', visible: true).send_keys(:return)
-      expect(page.evaluate_script('document.activeElement.id')).to eq('main-content')
-    end
-  end
-
   context "when on phases index page" do
     before { visit phases_path }
 

From f67ec9c409ffee2baffd633600afabbb0d17555a Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Thu, 13 Feb 2025 17:02:17 -0500
Subject: [PATCH 05/31] rename page

---
 app/views/phases/index.html.erb | 2 +-
 spec/requests/phases_spec.rb    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/phases/index.html.erb b/app/views/phases/index.html.erb
index 69a7da4a..ee0cf2e0 100644
--- a/app/views/phases/index.html.erb
+++ b/app/views/phases/index.html.erb
@@ -1,4 +1,4 @@
-<h1>Submissions & Evaluations</h1>
+<h1>My Challenges</h1>
 <p class="text-normal">View challenge submissions and manage your list of evaluators for each challenge.</p>
 
 <% if @challenges.empty? %>
diff --git a/spec/requests/phases_spec.rb b/spec/requests/phases_spec.rb
index 3c751fd9..67acd122 100644
--- a/spec/requests/phases_spec.rb
+++ b/spec/requests/phases_spec.rb
@@ -39,8 +39,7 @@
 
       it "renders the index view with the correct header" do
         expect(response).to have_http_status(:success)
-        expect(response.body).to include("Submissions & Evaluations")
-        expect(response.body).to include("View challenge submissions")
+        expect(response.body).to include("My Challenges")
       end
 
       it "renders an empty list" do

From 3f7c45c328d982d4306e742be0a067ee9a3d6236 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Thu, 13 Feb 2025 17:23:20 -0500
Subject: [PATCH 06/31] rename columns

---
 app/views/phases/_phases_table.html.erb | 9 ++++++---
 app/views/phases/index.html.erb         | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/phases/_phases_table.html.erb b/app/views/phases/_phases_table.html.erb
index e303e62d..143d3a0d 100644
--- a/app/views/phases/_phases_table.html.erb
+++ b/app/views/phases/_phases_table.html.erb
@@ -2,10 +2,13 @@
     <thead>
       <tr>
         <th scope="col">Challenge</th>
-        <th scope="col">Number of Submissions</th>
+        <th scope="col">Challenge Status</th>
+        <th scope="col">Challenge Start and End Dates</th>
+        <th scope="col"># of Submissions</th>
         <th scope="col">Evaluation Form</th>
-        <th scope="col">Evaluations are due by</th>
-        <th scope="col"><span class="usa-sr-only">Actions</span></th>
+        <th scope="col"># of Evaluators</th>
+        <th scope="col">Evaluation Due Date</th>
+        <th scope="col">Evaluation Status</th>
       </tr>
     </thead>
     <tbody>
diff --git a/app/views/phases/index.html.erb b/app/views/phases/index.html.erb
index ee0cf2e0..898617d6 100644
--- a/app/views/phases/index.html.erb
+++ b/app/views/phases/index.html.erb
@@ -1,5 +1,4 @@
 <h1>My Challenges</h1>
-<p class="text-normal">View challenge submissions and manage your list of evaluators for each challenge.</p>
 
 <% if @challenges.empty? %>
   <div class="text-normal">

From a406cc1bea78fb4b612d4c0e6ec31368afa9b54a Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 17 Feb 2025 14:14:55 -0500
Subject: [PATCH 07/31] create new challenge button

---
 app/views/phases/index.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/phases/index.html.erb b/app/views/phases/index.html.erb
index 898617d6..e9dfe98e 100644
--- a/app/views/phases/index.html.erb
+++ b/app/views/phases/index.html.erb
@@ -1,5 +1,7 @@
 <h1>My Challenges</h1>
-
+<%= link_to "#{Rails.configuration.phx_interop[:phx_uri]}/challenges/new" do %>
+  <button class="usa-button padding-2">Create New Challenge</button>
+<% end %>
 <% if @challenges.empty? %>
   <div class="text-normal">
     <p>You currently do not have any challenges.</p>

From 6c3068cd775a13cea00668b5e7e748b33fc6814d Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 17 Feb 2025 14:22:01 -0500
Subject: [PATCH 08/31] challenge title link

---
 app/views/phases/_phases_table.html.erb | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/views/phases/_phases_table.html.erb b/app/views/phases/_phases_table.html.erb
index 143d3a0d..f040d64f 100644
--- a/app/views/phases/_phases_table.html.erb
+++ b/app/views/phases/_phases_table.html.erb
@@ -15,11 +15,13 @@
       <% @challenges.each do |challenge| %>
         <% challenge.phases.each do |phase| %>
           <tr>
-            <th data-label="Form Title" scope="row" class="text-top">
-              <strong><%= challenge_phase_title(challenge, phase) %></strong>
-              <span class="<%= challenge.status == 'published' ? 'text-green' : 'text-accent-warm-dark' %> padding-top-05 display-block text-bold padding-bottom-2"><%= challenge.status.capitalize %></span>
+            <th data-label="Challenge" scope="row" class="text-top">
+              <%= link_to "#{Rails.configuration.phx_interop[:phx_uri]}/challenges/#{challenge.id}" do %>
+                <strong><%= challenge_phase_title(challenge, phase) %></strong>
+              <% end %>  
             </th>
-            <td data-label="Number of Submissions" class="text-top">
+            <td data-label="Challenge Status" class="text-top">
+              <span class="<%= challenge.status == 'published' ? 'text-green' : 'text-accent-warm-dark' %> padding-top-05 display-block text-bold padding-bottom-2"><%= challenge.status.capitalize %></span>
               <%= phase.submissions_count %>
             </td>
             <td data-label="Evaluation Form" class="text-top">
@@ -38,6 +40,15 @@
                 N/A  
               <% end %>
             </td>
+            <td data-label="Evaluation Form" class="text-top">
+              <% if phase.evaluation_form %>
+                <%= link_to edit_evaluation_form_path(phase.evaluation_form) do %>
+                  <%= phase.evaluation_form.title %>
+                <% end %>    
+              <% else %>
+                N/A  
+              <% end %>  
+            </td>
             <td>
               <div class="display-flex flex-column grid-row grid-gap-1">
                 <%= link_to phase_evaluators_path(phase), class: "usa-button font-body-2xs text-no-wrap width-full margin-bottom-105" do %>

From 35f7a5f375bdc2b96fb269f66c2429ad04191317 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 17 Feb 2025 14:28:07 -0500
Subject: [PATCH 09/31] challenge status

---
 app/helpers/phases_helper.rb            | 12 ++++++++++++
 app/views/phases/_phases_table.html.erb |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/app/helpers/phases_helper.rb b/app/helpers/phases_helper.rb
index 20ab10a4..a54a4d43 100644
--- a/app/helpers/phases_helper.rb
+++ b/app/helpers/phases_helper.rb
@@ -9,4 +9,16 @@ def phase_number(challenge, phase)
   def phase_has_recused_evaluator?(phase)
     phase.evaluator_submission_assignments.recused.exists?
   end
+
+  def statuses
+    {
+      draft: "Draft",
+      gsa_review: "GSA review",
+      approved: "Approved",
+      edits_requested: "Edits requested",
+      unpublished: "Unpublished",
+      published: "Published",
+      archived: "Archived"
+    }
+  end  
 end
diff --git a/app/views/phases/_phases_table.html.erb b/app/views/phases/_phases_table.html.erb
index f040d64f..a65b8c70 100644
--- a/app/views/phases/_phases_table.html.erb
+++ b/app/views/phases/_phases_table.html.erb
@@ -21,9 +21,15 @@
               <% end %>  
             </th>
             <td data-label="Challenge Status" class="text-top">
+              <%= statuses[challenge.status.to_sym] %>
+            </td>
+            <td data-label="Challenge Start and End Dates" class="text-top">
               <span class="<%= challenge.status == 'published' ? 'text-green' : 'text-accent-warm-dark' %> padding-top-05 display-block text-bold padding-bottom-2"><%= challenge.status.capitalize %></span>
               <%= phase.submissions_count %>
             </td>
+            <td data-label="# of Submissions" class="text-top">
+              <%= phase.submissions_count %>
+            </td>
             <td data-label="Evaluation Form" class="text-top">
               <% if phase.evaluation_form %>
                 <%= link_to edit_evaluation_form_path(phase.evaluation_form) do %>

From bc25df8a96d4e06badfd51c603c05a6214e065da Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 17 Feb 2025 14:36:51 -0500
Subject: [PATCH 10/31] start and end dates

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

diff --git a/app/views/phases/_phases_table.html.erb b/app/views/phases/_phases_table.html.erb
index a65b8c70..a18879a3 100644
--- a/app/views/phases/_phases_table.html.erb
+++ b/app/views/phases/_phases_table.html.erb
@@ -24,8 +24,8 @@
               <%= statuses[challenge.status.to_sym] %>
             </td>
             <td data-label="Challenge Start and End Dates" class="text-top">
-              <span class="<%= challenge.status == 'published' ? 'text-green' : 'text-accent-warm-dark' %> padding-top-05 display-block text-bold padding-bottom-2"><%= challenge.status.capitalize %></span>
-              <%= phase.submissions_count %>
+              <%= phase.start_date.strftime("%m/%d/%Y") %> <br/>
+              <%= phase.end_date.strftime("%m/%d/%Y") %>
             </td>
             <td data-label="# of Submissions" class="text-top">
               <%= phase.submissions_count %>

From f5156772c8addece6691563ae0023fe67d5db7a6 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 17 Feb 2025 14:40:22 -0500
Subject: [PATCH 11/31] number of submissions

---
 app/views/phases/_phases_table.html.erb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/phases/_phases_table.html.erb b/app/views/phases/_phases_table.html.erb
index a18879a3..01fe45a0 100644
--- a/app/views/phases/_phases_table.html.erb
+++ b/app/views/phases/_phases_table.html.erb
@@ -28,7 +28,12 @@
               <%= phase.end_date.strftime("%m/%d/%Y") %>
             </td>
             <td data-label="# of Submissions" class="text-top">
-              <%= phase.submissions_count %>
+              <% count = phase.submissions_count %>
+              <% if count > 0 %>
+                <%= link_to count, submissions_phase_path(phase) %>
+              <% else %>
+                None Yet
+              <% end %>    
             </td>
             <td data-label="Evaluation Form" class="text-top">
               <% if phase.evaluation_form %>

From a8cf3ff43f0e369020c4f36a2bac21ca394e625f Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 17 Feb 2025 16:58:31 -0500
Subject: [PATCH 12/31] eval form new scope

---
 .../evaluation_forms_controller.rb            |  11 +-
 app/views/evaluation_forms/_form.html.erb     |   4 +-
 app/views/evaluation_forms/_table.html.erb    |   4 +-
 .../evaluation_forms/confirmation.html.erb    |   2 +-
 app/views/evaluation_forms/edit.html.erb      |   2 +-
 app/views/evaluation_forms/index.html.erb     |   2 +-
 app/views/evaluation_forms/new.html.erb       |   2 +-
 app/views/evaluation_forms/show.html.erb      |   4 +-
 app/views/phases/_phases_table.html.erb       |  14 +--
 config/routes.rb                              |  12 +-
 spec/requests/evaluation_forms_spec.rb        | 109 +++++++++---------
 spec/requests/phases_spec.rb                  |   4 +-
 spec/system/evaluation_form_spec.rb           |  75 ++++++------
 13 files changed, 122 insertions(+), 123 deletions(-)

diff --git a/app/controllers/evaluation_forms_controller.rb b/app/controllers/evaluation_forms_controller.rb
index 53b684bf..864dc482 100644
--- a/app/controllers/evaluation_forms_controller.rb
+++ b/app/controllers/evaluation_forms_controller.rb
@@ -5,6 +5,7 @@ class EvaluationFormsController < ApplicationController
   helper FormHelper
 
   before_action -> { authorize_user('challenge_manager') }
+  before_action :set_phase, only: %i[show edit update destroy index new create]
   before_action :set_evaluation_form, only: %i[show edit update destroy]
   before_action :set_evaluation_forms, only: %i[index]
   before_action :set_available_phases, only: %i[new create edit update]
@@ -30,11 +31,11 @@ def create
     respond_to do |format|
       if @evaluation_form.save
         format.html do
-          redirect_to confirmation_evaluation_form_path(@evaluation_form), notice: I18n.t("evaluation_form_saved")
+          redirect_to confirmation_phase_evaluation_form_path(@evaluation_form.phase, @evaluation_form), notice: I18n.t("evaluation_form_saved")
         end
         format.json { render :show, status: :created, location: @evaluation_form }
       else
-        format.html { render :new, status: :unprocessable_entity }
+        format.html { render :new, status: :unprocessable_entity, phase: @evaluation_form.phase }
         format.json { render json: @evaluation_form.errors, status: :unprocessable_entity }
       end
     end
@@ -45,7 +46,7 @@ def update
     respond_to do |format|
       if @evaluation_form.update(evaluation_form_params)
         format.html do
-          redirect_to confirmation_evaluation_form_path(@evaluation_form), notice: I18n.t("evaluation_form_saved")
+          redirect_to confirmation_phase_evaluation_form_path(@evaluation_form.phase, @evaluation_form), notice: I18n.t("evaluation_form_saved")
         end
         format.json { render :show, status: :ok, location: @evaluation_form }
       else
@@ -97,6 +98,10 @@ def set_available_phases
       end
   end
 
+  def set_phase
+    @phase = Phase.find(params[:phase_id])
+  end  
+
   # Only allow a list of trusted parameters through.
   def evaluation_form_params
     permitted = params.require(:evaluation_form).
diff --git a/app/views/evaluation_forms/_form.html.erb b/app/views/evaluation_forms/_form.html.erb
index 79a5b695..7b9628d5 100644
--- a/app/views/evaluation_forms/_form.html.erb
+++ b/app/views/evaluation_forms/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_with(model: evaluation_form, data: { controller: "evaluation-form modal form-validation" }) do |form| %>
+<%= form_with(url: url, model: evaluation_form, data: { controller: "evaluation-form modal form-validation" }) do |form| %>
   <% if evaluation_form.errors.any? %>
     <div style="color: darkred">
       <div class="usa-alert usa-alert--error" role="alert">
@@ -237,7 +237,7 @@
     description: "Your evaluation form will not be saved and any entered information will be lost.",
     confirm_text: "Yes",
     cancel_text: "Close",
-    confirm_redirect: evaluation_forms_path
+    confirm_redirect: phases_path
   %>
 
   <%= render "modals/confirmation", 
diff --git a/app/views/evaluation_forms/_table.html.erb b/app/views/evaluation_forms/_table.html.erb
index b5d5c081..544ba601 100644
--- a/app/views/evaluation_forms/_table.html.erb
+++ b/app/views/evaluation_forms/_table.html.erb
@@ -11,7 +11,7 @@
     <% @evaluation_forms.each do |evaluation_form| %>
       <tr>
         <th data-label="Form Title" scope="row">
-          <%= link_to edit_evaluation_form_path(evaluation_form) do %>
+          <%= link_to edit_phase_evaluation_form_path(evaluation_form.phase, evaluation_form) do %>
               <%= evaluation_form.title %>
           <% end %>
         </th>
@@ -28,7 +28,7 @@
 
         <td>
           <div class="display-flex flex-wrap grid-row grid-gap-1">
-            <%= button_to edit_evaluation_form_path(evaluation_form), method: :get, class: "usa-button width-full", form: {class: "grid-col-12"} do %>
+            <%= button_to edit_phase_evaluation_form_path(evaluation_form.phase, evaluation_form), method: :get, class: "usa-button width-full", form: {class: "grid-col-12"} do %>
               <%= image_tag(
                 "images/usa-icons/edit.svg",
                 class: "usa-icon icon-white",
diff --git a/app/views/evaluation_forms/confirmation.html.erb b/app/views/evaluation_forms/confirmation.html.erb
index 659521b2..6caa32fa 100644
--- a/app/views/evaluation_forms/confirmation.html.erb
+++ b/app/views/evaluation_forms/confirmation.html.erb
@@ -9,7 +9,7 @@
       During the evaluation period, the form will be available to your evaluators, 
       and you will only be able to edit evaluation period end date if needed.
     </p>
-    <%= link_to "Manage Evaluation Forms", evaluation_forms_path, class: "usa-button" %>
+    <%= link_to "Back to Challenge Phases", phases_path, class: "usa-button" %>
     <div></div>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/views/evaluation_forms/edit.html.erb b/app/views/evaluation_forms/edit.html.erb
index 27efdc86..7e101479 100644
--- a/app/views/evaluation_forms/edit.html.erb
+++ b/app/views/evaluation_forms/edit.html.erb
@@ -2,4 +2,4 @@
 
 <h1><%= if eval_form_disabled?(@evaluation_form) then "View" else "Editing" end %> evaluation form</h1>
 
-<%= render "form", evaluation_form: @evaluation_form %>
+<%= render "form", evaluation_form: @evaluation_form, url: phase_evaluation_form_path(phase_id: @phase.id) %>
diff --git a/app/views/evaluation_forms/index.html.erb b/app/views/evaluation_forms/index.html.erb
index 174cf43a..f29d09b7 100644
--- a/app/views/evaluation_forms/index.html.erb
+++ b/app/views/evaluation_forms/index.html.erb
@@ -2,7 +2,7 @@
 <p class="text-normal">Manage existing evaluation forms and create new evaluation forms.</p>
 
 <p>
-  <%= link_to new_evaluation_form_path, class: "usa-button button-green font-body-2xs text-no-wrap width-full tablet:width-auto" do %>
+  <%= link_to new_phase_evaluation_form_path(@phase), class: "usa-button button-green font-body-2xs text-no-wrap width-full tablet:width-auto" do %>
     <%= image_tag(
       "images/usa-icons/content_copy.svg",
       class: "usa-icon icon-white",
diff --git a/app/views/evaluation_forms/new.html.erb b/app/views/evaluation_forms/new.html.erb
index a5702c5a..c58d9229 100644
--- a/app/views/evaluation_forms/new.html.erb
+++ b/app/views/evaluation_forms/new.html.erb
@@ -2,4 +2,4 @@
 
 <h1>Create Evaluation Form</h1>
 
-<%= render "form", evaluation_form: @evaluation_form %>
+<%= render "form", evaluation_form: @evaluation_form, url: phase_evaluation_forms_path(phase_id: @phase.id) %>
diff --git a/app/views/evaluation_forms/show.html.erb b/app/views/evaluation_forms/show.html.erb
index 9f14eaa5..a0cfc1fa 100644
--- a/app/views/evaluation_forms/show.html.erb
+++ b/app/views/evaluation_forms/show.html.erb
@@ -3,8 +3,8 @@
 <%= render @evaluation_form %>
 
 <div>
-  <%= link_to "Edit this evaluation form", edit_evaluation_form_path(@evaluation_form) %> |
-  <%= link_to "Back to evaluation forms", evaluation_forms_path %>
+  <%= link_to "Edit this evaluation form", edit_phase_evaluation_form_path(@evaluation_form.phase, @evaluation_form) %> |
+  <%= link_to "Back to evaluation forms", phase_evaluation_forms_path(@evaluation_form.phase) %>
 
   <%= button_to "Destroy this evaluation form", @evaluation_form, method: :delete %>
 </div>
diff --git a/app/views/phases/_phases_table.html.erb b/app/views/phases/_phases_table.html.erb
index 01fe45a0..83f400c5 100644
--- a/app/views/phases/_phases_table.html.erb
+++ b/app/views/phases/_phases_table.html.erb
@@ -37,11 +37,9 @@
             </td>
             <td data-label="Evaluation Form" class="text-top">
               <% if phase.evaluation_form %>
-                <%= link_to edit_evaluation_form_path(phase.evaluation_form) do %>
-                  <%= phase.evaluation_form.title %>
-                <% end %>    
+                <%= link_to "Edit form", edit_phase_evaluation_form_path(phase, phase.evaluation_form) %>  
               <% else %>
-                N/A  
+                <%= link_to "Create form", new_phase_evaluation_form_path(phase) %>
               <% end %>  
             </td>
             <td data-label="Evaluations are due by" class="text-top">
@@ -52,13 +50,7 @@
               <% end %>
             </td>
             <td data-label="Evaluation Form" class="text-top">
-              <% if phase.evaluation_form %>
-                <%= link_to edit_evaluation_form_path(phase.evaluation_form) do %>
-                  <%= phase.evaluation_form.title %>
-                <% end %>    
-              <% else %>
-                N/A  
-              <% end %>  
+
             </td>
             <td>
               <div class="display-flex flex-column grid-row grid-gap-1">
diff --git a/config/routes.rb b/config/routes.rb
index ba9cc40f..b0c53b66 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,12 +17,6 @@
     end
   end
 
-  resources :evaluation_forms do
-    member do
-      get 'confirmation'
-      post 'clone'
-    end
-  end
   resources :phases, only: [:index] do
     member do
       get :submissions
@@ -33,6 +27,12 @@
       end
     end
     resources :evaluator_submission_assignments, only: [:index, :update, :create]
+    resources :evaluation_forms do
+      member do
+        get 'confirmation'
+        post 'clone'
+      end
+    end
   end
 
   resources :submissions, only: [:show, :update] do
diff --git a/spec/requests/evaluation_forms_spec.rb b/spec/requests/evaluation_forms_spec.rb
index 0597de66..77f8d314 100644
--- a/spec/requests/evaluation_forms_spec.rb
+++ b/spec/requests/evaluation_forms_spec.rb
@@ -2,13 +2,16 @@
 
 RSpec.describe "EvaluationForms" do
   describe "GET /evaluation_forms" do
+    let(:user) { create_user(role: "challenge_manager") }
+    let!(:challenge) { create(:challenge, user:, is_multi_phase: true) }
+    let!(:phase) { create(:phase, challenge: challenge) }
     context "when logged in as a super admin" do
       before do
         create_and_log_in_user(role: "super_admin")
       end
 
       it "redirects to the phoenix app" do
-        get evaluation_forms_path
+        get phase_evaluation_forms_path(phase)
 
         expect(response).to redirect_to(ENV.fetch("PHOENIX_URI", nil))
       end
@@ -20,67 +23,69 @@
       end
 
       it "redirects to the phoenix app" do
-        get evaluation_forms_path
+        get phase_evaluation_forms_path(phase)
 
         expect(response).to redirect_to(ENV.fetch("PHOENIX_URI", nil))
       end
     end
 
     context "when logged in as a challenge manager" do
-      let(:user) { create_user(role: "challenge_manager") }
-
       before { log_in_user(user) }
 
       it "renders the index view with the correct header" do
-        get evaluation_forms_path
+        get phase_evaluation_forms_path(phase)
 
         expect(response).to have_http_status(:success)
         expect(response.body).to include("Evaluation Forms")
       end
 
       it "renders an empty list" do
-        get evaluation_forms_path
+        get phase_evaluation_forms_path(phase)
         expect(response.body).to include("You currently do not have any evaluation forms.")
       end
 
-      it "renders a list of evaluation forms for the current user's challenges" do
-        agency = Agency.create!(name: "Gandalf and Sons", acronym: "GAD")
-        challenge = Challenge.create!(user:, agency:, title: "Turning red bull into water")
-        ChallengeManager.create(user:, challenge:)
-        ph1 = create_phase(challenge_id: challenge.id)
-        ph2 = create_phase(challenge_id: challenge.id)
-
-        create_evaluation_form(title: "Frodo", challenge_id: challenge.id, phase_id: ph1.id)
-        create_evaluation_form(title: "Sam", challenge_id: challenge.id, phase_id: ph2.id)
-        get evaluation_forms_path
-        expect(response.body).to include("Sam")
-        expect(response.body).to include("Frodo")
-      end
-
-      it "does not include evaluation forms for challenges not assigned to the current user" do
-        agency = Agency.create!(name: "Gandalf and Sons", acronym: "GAD")
-        challenge = Challenge.create!(user:, agency:, title: "Turning monster energy into chamomile")
-        ChallengeManager.create(user:, challenge:)
-
-        user2 = create_user(role: "challenge_manager", email: "testwizard@example.gov")
-        challenge2 = Challenge.create!(user: user2, agency:, title: "Turning frogs into princes")
-        ChallengeManager.create(user: user2, challenge:)
-        ph1 = create_phase(challenge_id: challenge.id)
-        ph2 = create_phase(challenge_id: challenge.id)
-        ph3 = create_phase(challenge_id: challenge2.id)
-        ph4 = create_phase(challenge_id: challenge2.id)
-
-        create_evaluation_form(title: "Shrek", challenge_id: challenge.id, phase_id: ph1.id)
-        create_evaluation_form(title: "Fiona", challenge_id: challenge.id, phase_id: ph2.id)
-        create_evaluation_form(title: "Donkey", challenge_id: challenge2.id, phase_id: ph3.id)
-        create_evaluation_form(title: "Farquad", challenge_id: challenge2.id, phase_id: ph4.id)
-
-        get evaluation_forms_path
-        expect(response.body).to include("Shrek")
-        expect(response.body).to include("Fiona")
-        expect(response.body).not_to include("Donkey")
-        expect(response.body).not_to include("Farquad")
-      end
+      # The following specs don't make sense now that we're scoping eval forms by phase. 
+      # Maybe delete if we end up removing the eval form list page
+      # Or update to reflect new requirements 
+
+      # it "renders a list of evaluation forms for the current user's challenges" do
+      #   agency = Agency.create!(name: "Gandalf and Sons", acronym: "GAD")
+      #   challenge = Challenge.create!(user:, agency:, title: "Turning red bull into water")
+      #   ChallengeManager.create(user:, challenge:)
+      #   ph1 = create_phase(challenge_id: challenge.id)
+      #   ph2 = create_phase(challenge_id: challenge.id)
+
+      #   create_evaluation_form(title: "Frodo", challenge_id: challenge.id, phase_id: ph1.id)
+      #   create_evaluation_form(title: "Sam", challenge_id: challenge.id, phase_id: ph2.id)
+      #   get evaluation_forms_path
+      #   expect(response.body).to include("Sam")
+      #   expect(response.body).to include("Frodo")
+      # end
+
+      # it "does not include evaluation forms for challenges not assigned to the current user" do
+      #   agency = Agency.create!(name: "Gandalf and Sons", acronym: "GAD")
+      #   challenge = Challenge.create!(user:, agency:, title: "Turning monster energy into chamomile")
+      #   ChallengeManager.create(user:, challenge:)
+
+      #   user2 = create_user(role: "challenge_manager", email: "testwizard@example.gov")
+      #   challenge2 = Challenge.create!(user: user2, agency:, title: "Turning frogs into princes")
+      #   ChallengeManager.create(user: user2, challenge:)
+      #   ph1 = create_phase(challenge_id: challenge.id)
+      #   ph2 = create_phase(challenge_id: challenge.id)
+      #   ph3 = create_phase(challenge_id: challenge2.id)
+      #   ph4 = create_phase(challenge_id: challenge2.id)
+
+      #   create_evaluation_form(title: "Shrek", challenge_id: challenge.id, phase_id: ph1.id)
+      #   create_evaluation_form(title: "Fiona", challenge_id: challenge.id, phase_id: ph2.id)
+      #   create_evaluation_form(title: "Donkey", challenge_id: challenge2.id, phase_id: ph3.id)
+      #   create_evaluation_form(title: "Farquad", challenge_id: challenge2.id, phase_id: ph4.id)
+
+      #   get evaluation_forms_path
+      #   expect(response.body).to include("Shrek")
+      #   expect(response.body).to include("Fiona")
+      #   expect(response.body).not_to include("Donkey")
+      #   expect(response.body).not_to include("Farquad")
+      # end
     end
 
     context "when logged in as an evaluator" do
@@ -89,7 +94,7 @@
       end
 
       it "redirects to the dashboard" do
-        get evaluation_forms_path
+        get phase_evaluation_forms_path(phase)
 
         expect(response).to redirect_to(dashboard_path)
       end
@@ -101,7 +106,7 @@
       end
 
       it "redirects to the phoenix app" do
-        get evaluation_forms_path
+        get phase_evaluation_forms_path(phase)
 
         expect(response).to redirect_to(ENV.fetch("PHOENIX_URI", nil))
       end
@@ -124,7 +129,7 @@
         expect(EvaluationForm.count).to eq(0)
 
         expect do
-          post evaluation_forms_path, params: {
+          post phase_evaluation_forms_path(challenge.phases[0]), params: {
             evaluation_form: {
               phase_id: challenge.phases[0].id,
               challenge_id: challenge.id,
@@ -153,7 +158,7 @@
 
     context "when requiring evaluator comments on scores" do
       it "updates the comments_required attribute" do
-        patch evaluation_form_path(evaluation_form), params: { evaluation_form: { comments_required: true } }
+        patch phase_evaluation_form_path(evaluation_form.phase, evaluation_form), params: { evaluation_form: { comments_required: true } }
         evaluation_form.reload
         expect(evaluation_form.comments_required).to be_truthy
       end
@@ -163,7 +168,7 @@
       it "updates the scale_type attribute" do
         create(:evaluation_criterion, evaluation_form: evaluation_form, points_or_weight: 100)
 
-        patch evaluation_form_path(evaluation_form), params: { evaluation_form: { scale_type: "weight" } }
+        patch phase_evaluation_form_path(evaluation_form.phase, evaluation_form), params: { evaluation_form: { scale_type: "weight" } }
         evaluation_form.reload
         expect(evaluation_form.scale_type).to eq("weight")
       end
@@ -172,7 +177,7 @@
         evaluation_form = create(:evaluation_form, scale_type: "point")
         evaluation_criterion = create(:evaluation_criterion, evaluation_form:, points_or_weight: 100)
 
-        patch evaluation_form_path(evaluation_form), params: {
+        patch phase_evaluation_form_path(evaluation_form.phase, evaluation_form), params: {
           evaluation_form: {
             scale_type: "weight",
             evaluation_criteria_attributes: {
@@ -203,7 +208,7 @@
         old_attributes = evaluation_form.attributes.symbolize_keys
         new_attributes = FactoryBot.attributes_for(:evaluation_form)
 
-        patch evaluation_form_path(evaluation_form), params: {
+        patch phase_evaluation_form_path(evaluation_form.phase, evaluation_form), params: {
           evaluation_form: new_attributes
         }
 
@@ -232,7 +237,7 @@
 
         new_closing_date = 2.days.from_now.to_date
 
-        patch evaluation_form_path(evaluation_form), params: {
+        patch phase_evaluation_form_path(evaluation_form.phase, evaluation_form), params: {
           evaluation_form: {
             title: "New title attempt",
             closing_date: new_closing_date
diff --git a/spec/requests/phases_spec.rb b/spec/requests/phases_spec.rb
index 67acd122..43a30397 100644
--- a/spec/requests/phases_spec.rb
+++ b/spec/requests/phases_spec.rb
@@ -50,11 +50,11 @@
         challenge = create(:challenge, user: challenge_user, title: "Turning monster energy into pepto bismol")
         phase = create_phase(challenge_id: challenge.id)
         ChallengeManager.create(user: challenge_user, challenge:)
-        create_evaluation_form(title: "Frodo", challenge_id: challenge.id, phase_id: phase.id)
+        frodo = create_evaluation_form(title: "Frodo", challenge_id: challenge.id, phase_id: phase.id)
 
         get phases_path
         expect(response.body).to include("Turning monster energy into pepto bismol")
-        expect(response.body).to include("Frodo")
+        expect(response.body).to have_link("Edit form", href: edit_phase_evaluation_form_path(phase, frodo))
       end
     end
 
diff --git a/spec/system/evaluation_form_spec.rb b/spec/system/evaluation_form_spec.rb
index ebb9f7cc..19ab7881 100644
--- a/spec/system/evaluation_form_spec.rb
+++ b/spec/system/evaluation_form_spec.rb
@@ -5,19 +5,20 @@
 
   describe "new evaluation form page" do
     let!(:challenge) { create(:challenge, user:, is_multi_phase: true) }
+    let!(:phase) { create(:phase, challenge: challenge) }
 
     before do
       system_login_user(user)
     end
 
     it "is accessible" do
-      visit new_evaluation_form_path
+      visit new_phase_evaluation_form_path(phase)
       # Accessibility check on empty form
       expect(page).to(be_axe_clean)
     end
 
     it "shows a confirmation modal when clicking the cancel button" do
-      visit new_evaluation_form_path
+      visit new_phase_evaluation_form_path(phase)
 
       click_link_or_button "Cancel"
 
@@ -26,8 +27,8 @@
       expect(page).to(be_axe_clean)
     end
 
-    it "redirects to evaluation form path when clicking yes in cancel modal" do
-      visit new_evaluation_form_path
+    it "redirects to phases path when clicking yes in cancel modal" do
+      visit new_phase_evaluation_form_path(phase)
 
       click_link_or_button "Cancel"
 
@@ -37,11 +38,11 @@
         click_link_or_button 'Yes'
       end
 
-      assert_current_path evaluation_forms_path
+      assert_current_path phases_path
     end
 
     it "closes the cancel modal and does nothing if you click close" do
-      visit new_evaluation_form_path
+      visit new_phase_evaluation_form_path(phase)
 
       click_link_or_button "Cancel"
 
@@ -52,11 +53,11 @@
       end
 
       assert_no_selector 'dialog#cancel', visible: true
-      assert_current_path new_evaluation_form_path
+      assert_current_path new_phase_evaluation_form_path(phase)
     end
 
     it 'allows creation of a valid form with all 3 criteria scoring types' do
-      visit new_evaluation_form_path
+      visit new_phase_evaluation_form_path(phase)
 
       fill_in_full_form
 
@@ -72,16 +73,15 @@
 
       # Click through confirmation page
       expect(page).to have_content("Evaluation Form Saved")
-      click_link_or_button "Manage Evaluation Forms"
+      click_link_or_button "Back to Challenge Phases"
 
-      # Should be on evaluation index view
+      # Should be on phases index view
       evaluation_form = EvaluationForm.first
-      expect(page).to have_content("Evaluation Forms")
-      expect(page).to have_content(evaluation_form.title)
       phase = evaluation_form.phase
       challenge_phase_title = challenge_phase_title(phase.challenge, phase)
       expect(page).to have_content(challenge_phase_title)
-      expect(page).to have_content(evaluation_period(evaluation_form))
+      expect(page).to have_content("Edit form")
+      expect(page).to have_link("Edit form", href: edit_phase_evaluation_form_path(phase, evaluation_form))
 
       # Check accessibility
       expect(page).to(be_axe_clean)
@@ -99,7 +99,7 @@
       new_challenge.phases[0]
       new_challenge_phase_title = challenge_phase_title(challenge, valid_phase)
 
-      visit new_evaluation_form_path
+      visit new_phase_evaluation_form_path(phase)
 
       expect_form_phase_select_to_not_contain(invalid_challenge_phase_title)
       expect_form_phase_select_to_contain(valid_challenge_phase_title)
@@ -111,26 +111,27 @@
       create(:evaluation_form, phase: challenge.phases[0])
       create(:evaluation_form, phase: challenge.phases[1])
       create(:evaluation_form, phase: challenge.phases[2])
+      create(:evaluation_form, phase: challenge.phases[3])
 
-      visit new_evaluation_form_path
+      visit new_phase_evaluation_form_path(phase)
 
       expect_form_phase_select_to_be_empty
     end
 
     it "contains the evaluation form data when editing after creation" do
       title = "Editing after creation"
-      visit new_evaluation_form_path
+      visit new_phase_evaluation_form_path(phase)
       fill_in_full_form(title:)
       save_form
-      click_link_or_button "Manage Evaluation Forms"
-      expect(page).to have_link(title)
+      click_link_or_button "Back to Challenge Phases"
+      expect(page).to have_link("Edit form")
       evaluation_form = EvaluationForm.find_by(title:)
-      click_edit_button_for_evaluation_form(evaluation_form.id)
+      click_link("Edit form", href: edit_phase_evaluation_form_path(evaluation_form.phase, evaluation_form))
       expect_form_to_match_all_evaluation_form_values(evaluation_form)
     end
 
     it 'allows removing evaluation criteria' do
-      visit new_evaluation_form_path
+      visit new_phase_evaluation_form_path(phase)
 
       fill_in_full_form
 
@@ -150,7 +151,7 @@
     end
 
     it "shows an error if criteria points don't add up to 100 for weighted form" do
-      visit new_evaluation_form_path
+      visit new_phase_evaluation_form_path(phase)
 
       fill_in_base_form_info
       select_scale_type("weighted")
@@ -173,7 +174,7 @@
     end
 
     it "expands all criteria if switching to weighted scale with value over 100" do
-      visit new_evaluation_form_path
+      visit new_phase_evaluation_form_path(phase)
 
       fill_in_base_form_info
       select_scale_type("point")
@@ -205,7 +206,7 @@
     end
 
     it "does nothing if switching to weighted scale with no value over 100" do
-      visit new_evaluation_form_path
+      visit new_phase_evaluation_form_path(phase)
 
       fill_in_base_form_info
       select_scale_type("point")
@@ -246,12 +247,12 @@
     end
 
     it "is accessible" do
-      visit edit_evaluation_form_path(evaluation_form)
+      visit edit_phase_evaluation_form_path(evaluation_form.phase, evaluation_form)
       expect(page).to(be_axe_clean)
     end
 
     it "shows a confirmation modal when clicking the cancel button" do
-      visit edit_evaluation_form_path(evaluation_form)
+      visit edit_phase_evaluation_form_path(evaluation_form.phase, evaluation_form)
 
       click_link_or_button "Cancel"
 
@@ -261,7 +262,7 @@
     end
 
     it "redirects to evaluation form path when clicking yes in cancel modal" do
-      visit edit_evaluation_form_path(evaluation_form)
+      visit edit_phase_evaluation_form_path(evaluation_form.phase, evaluation_form)
 
       click_link_or_button "Cancel"
 
@@ -271,11 +272,11 @@
         click_link_or_button 'Yes'
       end
 
-      assert_current_path evaluation_forms_path
+      assert_current_path phases_path
     end
 
     it "closes the cancel modal and does nothing if you click close" do
-      visit edit_evaluation_form_path(evaluation_form)
+      visit edit_phase_evaluation_form_path(evaluation_form.phase, evaluation_form)
 
       click_link_or_button "Cancel"
 
@@ -286,11 +287,11 @@
       end
 
       assert_no_selector 'dialog#cancel', visible: true
-      assert_current_path edit_evaluation_form_path(evaluation_form)
+      assert_current_path edit_phase_evaluation_form_path(evaluation_form.phase, evaluation_form)
     end
 
     it 'allows editing of an existing form values' do
-      visit edit_evaluation_form_path(evaluation_form)
+      visit edit_phase_evaluation_form_path(evaluation_form.phase, evaluation_form)
 
       # Prep updated form field values for comparison
       updated_title = "Updated #{evaluation_form.title}"
@@ -312,7 +313,7 @@
       fill_in_end_date(updated_end_date)
 
       save_form
-      expect(page).to have_current_path(confirmation_evaluation_form_path(evaluation_form))
+      expect(page).to have_current_path(confirmation_phase_evaluation_form_path(updated_phase, evaluation_form))
       expect(page).to have_content("Evaluation Form Saved")
 
       evaluation_form.reload
@@ -326,7 +327,7 @@
     end
 
     it 'allows adding new criteria' do
-      visit edit_evaluation_form_path(evaluation_form)
+      visit edit_phase_evaluation_form_path(evaluation_form.phase, evaluation_form)
 
       num_criteria = evaluation_form.evaluation_criteria.length
 
@@ -346,7 +347,7 @@
     end
 
     it 'allows removing existing criteria' do
-      visit edit_evaluation_form_path(evaluation_form)
+      visit edit_phase_evaluation_form_path(evaluation_form.phase, evaluation_form)
 
       num_criteria = evaluation_form.evaluation_criteria.length
 
@@ -372,7 +373,7 @@
       closed_challenge = create(:challenge, user:, phases: [create(:phase, end_date: 1.week.ago)])
       closed_evaluation_form = create(:evaluation_form, challenge:, phase: closed_challenge.phases.first)
 
-      visit edit_evaluation_form_path(closed_evaluation_form)
+      visit edit_phase_evaluation_form_path(closed_evaluation_form.phase, closed_evaluation_form)
 
       # Add expectation in spec to satisfy rubocop
       expect(page).to have_css("form[data-controller='evaluation-form modal form-validation']")
@@ -391,7 +392,7 @@
     end
 
     it "is accessible" do
-      visit confirmation_evaluation_form_path(evaluation_form)
+      visit confirmation_phase_evaluation_form_path(evaluation_form.phase, evaluation_form)
       expect(page).to have_content("Evaluation Form Saved")
       expect(page).to(be_axe_clean)
     end
@@ -595,10 +596,6 @@ def save_form
   click_on 'Save'
 end
 
-def click_edit_button_for_evaluation_form(id)
-  find("form[action='/evaluation_forms/#{id}/edit'] button[type='submit']").click
-end
-
 ##### Form Focus Helpers #####
 # Checks for form fields being focused. Usually in the case of a required field not filled out
 # Includes non visible fields because of custom checkbox and radio button styling

From 421fedb772f1f1aeec68f59af7cc79c65f64ae1d Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 17 Feb 2025 17:15:07 -0500
Subject: [PATCH 13/31] number of evaluators

---
 app/controllers/phases_controller.rb    |  2 +-
 app/views/phases/_phases_table.html.erb | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/controllers/phases_controller.rb b/app/controllers/phases_controller.rb
index 368d30f4..5508a507 100644
--- a/app/controllers/phases_controller.rb
+++ b/app/controllers/phases_controller.rb
@@ -6,7 +6,7 @@ class PhasesController < ApplicationController
   before_action :set_phase, except: [:index]
 
   def index
-    @challenges = current_user.challenge_manager_challenges.includes([phases: [:evaluation_form]])
+    @challenges = current_user.challenge_manager_challenges.includes([phases: [:evaluation_form, :evaluators]])
   end
 
   def submissions
diff --git a/app/views/phases/_phases_table.html.erb b/app/views/phases/_phases_table.html.erb
index 83f400c5..0511bf39 100644
--- a/app/views/phases/_phases_table.html.erb
+++ b/app/views/phases/_phases_table.html.erb
@@ -42,15 +42,22 @@
                 <%= link_to "Create form", new_phase_evaluation_form_path(phase) %>
               <% end %>  
             </td>
+       
+            <td data-label="# of Evaluators" class="text-top">
+              <%= link_to phase_evaluators_path(phase) do %>
+                <% if phase.evaluators.present? %>
+                  <%= phase.evaluators.count %> Evaluators
+                <% else %>
+                  Invite Evaluators
+                <% end %>    
+              <% end %>
+            </td>
             <td data-label="Evaluations are due by" class="text-top">
               <% if phase.evaluation_form %>
                 <%= phase.evaluation_form.closing_date %>
               <% else %>
                 N/A  
               <% end %>
-            </td>
-            <td data-label="Evaluation Form" class="text-top">
-
             </td>
             <td>
               <div class="display-flex flex-column grid-row grid-gap-1">

From 8857b200de1cbc6811a551bcb773c270fe70f97f Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 17 Feb 2025 17:27:42 -0500
Subject: [PATCH 14/31] placeholder for eval status

---
 app/views/phases/_phases_table.html.erb | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/app/views/phases/_phases_table.html.erb b/app/views/phases/_phases_table.html.erb
index 0511bf39..d6c22ac6 100644
--- a/app/views/phases/_phases_table.html.erb
+++ b/app/views/phases/_phases_table.html.erb
@@ -52,27 +52,11 @@
                 <% end %>    
               <% end %>
             </td>
-            <td data-label="Evaluations are due by" class="text-top">
-              <% if phase.evaluation_form %>
-                <%= phase.evaluation_form.closing_date %>
-              <% else %>
-                N/A  
-              <% end %>
+            <td data-label="Evaluation Due Date" class="text-top">
+              <%= phase.evaluation_form&.closing_date %>
             </td>
-            <td>
-              <div class="display-flex flex-column grid-row grid-gap-1">
-                <%= link_to phase_evaluators_path(phase), class: "usa-button font-body-2xs text-no-wrap width-full margin-bottom-105" do %>
-                  Manage Evaluators
-                <% end %>
-                <% if phase.submissions_count > 0 %>
-                  <%= link_to(submissions_phase_path(phase)) do %>
-                    <button class="usa-button font-body-2xs text-no-wrap width-full">
-                      View Submissions
-                    </button>
-                  <% end %>
-                <% end %>
-              </div>
-              </div>  
+            <td data-label="Evaluation Status" class="text-top">
+              
             </td>
             </td>  
           </tr>

From 5b48d95f9b0ae1b2a4ec2cc0efe886022c258b86 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 17 Feb 2025 17:32:34 -0500
Subject: [PATCH 15/31] phase evaluation status

---
 app/helpers/phases_helper.rb            | 10 ++++++++++
 app/views/phases/_phases_table.html.erb |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/helpers/phases_helper.rb b/app/helpers/phases_helper.rb
index a54a4d43..d6e611a0 100644
--- a/app/helpers/phases_helper.rb
+++ b/app/helpers/phases_helper.rb
@@ -20,5 +20,15 @@ def statuses
       published: "Published",
       archived: "Archived"
     }
+  end
+  
+  def evaluation_status(phase)
+    if phase.submissions.eligible_for_evaluation.where.not(status: [:in_progress, :completed]).exists?
+      "Not Started"
+    elsif phase.submissions.eligible_for_evaluation.where.not(status: [:not_started, :in_progress]).exists?
+      "Completed"
+    else
+      "Not Started"     
+    end
   end  
 end
diff --git a/app/views/phases/_phases_table.html.erb b/app/views/phases/_phases_table.html.erb
index d6c22ac6..e434c4b2 100644
--- a/app/views/phases/_phases_table.html.erb
+++ b/app/views/phases/_phases_table.html.erb
@@ -56,7 +56,7 @@
               <%= phase.evaluation_form&.closing_date %>
             </td>
             <td data-label="Evaluation Status" class="text-top">
-              
+              <%= evaluation_status(phase) %>
             </td>
             </td>  
           </tr>

From e09b37316c3b46cfe66b6de5d9cc83cdf6b39f82 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 17 Feb 2025 17:42:51 -0500
Subject: [PATCH 16/31] lint

---
 app/controllers/dev/accounts_controller.rb     | 4 ++--
 app/controllers/evaluation_forms_controller.rb | 6 +++++-
 app/helpers/phases_helper.rb                   | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/controllers/dev/accounts_controller.rb b/app/controllers/dev/accounts_controller.rb
index c5173be6..fc4c946b 100644
--- a/app/controllers/dev/accounts_controller.rb
+++ b/app/controllers/dev/accounts_controller.rb
@@ -15,11 +15,11 @@ def login
       renew_session
       session[:userinfo] = [{ "email" => email, "sub" => @current_user.token }]
       case @current_user.role 
-      when "evaluator"  
+      when "evaluator"
         redirect_to evaluations_path
       else
         redirect_to phases_path
-      end    
+      end
     end
   end
 end
diff --git a/app/controllers/evaluation_forms_controller.rb b/app/controllers/evaluation_forms_controller.rb
index 864dc482..ef5ff5f9 100644
--- a/app/controllers/evaluation_forms_controller.rb
+++ b/app/controllers/evaluation_forms_controller.rb
@@ -31,7 +31,11 @@ def create
     respond_to do |format|
       if @evaluation_form.save
         format.html do
-          redirect_to confirmation_phase_evaluation_form_path(@evaluation_form.phase, @evaluation_form), notice: I18n.t("evaluation_form_saved")
+          redirect_to confirmation_phase_evaluation_form_path(
+            @evaluation_form.phase, 
+            @evaluation_form
+            ), 
+            notice: I18n.t("evaluation_form_saved")
         end
         format.json { render :show, status: :created, location: @evaluation_form }
       else
diff --git a/app/helpers/phases_helper.rb b/app/helpers/phases_helper.rb
index d6e611a0..4dc9f5e3 100644
--- a/app/helpers/phases_helper.rb
+++ b/app/helpers/phases_helper.rb
@@ -21,14 +21,14 @@ def statuses
       archived: "Archived"
     }
   end
-  
+
   def evaluation_status(phase)
     if phase.submissions.eligible_for_evaluation.where.not(status: [:in_progress, :completed]).exists?
       "Not Started"
     elsif phase.submissions.eligible_for_evaluation.where.not(status: [:not_started, :in_progress]).exists?
       "Completed"
     else
-      "Not Started"     
+      "In Progress"
     end
-  end  
+  end
 end

From 3308f1d99ecf4c6e8274e2ad61fca776cd2f37ba Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 17 Feb 2025 17:45:40 -0500
Subject: [PATCH 17/31] rubocop on eval form controller

---
 app/controllers/evaluation_forms_controller.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/controllers/evaluation_forms_controller.rb b/app/controllers/evaluation_forms_controller.rb
index ef5ff5f9..d2158c58 100644
--- a/app/controllers/evaluation_forms_controller.rb
+++ b/app/controllers/evaluation_forms_controller.rb
@@ -32,10 +32,10 @@ def create
       if @evaluation_form.save
         format.html do
           redirect_to confirmation_phase_evaluation_form_path(
-            @evaluation_form.phase, 
+            @evaluation_form.phase,
             @evaluation_form
-            ), 
-            notice: I18n.t("evaluation_form_saved")
+          ),
+                      notice: I18n.t("evaluation_form_saved")
         end
         format.json { render :show, status: :created, location: @evaluation_form }
       else
@@ -50,7 +50,8 @@ def update
     respond_to do |format|
       if @evaluation_form.update(evaluation_form_params)
         format.html do
-          redirect_to confirmation_phase_evaluation_form_path(@evaluation_form.phase, @evaluation_form), notice: I18n.t("evaluation_form_saved")
+          redirect_to confirmation_phase_evaluation_form_path(@evaluation_form.phase, @evaluation_form),
+                      notice: I18n.t("evaluation_form_saved")
         end
         format.json { render :show, status: :ok, location: @evaluation_form }
       else
@@ -104,7 +105,7 @@ def set_available_phases
 
   def set_phase
     @phase = Phase.find(params[:phase_id])
-  end  
+  end
 
   # Only allow a list of trusted parameters through.
   def evaluation_form_params

From 834fd75526210dd881253d3f6075aa925d133f1d Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 17 Feb 2025 17:46:11 -0500
Subject: [PATCH 18/31] trailing whitespace

---
 app/controllers/dev/accounts_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/dev/accounts_controller.rb b/app/controllers/dev/accounts_controller.rb
index fc4c946b..a1d95ac9 100644
--- a/app/controllers/dev/accounts_controller.rb
+++ b/app/controllers/dev/accounts_controller.rb
@@ -14,7 +14,7 @@ def login
       @current_user = User.find_by(email:)
       renew_session
       session[:userinfo] = [{ "email" => email, "sub" => @current_user.token }]
-      case @current_user.role 
+      case @current_user.role
       when "evaluator"
         redirect_to evaluations_path
       else

From e66554b6cb1735523a9030cef01821cbfed2abd9 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Mon, 17 Feb 2025 17:52:18 -0500
Subject: [PATCH 19/31] helping

---
 .../evaluation_forms_controller.rb            | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/controllers/evaluation_forms_controller.rb b/app/controllers/evaluation_forms_controller.rb
index d2158c58..bad50079 100644
--- a/app/controllers/evaluation_forms_controller.rb
+++ b/app/controllers/evaluation_forms_controller.rb
@@ -28,20 +28,14 @@ def edit; end
   def create
     @evaluation_form = EvaluationForm.new(evaluation_form_params)
 
-    respond_to do |format|
-      if @evaluation_form.save
-        format.html do
-          redirect_to confirmation_phase_evaluation_form_path(
-            @evaluation_form.phase,
-            @evaluation_form
-          ),
-                      notice: I18n.t("evaluation_form_saved")
-        end
-        format.json { render :show, status: :created, location: @evaluation_form }
-      else
-        format.html { render :new, status: :unprocessable_entity, phase: @evaluation_form.phase }
-        format.json { render json: @evaluation_form.errors, status: :unprocessable_entity }
-      end
+    if @evaluation_form.save
+      redirect_to confirmation_phase_evaluation_form_path(
+        @evaluation_form.phase,
+        @evaluation_form
+      ),
+                  notice: I18n.t("evaluation_form_saved")
+    else
+      render :new, status: :unprocessable_entity, phase: @evaluation_form.phase
     end
   end
 

From 55d667335597fbcffba7c6ffe1531dc0585abe00 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Tue, 18 Feb 2025 09:35:56 -0500
Subject: [PATCH 20/31] remove challenge phase selector from eval form

---
 .../evaluation_forms_controller.rb            | 17 +----
 .../controllers/evaluation_form_controller.js | 26 -------
 app/views/evaluation_forms/_form.html.erb     | 32 ++-------
 app/views/evaluation_forms/edit.html.erb      |  2 +-
 app/views/evaluation_forms/new.html.erb       |  2 +-
 spec/factories/evaluation_form.rb             |  2 +-
 spec/factories/phase.rb                       |  2 +-
 spec/system/evaluation_form_spec.rb           | 67 +++----------------
 8 files changed, 19 insertions(+), 131 deletions(-)

diff --git a/app/controllers/evaluation_forms_controller.rb b/app/controllers/evaluation_forms_controller.rb
index bad50079..c2b31fa7 100644
--- a/app/controllers/evaluation_forms_controller.rb
+++ b/app/controllers/evaluation_forms_controller.rb
@@ -5,10 +5,9 @@ class EvaluationFormsController < ApplicationController
   helper FormHelper
 
   before_action -> { authorize_user('challenge_manager') }
-  before_action :set_phase, only: %i[show edit update destroy index new create]
+  before_action :set_phase
   before_action :set_evaluation_form, only: %i[show edit update destroy]
   before_action :set_evaluation_forms, only: %i[index]
-  before_action :set_available_phases, only: %i[new create edit update]
 
   # GET /evaluation_forms or /evaluation_forms.json
   def index; end
@@ -83,20 +82,6 @@ def set_evaluation_forms
       includes([:challenge, :phase])
   end
 
-  def set_available_phases
-    current_phase_id = @evaluation_form&.phase_id
-
-    @available_phases =
-      current_user.challenge_manager_challenges.includes(:phases).map do |challenge|
-        {
-          challenge:,
-          phases: challenge.phases.reject do |phase|
-            current_phase_id != phase.id && EvaluationForm.exists?(phase_id: phase.id)
-          end
-        }
-      end
-  end
-
   def set_phase
     @phase = Phase.find(params[:phase_id])
   end
diff --git a/app/javascript/controllers/evaluation_form_controller.js b/app/javascript/controllers/evaluation_form_controller.js
index 59e298ed..f5a90a50 100644
--- a/app/javascript/controllers/evaluation_form_controller.js
+++ b/app/javascript/controllers/evaluation_form_controller.js
@@ -2,32 +2,6 @@ import { Controller } from "@hotwired/stimulus";
 
 // Connects to data-controller="evaluation-form"
 export default class extends Controller {
-  static targets = ["challengeID", "phaseID", "startDate", "datePicker"];
-
-  handleChallengeSelect(e) {
-    let id, phase_id, end_date;
-    [id, phase_id, end_date] = e.target.value.split(".");
-    if (id) {
-      // set values of hidden form fields
-      this.challengeIDTarget.value = id;
-      this.phaseIDTarget.value = phase_id;
-
-      // set the start date of the evaluation form
-      // to be the challenge's end date
-      this.startDateTarget.innerHTML = end_date || "mm/dd/yyyy";
-      let day, month, year;
-      [month, day, year] = end_date.split("/");
-      this.datePickerTarget.setAttribute(
-        "data-min-date",
-        `${year}-${month}-${day}`
-      );
-    } else {
-      this.challengeIDTarget.value = null;
-      this.phaseIDTarget.value = null;
-
-      this.startDateTarget.innerHTML = "mm/dd/yyyy";
-    }
-  }
 
   // Opens all accordions, remove existing points/weights, update max points/weights values
   updateMaxPoints(e) {
diff --git a/app/views/evaluation_forms/_form.html.erb b/app/views/evaluation_forms/_form.html.erb
index 7b9628d5..e7ce86c1 100644
--- a/app/views/evaluation_forms/_form.html.erb
+++ b/app/views/evaluation_forms/_form.html.erb
@@ -43,32 +43,8 @@
         <%= inline_error(form, :title) %>
       </div>
 
-      <div class="usa-form-group">
-        <div class="display-flex flex-align-center text-bold">
-          <%= form.label :phase, "Select a Challenge", class: "margin-right-05 #{label_error_class(form, :phase)}", for: "challenge-combo" %>
-          <span class="margin-right-05" style="color: darkred;">*</span>
-        </div>
-        <div class="usa-hint">Choose the challenge this form will evaluate.</div>
-
-        <div class="usa-combo-box" data-default-value="<%= combo_box_default_value %>">
-          <%= select_tag(
-            'challenge-combo',
-            options_for_select(options_for_available_phases(@available_phases)),
-            class: "usa-select #{input_error_class(form, :phase)}",
-            title: 'challenge-combo',
-            data: {
-              action: "evaluation-form#handleChallengeSelect form-validation#validatePresence focusout->form-validation#validatePresence",
-              field_name: "evaluation_form_phase"
-            },
-            disabled: disabled
-          ) %>
-        </div>
-
-        <%= inline_error(form, :phase) %>
-
-        <%= form.hidden_field :phase_id, {data: { "evaluation-form-target": 'phaseID'}} %>
-        <%= form.hidden_field :challenge_id, {data: { "evaluation-form-target": 'challengeID'}} %>
-      </div>
+      <%= form.hidden_field :phase_id, value: @phase.id %>
+      <%= form.hidden_field :challenge_id, value: @phase.challenge.id %>
 
       <div class="usa-form-group">
         <div class="usa-character-count">
@@ -192,7 +168,7 @@
       </p>
 
       <div class="usa-label text-bold font-sans-sm">Evaluation Start Date:</div>
-      <div class="usa-hint" data-evaluation-form-target="startDate">mm/dd/yyyy</div>
+      <div class="usa-hint"><%= @phase.challenge.end_date.strftime('%m/%d/%Y') %></div>
 
       <div class="usa-form-group">
         <div class="display-flex flex-align-center text-bold">
@@ -201,7 +177,7 @@
         </div>
         <div class="usa-hint" id="evaluation_form_closing_date_hint">mm/dd/yyyy</div>
 
-        <div data-evaluation-form-target="datePicker" class="usa-date-picker" data-default-value="<%= evaluation_form.closing_date %>" data-min-date="<%= if evaluation_form.challenge then evaluation_form.challenge.end_date end %>">
+        <div data-evaluation-form-target="datePicker" class="usa-date-picker" data-default-value="<%= evaluation_form.closing_date %>" data-min-date="<%= @phase.challenge.end_date %>">
           <input
             class="usa-input <%= input_error_class(form, :closing_date) %>"
             id="evaluation_form_closing_date"
diff --git a/app/views/evaluation_forms/edit.html.erb b/app/views/evaluation_forms/edit.html.erb
index 7e101479..74c9286c 100644
--- a/app/views/evaluation_forms/edit.html.erb
+++ b/app/views/evaluation_forms/edit.html.erb
@@ -2,4 +2,4 @@
 
 <h1><%= if eval_form_disabled?(@evaluation_form) then "View" else "Editing" end %> evaluation form</h1>
 
-<%= render "form", evaluation_form: @evaluation_form, url: phase_evaluation_form_path(phase_id: @phase.id) %>
+<%= render "form", evaluation_form: @evaluation_form, url: phase_evaluation_form_path(phase_id: @phase.id), phase: @phase %>
diff --git a/app/views/evaluation_forms/new.html.erb b/app/views/evaluation_forms/new.html.erb
index c58d9229..3b816592 100644
--- a/app/views/evaluation_forms/new.html.erb
+++ b/app/views/evaluation_forms/new.html.erb
@@ -2,4 +2,4 @@
 
 <h1>Create Evaluation Form</h1>
 
-<%= render "form", evaluation_form: @evaluation_form, url: phase_evaluation_forms_path(phase_id: @phase.id) %>
+<%= render "form", evaluation_form: @evaluation_form, url: phase_evaluation_forms_path(phase_id: @phase.id), phase: @phase %>
diff --git a/spec/factories/evaluation_form.rb b/spec/factories/evaluation_form.rb
index bdcc105f..11b1f285 100644
--- a/spec/factories/evaluation_form.rb
+++ b/spec/factories/evaluation_form.rb
@@ -45,7 +45,7 @@
         evaluation_form.closing_date = phase_end_date + 1.day
       else
         # Fallback in case of no phase end_date
-        closing_date { Faker::Date.forward(days: 30) }
+        closing_date { 4.months.from_now }
       end
     end
 
diff --git a/spec/factories/phase.rb b/spec/factories/phase.rb
index f8bfc9c2..9aa115fe 100644
--- a/spec/factories/phase.rb
+++ b/spec/factories/phase.rb
@@ -4,7 +4,7 @@
     uuid { SecureRandom.uuid }
     title { Faker::Lorem.sentence }
     start_date { Faker::Date.backward(days: 30) }
-    end_date { Faker::Date.forward(days: 30) }
+    end_date { 4.months.from_now }
     open_to_submissions { Faker::Boolean.boolean }
     judging_criteria { Faker::Lorem.paragraph }
     judging_criteria_delta { Faker::Lorem.paragraph }
diff --git a/spec/system/evaluation_form_spec.rb b/spec/system/evaluation_form_spec.rb
index 19ab7881..cc42bd0e 100644
--- a/spec/system/evaluation_form_spec.rb
+++ b/spec/system/evaluation_form_spec.rb
@@ -2,10 +2,10 @@
 
 RSpec.describe 'Evaluation Form', :js, type: :system do
   let(:user) { create_user(role: "challenge_manager", status: "active") }
+  let!(:challenge) { create(:challenge, user:, is_multi_phase: true) }
+  let!(:phase) { create(:phase, challenge: challenge) }
 
   describe "new evaluation form page" do
-    let!(:challenge) { create(:challenge, user:, is_multi_phase: true) }
-    let!(:phase) { create(:phase, challenge: challenge) }
 
     before do
       system_login_user(user)
@@ -87,37 +87,6 @@
       expect(page).to(be_axe_clean)
     end
 
-    it "only shows phases without existing evaluation forms as options for phase select" do
-      create(:evaluation_form, phase: challenge.phases[0])
-      new_challenge = create(:challenge, user:)
-
-      # Generate taken and non taken challenge_phase_title values
-      invalid_phase = challenge.phases[0]
-      invalid_challenge_phase_title = challenge_phase_title(challenge, invalid_phase)
-      valid_phase = challenge.phases[1]
-      valid_challenge_phase_title = challenge_phase_title(challenge, valid_phase)
-      new_challenge.phases[0]
-      new_challenge_phase_title = challenge_phase_title(challenge, valid_phase)
-
-      visit new_phase_evaluation_form_path(phase)
-
-      expect_form_phase_select_to_not_contain(invalid_challenge_phase_title)
-      expect_form_phase_select_to_contain(valid_challenge_phase_title)
-      expect_form_phase_select_to_contain(new_challenge_phase_title)
-    end
-
-    it "shows no results found if all phases are taken" do
-      # Make an evaluation form for all 3 initial factory challenge phases
-      create(:evaluation_form, phase: challenge.phases[0])
-      create(:evaluation_form, phase: challenge.phases[1])
-      create(:evaluation_form, phase: challenge.phases[2])
-      create(:evaluation_form, phase: challenge.phases[3])
-
-      visit new_phase_evaluation_form_path(phase)
-
-      expect_form_phase_select_to_be_empty
-    end
-
     it "contains the evaluation form data when editing after creation" do
       title = "Editing after creation"
       visit new_phase_evaluation_form_path(phase)
@@ -235,11 +204,11 @@
   end
 
   describe "update evaluation form page" do
-    let(:challenge) do
-      create(:challenge, user:, is_multi_phase: true)
-    end
+    # let(:challenge) do
+    #   create(:challenge, user:, is_multi_phase: true)
+    # end
     let(:evaluation_form) do
-      create(:evaluation_form, challenge:, phase: challenge.phases.first, scale_type: "weight")
+      create(:evaluation_form, challenge:, phase: phase, scale_type: "weight")
     end
 
     before do
@@ -296,16 +265,14 @@
       # Prep updated form field values for comparison
       updated_title = "Updated #{evaluation_form.title}"
       # TODO: Might affect disabled state, start_date, etc.
-      updated_phase = challenge.phases[1]
       updated_instructions = "Updated #{evaluation_form.instructions}"
       updated_comments_required = !evaluation_form.comments_required
       # TODO: Enable this when criteria updating and weight fixing is implemented
       # updated_scale_type = !evaluation_form.weighted_scoring
-      updated_end_date = updated_phase.end_date + 1.day
+      updated_end_date = evaluation_form.closing_date + 1.day
 
       # Update form field values
       fill_in_title(updated_title)
-      select_phase(updated_phase)
       fill_in_instructions(updated_instructions)
       check_comments_required
       # TODO: When switching to weighted it needs to make sure criteria values sum to 100
@@ -313,12 +280,11 @@
       fill_in_end_date(updated_end_date)
 
       save_form
-      expect(page).to have_current_path(confirmation_phase_evaluation_form_path(updated_phase, evaluation_form))
+      expect(page).to have_current_path(confirmation_phase_evaluation_form_path(phase, evaluation_form))
       expect(page).to have_content("Evaluation Form Saved")
 
       evaluation_form.reload
       expect(evaluation_form.title).to eq(updated_title)
-      expect(evaluation_form.phase_id).to eq(updated_phase.id)
       expect(evaluation_form.instructions).to eq(updated_instructions)
       expect(evaluation_form.comments_required).to eq(updated_comments_required)
       # TODO: Enable this when weighted scoring issue above is solved
@@ -347,7 +313,7 @@
     end
 
     it 'allows removing existing criteria' do
-      visit edit_phase_evaluation_form_path(evaluation_form.phase, evaluation_form)
+      visit edit_phase_evaluation_form_path(phase, evaluation_form)
 
       num_criteria = evaluation_form.evaluation_criteria.length
 
@@ -412,11 +378,10 @@ def fill_in_full_form(title: "New Evaluation Form")
 def fill_in_base_form_info(title: "New Evaluation Form")
   # Fill in main form fields
   fill_in_title(title)
-  select_phase(challenge.phases.first)
   fill_in_instructions("Example instructions")
   check_comments_required
   select_scale_type("point")
-  fill_in_end_date(challenge.phases.first.end_date + 1)
+  fill_in_end_date(phase.end_date + 1)
 end
 
 def fill_in_all_eval_criteria_types
@@ -465,12 +430,6 @@ def fill_in_title(value)
   fill_in 'evaluation_form[title]', with: value
 end
 
-def select_phase(phase)
-  challenge_phase_title = challenge_phase_title(phase.challenge, phase)
-  find_by_id('challenge-combo').click
-  find('#challenge-combo--list li', text: challenge_phase_title).click
-end
-
 def fill_in_instructions(value)
   fill_in 'evaluation_form[instructions]', with: value
 end
@@ -662,8 +621,6 @@ def expect_form_to_match_all_evaluation_form_values(evaluation_form)
 
 def expect_base_form_field_to_match(evaluation_form)
   expect_form_title_to_equal(evaluation_form.title)
-  phase = evaluation_form.phase
-  expect_form_phase_to_equal(challenge_phase_title(phase.challenge, phase))
   expect_form_instructions_to_equal(evaluation_form.instructions)
   expect_form_comments_required_to_equal(evaluation_form.comments_required)
   expect_form_scale_type_to_equal(evaluation_form.scale_type)
@@ -702,10 +659,6 @@ def expect_form_title_to_equal(value)
   expect(find_by_id('evaluation_form_title').value).to eq(value)
 end
 
-def expect_form_phase_to_equal(value)
-  expect(find_by_id('challenge-combo').value).to eq(value)
-end
-
 def expect_form_phase_select_to_not_contain(value)
   expect(page).to have_no_select(
     class: "usa-combo-box__select",

From 2f928cf9832fdce29dcf162dd55c22f70edfeed2 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Tue, 18 Feb 2025 09:55:40 -0500
Subject: [PATCH 21/31] remove eval form index

---
 app/controllers/dashboard_controller.rb       |   8 ++
 .../evaluation_forms_controller.rb            |  10 --
 app/views/evaluation_forms/index.html.erb     |  22 ----
 spec/requests/evaluation_forms_spec.rb        | 112 ------------------
 4 files changed, 8 insertions(+), 144 deletions(-)
 create mode 100644 app/controllers/dashboard_controller.rb
 delete mode 100644 app/views/evaluation_forms/index.html.erb

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
new file mode 100644
index 00000000..a99823d2
--- /dev/null
+++ b/app/controllers/dashboard_controller.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# The dashboard controller serves the logged-in homepage of the app.
+class DashboardController < ApplicationController
+  def index
+    redirect_to "/"
+  end
+end
diff --git a/app/controllers/evaluation_forms_controller.rb b/app/controllers/evaluation_forms_controller.rb
index c2b31fa7..da5db54b 100644
--- a/app/controllers/evaluation_forms_controller.rb
+++ b/app/controllers/evaluation_forms_controller.rb
@@ -7,10 +7,6 @@ class EvaluationFormsController < ApplicationController
   before_action -> { authorize_user('challenge_manager') }
   before_action :set_phase
   before_action :set_evaluation_form, only: %i[show edit update destroy]
-  before_action :set_evaluation_forms, only: %i[index]
-
-  # GET /evaluation_forms or /evaluation_forms.json
-  def index; end
 
   # GET /evaluation_forms/1 or /evaluation_forms/1.json
   def show; end
@@ -76,12 +72,6 @@ def set_evaluation_form
       find(params[:id])
   end
 
-  def set_evaluation_forms
-    @evaluation_forms = EvaluationForm.
-      by_user(current_user).
-      includes([:challenge, :phase])
-  end
-
   def set_phase
     @phase = Phase.find(params[:phase_id])
   end
diff --git a/app/views/evaluation_forms/index.html.erb b/app/views/evaluation_forms/index.html.erb
deleted file mode 100644
index f29d09b7..00000000
--- a/app/views/evaluation_forms/index.html.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<h1>Evaluation Forms</h1>
-<p class="text-normal">Manage existing evaluation forms and create new evaluation forms.</p>
-
-<p>
-  <%= link_to new_phase_evaluation_form_path(@phase), class: "usa-button button-green font-body-2xs text-no-wrap width-full tablet:width-auto" do %>
-    <%= image_tag(
-      "images/usa-icons/content_copy.svg",
-      class: "usa-icon icon-white",
-      alt: "evaluation forms"
-    )%>
-    Create New Evaluation Form
-  <% end %>
-</p>
-
-<% if @evaluation_forms.empty? %>
-  <div class="text-normal">
-    <p>You currently do not have any evaluation forms.<br/>
-    Please create an evaluation form for your challenge before it is published.</p>
-  </div>
-<% else %>
-  <%= render partial: "table", locals: { evaluation_forms: @evaluation_forms } %>
-<% end %>  
\ No newline at end of file
diff --git a/spec/requests/evaluation_forms_spec.rb b/spec/requests/evaluation_forms_spec.rb
index 77f8d314..faf08548 100644
--- a/spec/requests/evaluation_forms_spec.rb
+++ b/spec/requests/evaluation_forms_spec.rb
@@ -1,118 +1,6 @@
 require 'rails_helper'
 
 RSpec.describe "EvaluationForms" do
-  describe "GET /evaluation_forms" do
-    let(:user) { create_user(role: "challenge_manager") }
-    let!(:challenge) { create(:challenge, user:, is_multi_phase: true) }
-    let!(:phase) { create(:phase, challenge: challenge) }
-    context "when logged in as a super admin" do
-      before do
-        create_and_log_in_user(role: "super_admin")
-      end
-
-      it "redirects to the phoenix app" do
-        get phase_evaluation_forms_path(phase)
-
-        expect(response).to redirect_to(ENV.fetch("PHOENIX_URI", nil))
-      end
-    end
-
-    context "when logged in as a admin" do
-      before do
-        create_and_log_in_user(role: "admin")
-      end
-
-      it "redirects to the phoenix app" do
-        get phase_evaluation_forms_path(phase)
-
-        expect(response).to redirect_to(ENV.fetch("PHOENIX_URI", nil))
-      end
-    end
-
-    context "when logged in as a challenge manager" do
-      before { log_in_user(user) }
-
-      it "renders the index view with the correct header" do
-        get phase_evaluation_forms_path(phase)
-
-        expect(response).to have_http_status(:success)
-        expect(response.body).to include("Evaluation Forms")
-      end
-
-      it "renders an empty list" do
-        get phase_evaluation_forms_path(phase)
-        expect(response.body).to include("You currently do not have any evaluation forms.")
-      end
-
-      # The following specs don't make sense now that we're scoping eval forms by phase. 
-      # Maybe delete if we end up removing the eval form list page
-      # Or update to reflect new requirements 
-
-      # it "renders a list of evaluation forms for the current user's challenges" do
-      #   agency = Agency.create!(name: "Gandalf and Sons", acronym: "GAD")
-      #   challenge = Challenge.create!(user:, agency:, title: "Turning red bull into water")
-      #   ChallengeManager.create(user:, challenge:)
-      #   ph1 = create_phase(challenge_id: challenge.id)
-      #   ph2 = create_phase(challenge_id: challenge.id)
-
-      #   create_evaluation_form(title: "Frodo", challenge_id: challenge.id, phase_id: ph1.id)
-      #   create_evaluation_form(title: "Sam", challenge_id: challenge.id, phase_id: ph2.id)
-      #   get evaluation_forms_path
-      #   expect(response.body).to include("Sam")
-      #   expect(response.body).to include("Frodo")
-      # end
-
-      # it "does not include evaluation forms for challenges not assigned to the current user" do
-      #   agency = Agency.create!(name: "Gandalf and Sons", acronym: "GAD")
-      #   challenge = Challenge.create!(user:, agency:, title: "Turning monster energy into chamomile")
-      #   ChallengeManager.create(user:, challenge:)
-
-      #   user2 = create_user(role: "challenge_manager", email: "testwizard@example.gov")
-      #   challenge2 = Challenge.create!(user: user2, agency:, title: "Turning frogs into princes")
-      #   ChallengeManager.create(user: user2, challenge:)
-      #   ph1 = create_phase(challenge_id: challenge.id)
-      #   ph2 = create_phase(challenge_id: challenge.id)
-      #   ph3 = create_phase(challenge_id: challenge2.id)
-      #   ph4 = create_phase(challenge_id: challenge2.id)
-
-      #   create_evaluation_form(title: "Shrek", challenge_id: challenge.id, phase_id: ph1.id)
-      #   create_evaluation_form(title: "Fiona", challenge_id: challenge.id, phase_id: ph2.id)
-      #   create_evaluation_form(title: "Donkey", challenge_id: challenge2.id, phase_id: ph3.id)
-      #   create_evaluation_form(title: "Farquad", challenge_id: challenge2.id, phase_id: ph4.id)
-
-      #   get evaluation_forms_path
-      #   expect(response.body).to include("Shrek")
-      #   expect(response.body).to include("Fiona")
-      #   expect(response.body).not_to include("Donkey")
-      #   expect(response.body).not_to include("Farquad")
-      # end
-    end
-
-    context "when logged in as an evaluator" do
-      before do
-        create_and_log_in_user(role: "evaluator")
-      end
-
-      it "redirects to the dashboard" do
-        get phase_evaluation_forms_path(phase)
-
-        expect(response).to redirect_to(dashboard_path)
-      end
-    end
-
-    context "when logged in as a solver" do
-      before do
-        create_and_log_in_user(role: "solver")
-      end
-
-      it "redirects to the phoenix app" do
-        get phase_evaluation_forms_path(phase)
-
-        expect(response).to redirect_to(ENV.fetch("PHOENIX_URI", nil))
-      end
-    end
-  end
-
   describe "POST /evaluation_forms" do
     let(:challenge_user) { create_user(role: "challenge_manager") }
 

From f23bb77f1f261105018481a4c93c30df712ae03f Mon Sep 17 00:00:00 2001
From: Stone Filipczak <51140224+stonefilipczak@users.noreply.github.com>
Date: Wed, 19 Feb 2025 12:43:12 -0500
Subject: [PATCH 22/31] Update app/views/evaluation_forms/_form.html.erb

Co-authored-by: Stephen Chudleigh <stepchud@users.noreply.github.com>
---
 app/views/evaluation_forms/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/evaluation_forms/_form.html.erb b/app/views/evaluation_forms/_form.html.erb
index e7ce86c1..b6be560d 100644
--- a/app/views/evaluation_forms/_form.html.erb
+++ b/app/views/evaluation_forms/_form.html.erb
@@ -177,7 +177,7 @@
         </div>
         <div class="usa-hint" id="evaluation_form_closing_date_hint">mm/dd/yyyy</div>
 
-        <div data-evaluation-form-target="datePicker" class="usa-date-picker" data-default-value="<%= evaluation_form.closing_date %>" data-min-date="<%= @phase.challenge.end_date %>">
+        <div data-evaluation-form-target="datePicker" class="usa-date-picker" data-default-value="<%= evaluation_form.closing_date %>" data-min-date="<%= @phase.end_date %>">
           <input
             class="usa-input <%= input_error_class(form, :closing_date) %>"
             id="evaluation_form_closing_date"

From b582361a2e6aeed85e9eab983ce79a714bc661c2 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <51140224+stonefilipczak@users.noreply.github.com>
Date: Wed, 19 Feb 2025 12:43:38 -0500
Subject: [PATCH 23/31] Update config/routes.rb

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

diff --git a/config/routes.rb b/config/routes.rb
index a3b2769c..017e7b17 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -28,7 +28,7 @@
       end
     end
     resources :evaluator_submission_assignments, only: [:index, :update, :create]
-    resources :evaluation_forms do
+    resources :evaluation_forms, except: [:index] do
       member do
         get 'confirmation'
         post 'clone'

From d36256c33af66b4f6ce5283e56d68ca7b07c3620 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <51140224+stonefilipczak@users.noreply.github.com>
Date: Wed, 19 Feb 2025 12:43:58 -0500
Subject: [PATCH 24/31] Update app/views/evaluation_forms/_form.html.erb

Co-authored-by: Stephen Chudleigh <stepchud@users.noreply.github.com>
---
 app/views/evaluation_forms/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/evaluation_forms/_form.html.erb b/app/views/evaluation_forms/_form.html.erb
index b6be560d..990d85d8 100644
--- a/app/views/evaluation_forms/_form.html.erb
+++ b/app/views/evaluation_forms/_form.html.erb
@@ -168,7 +168,7 @@
       </p>
 
       <div class="usa-label text-bold font-sans-sm">Evaluation Start Date:</div>
-      <div class="usa-hint"><%= @phase.challenge.end_date.strftime('%m/%d/%Y') %></div>
+      <div class="usa-hint"><%= @phase.end_date.strftime('%m/%d/%Y') %></div>
 
       <div class="usa-form-group">
         <div class="display-flex flex-align-center text-bold">

From 97e3f614843863f063661185728e9ffa1df5d812 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 19 Feb 2025 13:12:46 -0500
Subject: [PATCH 25/31] dashboard revert

---
 app/controllers/dashboard_controller.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index a99823d2..da2ff379 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -2,7 +2,5 @@
 
 # The dashboard controller serves the logged-in homepage of the app.
 class DashboardController < ApplicationController
-  def index
-    redirect_to "/"
-  end
+  def index; end
 end

From 25f7236f04ad19c704c821dfb6ef6a27aca0fefa Mon Sep 17 00:00:00 2001
From: Stephen Chudleigh <stephen.chudleigh@gmail.com>
Date: Wed, 19 Feb 2025 11:12:33 -0800
Subject: [PATCH 26/31] refactor the redirect_to_landing_page method

---
 app/controllers/application_controller.rb  | 21 +++++++++++++--------
 app/controllers/dashboard_controller.rb    |  6 ------
 app/controllers/dev/accounts_controller.rb |  8 ++------
 app/controllers/pages_controller.rb        |  2 +-
 app/controllers/sessions_controller.rb     |  2 +-
 config/routes.rb                           |  2 --
 spec/requests/evaluations_spec.rb          |  4 ++--
 spec/requests/pages_spec.rb                |  4 ++--
 spec/requests/phases_spec.rb               |  4 ++--
 spec/requests/sessions_request_spec.rb     |  4 ++--
 spec/requests/submissions_spec.rb          |  4 ++--
 11 files changed, 27 insertions(+), 34 deletions(-)
 delete mode 100644 app/controllers/dashboard_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 90355770..727def16 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -29,7 +29,7 @@ def logged_in?
   def authorize_user(*roles)
     return if roles.include?(current_user&.role) || %w[super_admin admin].include?(current_user&.role)
 
-    redirect_to dashboard_path, alert: I18n.t("access_denied")
+    redirect_to_landing_page(alert: I18n.t("access_denied"))
   end
 
   def redirect_admins_to_phoenix
@@ -44,6 +44,17 @@ def redirect_solvers_to_phoenix
     redirect_to Rails.configuration.phx_interop[:phx_uri], allow_other_host: true
   end
 
+  def redirect_to_landing_page(options = {})
+    case @current_user&.role
+    when "evaluator"
+      redirect_to evaluations_path, options
+    when "challenge_manager"
+      redirect_to phases_path, options
+    else
+      redirect_to "/", options
+    end
+  end
+
   def sign_in(login_userinfo)
     user = User.user_from_userinfo(login_userinfo)
 
@@ -73,18 +84,12 @@ def check_session_expiration
 
     if session[:session_timeout_at].blank? || session[:session_timeout_at] < Time.current
       sign_out
-      redirect_to dashboard_path, alert: I18n.t("session_expired_alert")
+      redirect_to "/", alert: I18n.t("session_expired_alert")
     else
       renew_session
     end
   end
 
-  def redirect_if_logged_in(path = "/dashboard")
-    return unless logged_in?
-
-    redirect_to path, notice: I18n.t("already_logged_in_notice")
-  end
-
   def generate_user_jwt(user)
     payload = {
       email: user.email,
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
deleted file mode 100644
index da2ff379..00000000
--- a/app/controllers/dashboard_controller.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-# The dashboard controller serves the logged-in homepage of the app.
-class DashboardController < ApplicationController
-  def index; end
-end
diff --git a/app/controllers/dev/accounts_controller.rb b/app/controllers/dev/accounts_controller.rb
index a1d95ac9..08010513 100644
--- a/app/controllers/dev/accounts_controller.rb
+++ b/app/controllers/dev/accounts_controller.rb
@@ -14,12 +14,8 @@ def login
       @current_user = User.find_by(email:)
       renew_session
       session[:userinfo] = [{ "email" => email, "sub" => @current_user.token }]
-      case @current_user.role
-      when "evaluator"
-        redirect_to evaluations_path
-      else
-        redirect_to phases_path
-      end
+
+      redirect_to_landing_page
     end
   end
 end
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 79cb99e9..ca152fc8 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -15,7 +15,7 @@ def index
     path = "#{BASE_URL}/#{params[:path]}/"
     reverse_proxy(HOST, path:, reset_accept_encoding: true, headers: { host: DOMAIN }) do |config|
       config.on_missing do |_code, _response|
-        redirect_to "/dashboard"
+        redirect_to "/"
         return true
       end
 
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 1d6be238..ec5e7874 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -26,7 +26,7 @@ def destroy
 
   def result
     sign_in(@login_userinfo)
-    redirect_to dashboard_path
+    redirect_to_landing_page
   end
 
   def renew
diff --git a/config/routes.rb b/config/routes.rb
index 017e7b17..6554b8b4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -8,8 +8,6 @@
     delete 'timeout'
   end
 
-  get '/dashboard', to: "dashboard#index"
-
   resources :evaluations, only: %i[index edit create update] do
     member do
       get 'confirmation'
diff --git a/spec/requests/evaluations_spec.rb b/spec/requests/evaluations_spec.rb
index 77dbd376..5f1b3d1e 100644
--- a/spec/requests/evaluations_spec.rb
+++ b/spec/requests/evaluations_spec.rb
@@ -31,10 +31,10 @@
         create_and_log_in_user(role: "challenge_manager")
       end
 
-      it "redirects to the dashboard" do
+      it "redirects to the challenge manager landing page" do
         get evaluations_path
 
-        expect(response).to redirect_to(dashboard_path)
+        expect(response).to redirect_to(phases_path)
       end
     end
 
diff --git a/spec/requests/pages_spec.rb b/spec/requests/pages_spec.rb
index 02c272ae..fbee2b73 100644
--- a/spec/requests/pages_spec.rb
+++ b/spec/requests/pages_spec.rb
@@ -33,11 +33,11 @@
     expect(response).to be_ok
   end
 
-  it "404s to the dashboard" do
+  it "404s to the root path" do
     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")
+    expect(response).to redirect_to("/")
   end
 end
diff --git a/spec/requests/phases_spec.rb b/spec/requests/phases_spec.rb
index 43a30397..e6b627f3 100644
--- a/spec/requests/phases_spec.rb
+++ b/spec/requests/phases_spec.rb
@@ -63,10 +63,10 @@
         create_and_log_in_user(role: "evaluator")
       end
 
-      it "redirects to the dashboard" do
+      it "redirects to the evaluator landing page" do
         get phases_path
 
-        expect(response).to redirect_to(dashboard_path)
+        expect(response).to redirect_to(evaluations_path)
       end
     end
 
diff --git a/spec/requests/sessions_request_spec.rb b/spec/requests/sessions_request_spec.rb
index cce5ace2..8c669c5c 100644
--- a/spec/requests/sessions_request_spec.rb
+++ b/spec/requests/sessions_request_spec.rb
@@ -29,14 +29,14 @@
     expect(flash[:error]).to include("Please try again.")
   end
 
-  it "get /auth/result successful" do
+  it "get /auth/result successful redirects to / for default user roles" do
     user = User.new(email: "test@example.com", token: SecureRandom.uuid)
     code = "ABC123"
     mock_login_gov(user, code)
 
     get "/auth/result", params: { code: }
     expect(response).to have_http_status(:redirect)
-    expect(response).to redirect_to("/dashboard")
+    expect(response).to redirect_to("/")
   end
 
   it "times out the session" do
diff --git a/spec/requests/submissions_spec.rb b/spec/requests/submissions_spec.rb
index df87865d..efb9fd17 100644
--- a/spec/requests/submissions_spec.rb
+++ b/spec/requests/submissions_spec.rb
@@ -140,10 +140,10 @@
     context "when logged in as an evaluator" do
       let(:user) { create_user(role: "evaluator") }
 
-      it "redirects to the dashboard" do
+      it "redirects to the landing page" do
         get submissions_phase_path(phase)
 
-        expect(response).to redirect_to(dashboard_path)
+        expect(response).to redirect_to(evaluations_path)
       end
     end
 

From 8a11194ddf94cfaac890fb47281747cb7154f9dd Mon Sep 17 00:00:00 2001
From: Stephen Chudleigh <stephen.chudleigh@gmail.com>
Date: Wed, 19 Feb 2025 11:40:37 -0800
Subject: [PATCH 27/31] add phase.evaluation_status

---
 app/helpers/phases_helper.rb            | 10 ----------
 app/models/phase.rb                     | 14 ++++++++++++++
 app/views/phases/_phases_table.html.erb |  4 +++-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/helpers/phases_helper.rb b/app/helpers/phases_helper.rb
index 4dc9f5e3..b11fafb3 100644
--- a/app/helpers/phases_helper.rb
+++ b/app/helpers/phases_helper.rb
@@ -21,14 +21,4 @@ def statuses
       archived: "Archived"
     }
   end
-
-  def evaluation_status(phase)
-    if phase.submissions.eligible_for_evaluation.where.not(status: [:in_progress, :completed]).exists?
-      "Not Started"
-    elsif phase.submissions.eligible_for_evaluation.where.not(status: [:not_started, :in_progress]).exists?
-      "Completed"
-    else
-      "In Progress"
-    end
-  end
 end
diff --git a/app/models/phase.rb b/app/models/phase.rb
index ddbbdceb..792407af 100644
--- a/app/models/phase.rb
+++ b/app/models/phase.rb
@@ -50,4 +50,18 @@ class Phase < ApplicationRecord
 
   # Validations
   validates :title, :start_date, :end_date, presence: true
+
+  def evaluation_status
+    eligible_for_evaluation_exists = submissions.eligible_for_evaluation.exists?
+    in_progress_or_completed_exists = submissions.eligible_for_evaluation.where(evaluation_status: [:in_progress, :completed]).exists?
+    in_progress_exists = submissions.eligible_for_evaluation.where(evaluation_status: :in_progress).exists?
+    if !eligible_for_evaluation_exists || !in_progress_or_completed_exists
+      # no submissions are eligible for evaluation, or if they do they are all currently not_started
+      :not_started
+    elsif !in_progress_exists
+      :completed
+    else
+      :in_progress
+    end
+  end
 end
diff --git a/app/views/phases/_phases_table.html.erb b/app/views/phases/_phases_table.html.erb
index e434c4b2..88c051e1 100644
--- a/app/views/phases/_phases_table.html.erb
+++ b/app/views/phases/_phases_table.html.erb
@@ -56,7 +56,9 @@
               <%= phase.evaluation_form&.closing_date %>
             </td>
             <td data-label="Evaluation Status" class="text-top">
-              <%= evaluation_status(phase) %>
+              <span class="text-top text-no-wrap usa-tag <%= evaluation_submission_assignment_status_color(phase) %>">
+                <%= phase.evaluation_status.to_s.titleize %>
+              </span>
             </td>
             </td>  
           </tr>

From ff8e3a6a7a0cbe8b998cd308473ea4e715eec002 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Wed, 19 Feb 2025 18:11:45 -0500
Subject: [PATCH 28/31] phase spec

---
 spec/models/phase_spec.rb | 141 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100644 spec/models/phase_spec.rb

diff --git a/spec/models/phase_spec.rb b/spec/models/phase_spec.rb
new file mode 100644
index 00000000..ae373887
--- /dev/null
+++ b/spec/models/phase_spec.rb
@@ -0,0 +1,141 @@
+# == Schema Information
+#
+# Table name: phases
+#
+#  id                     :bigint           not null, primary key
+#  challenge_id           :bigint           not null
+#  uuid                   :uuid             not null
+#  title                  :string(255)
+#  start_date             :datetime
+#  end_date               :datetime
+#  open_to_submissions    :boolean
+#  judging_criteria       :text
+#  judging_criteria_delta :text
+#  how_to_enter           :text
+#  how_to_enter_delta     :text
+#  inserted_at            :datetime         not null
+#  updated_at             :datetime         not null
+#  submissions_count      :integer          default(0), not null
+#
+require 'rails_helper'
+
+RSpec.describe Phase, type: :model do
+  let(:phase) { create(:phase) }
+
+  describe "evaluation status" do
+    context "with no submissions" do
+      it "returns not started" do
+        expect(phase.evaluation_status).to eq(:not_started)
+      end
+    end
+
+    context 'when a submission is assigned to an evaluator but no evaluations are in progress' do
+      let!(:submission) { create(:submission, phase: phase, judging_status: "selected") }
+      let!(:evaluator) { create(:user, role: :evaluator) }
+      let!(:assignment) do
+        create(:evaluator_submission_assignment,
+          submission: submission,
+          evaluator: evaluator,
+          status: :assigned)
+      end
+
+      it 'returns not_started' do
+        expect(phase.evaluation_status).to eq(:not_started)
+      end
+    end  
+
+    context 'when an evaluation is in progress but not completed' do
+      let!(:submission) { create(:submission, phase: phase, judging_status: "selected") }
+      let!(:evaluator) { create(:user, role: :evaluator) }
+      let!(:assignment) do
+        create(:evaluator_submission_assignment,
+          submission: submission,
+          evaluator: evaluator,
+          status: :assigned)
+      end
+
+      before do
+        create(:evaluation,
+          evaluator_submission_assignment: assignment,
+          submission: submission,
+          completed_at: nil)
+      end
+
+      it 'returns in_progress' do
+        expect(phase.evaluation_status).to eq(:in_progress)
+      end
+    end
+
+    context 'when some evaluations are completed but some are in progress' do
+      let!(:submission) { create(:submission, phase: phase, judging_status: "selected") }
+      let!(:evaluator) { create(:user, role: :evaluator) }
+      let!(:evaluator2) { create(:user, role: :evaluator) }
+      let!(:assignment) do
+        create(:evaluator_submission_assignment,
+          submission: submission,
+          evaluator: evaluator,
+          status: :assigned)
+      end
+      let!(:assignment2) do
+        create(:evaluator_submission_assignment,
+          submission: submission,
+          evaluator: evaluator2,
+          status: :assigned)
+      end
+
+      before do
+        create(:evaluation,
+          evaluator_submission_assignment: assignment,
+          submission: submission,
+          completed_at: nil)
+      end
+
+      before do
+        create(:evaluation,
+          evaluator_submission_assignment: assignment2,
+          submission: submission,
+          completed_at: Time.current)
+      end
+
+      it 'returns in_progress' do
+        expect(phase.evaluation_status).to eq(:in_progress)
+      end
+    end
+
+    context 'when all evaluations are complete' do
+      let!(:submission) { create(:submission, phase: phase, judging_status: "selected") }
+      let!(:evaluator) { create(:user, role: :evaluator) }
+      let!(:evaluator2) { create(:user, role: :evaluator) }
+      let!(:assignment) do
+        create(:evaluator_submission_assignment,
+          submission: submission,
+          evaluator: evaluator,
+          status: :assigned)
+      end
+      let!(:assignment2) do
+        create(:evaluator_submission_assignment,
+          submission: submission,
+          evaluator: evaluator2,
+          status: :assigned)
+      end
+
+      before do
+        create(:evaluation,
+          evaluator_submission_assignment: assignment,
+          submission: submission,
+          completed_at: Time.current)
+      end
+
+      before do
+        create(:evaluation,
+          evaluator_submission_assignment: assignment2,
+          submission: submission,
+          completed_at: Time.current)
+      end
+
+      it 'returns completed' do
+        expect(phase.evaluation_status).to eq(:completed)
+      end
+    end
+  end  
+end  
\ No newline at end of file

From d829c7895ab5287260b5518c1f7d29cb45052515 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Thu, 20 Feb 2025 09:14:19 -0500
Subject: [PATCH 29/31] rubocop

---
 app/models/phase.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/phase.rb b/app/models/phase.rb
index 792407af..52f1f057 100644
--- a/app/models/phase.rb
+++ b/app/models/phase.rb
@@ -53,8 +53,9 @@ class Phase < ApplicationRecord
 
   def evaluation_status
     eligible_for_evaluation_exists = submissions.eligible_for_evaluation.exists?
-    in_progress_or_completed_exists = submissions.eligible_for_evaluation.where(evaluation_status: [:in_progress, :completed]).exists?
-    in_progress_exists = submissions.eligible_for_evaluation.where(evaluation_status: :in_progress).exists?
+    in_progress_or_completed_exists = submissions.eligible_for_evaluation.exists?(evaluation_status: [:in_progress,
+                                                                                                      :completed])
+    in_progress_exists = submissions.eligible_for_evaluation.exists?(evaluation_status: :in_progress)
     if !eligible_for_evaluation_exists || !in_progress_or_completed_exists
       # no submissions are eligible for evaluation, or if they do they are all currently not_started
       :not_started

From ba624f91b4557fa86cbe17a14204910a7c172bf4 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Thu, 20 Feb 2025 09:20:30 -0500
Subject: [PATCH 30/31] fix spec that merge broke

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

diff --git a/spec/requests/evaluations_spec.rb b/spec/requests/evaluations_spec.rb
index 69a82369..a2fb203a 100644
--- a/spec/requests/evaluations_spec.rb
+++ b/spec/requests/evaluations_spec.rb
@@ -302,7 +302,7 @@
 
           # redirected to landing page
           get revision_evaluation_path(evaluation)
-          expect(response).to redirect_to(dashboard_path)
+          expect(response).to redirect_to(evaluations_path)
           follow_redirect!
           expect(response.body).to have_css('p.usa-alert__text', text: I18n.t("access_denied"))
         end

From 76b127502c0be3823b0c5e4e219b4681c098c153 Mon Sep 17 00:00:00 2001
From: Stone Filipczak <stone@smartlogic.io>
Date: Thu, 20 Feb 2025 10:05:46 -0500
Subject: [PATCH 31/31] everything

---
 app/views/evaluations/_phases_table.html.erb | 33 +++++++++-----------
 app/views/evaluations/index.html.erb         |  3 +-
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/app/views/evaluations/_phases_table.html.erb b/app/views/evaluations/_phases_table.html.erb
index 36e4cc20..f0c0d9dc 100644
--- a/app/views/evaluations/_phases_table.html.erb
+++ b/app/views/evaluations/_phases_table.html.erb
@@ -2,10 +2,9 @@
   <thead>
     <tr>
       <th scope="col">Challenge</th>
-      <th scope="col">Assigned to me</th>
-      <th scope="col">Remaining to evaluate</th>
-      <th scope="col">Due by</th>
-      <th scope="col"><span class="usa-sr-only">Evaluate</span></th>
+      <th scope="col"># of Submissions to Evaluate</th>
+      <th scope="col">Evaluation Due Date</th>
+      <th scope="col">Evaluation Status</th>
     </tr>
   </thead>
   <tbody>
@@ -14,26 +13,24 @@
         <th data-label="Challenge Title" scope="row" class="text-top">
           <%= challenge_phase_title(phase.challenge, phase) %>
         </th>
-        <td data-label="Assigned to me" class="text-top">
-          <%= assigned_submissions_count(current_user, phase.challenge, phase) %>
-        </td>
-        <td data-label="Remaining to evaluate" class="text-top">
-          <%= remaining_evaluations_count(current_user, phase.challenge, phase) %>
+        <td data-label="# of Submissions to Evaluate" class="text-top">
+          <%= link_to submissions_evaluation_path(phase) do %>
+            <%= assigned_submissions_count(current_user, phase.challenge, phase) %> of 
+            <%= remaining_evaluations_count(current_user, phase.challenge, phase) %>
+          <% end %>
         </td>
-        <td data-label="Due by" class="text-top">
+        <td data-label="Evaluation Due Date" class="text-top">
           <% if phase.evaluation_form %>
-            <%= phase.evaluation_form.closing_date %>
+            <%= phase.evaluation_form.closing_date.strftime('%m/%d/%Y') %>
           <% else %>
             N/A
           <% end %>
         </td>
-        <td>
-          <div class="display-flex flex-column grid-row grid-gap-1 padding-bottom-2">
-            <%= link_to submissions_evaluation_path(phase), class: "usa-button font-body-2xs text-no-wrap width-full" do %>
-              View Submissions
-            <% end %>
-          </div>
-        </td>  
+        <td data-label="Evaluation Status" class="text-top">
+          <span class="text-top text-no-wrap usa-tag <%= evaluation_submission_assignment_status_color(phase) %>">
+            <%= phase.evaluation_status.to_s.titleize %>
+          </span>
+        </td> 
       </tr>
     <% end %>
   </tbody>
diff --git a/app/views/evaluations/index.html.erb b/app/views/evaluations/index.html.erb
index a19d9710..54add4c4 100644
--- a/app/views/evaluations/index.html.erb
+++ b/app/views/evaluations/index.html.erb
@@ -1,5 +1,4 @@
-<h1>Evaluations</h1>
-<p class="text-normal padding-bottom-2">View challenges with submissions assigned to me to evaluate.</p>
+<h1>My Evaluations</h1>
 
 <% if @phases.empty? %>
   <div class="text-normal">