From 43dd31207b31f19f94fda9f9f0123c44e450755f Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Thu, 29 Jul 2021 12:20:43 -0400
Subject: [PATCH 01/30] twig fixes

---
 site/app/templates/autograding/PeerResults.twig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/site/app/templates/autograding/PeerResults.twig b/site/app/templates/autograding/PeerResults.twig
index cd0cc6b39d..57d3ec9a02 100644
--- a/site/app/templates/autograding/PeerResults.twig
+++ b/site/app/templates/autograding/PeerResults.twig
@@ -92,13 +92,13 @@ function switch_feedback_modes() {
                     {% endif %}
                 {% endfor %}
             </div>
-            {{ self.renderPeerFeedbackTable(peer_components, peer_aliases, ordered_graders, overall_comments, uploaded_pdfs, annotated_file_names, student_pdf_view_url, user_id, gradeable_id, peer_feedback, anon_grader_id_mapping)  }}
+            {{ self.renderPeerFeedbackTable(peer_components, peer_aliases, ordered_graders, overall_comments, uploaded_pdfs, annotated_file_names, student_pdf_view_url, user_id, gradeable_id, peer_feedback, anon_grader_id_mapping, num_decimals)  }}
             {# /Peer Component boxes #}
         {% endif %}
 
         {# Overview #}
         <div id="comments_wrapper" class="no-border-box" style="padding: 10px; word-break: break-word;">
-            {% for user in ordered_graders|filter(user => overall_comments[user] is not empty) %}
+            {% for user in ordered_graders|filter(user => overall_comments[user] is defined) %}
                 <div class="overall-comment-box">
                     <p class="overall-comment-author">
                         Overall note from {{peer_aliases[user]}}:
@@ -220,7 +220,7 @@ function switch_feedback_modes() {
     </div>
 {%- endmacro -%}
 
-{%- macro renderPeerFeedbackTable(peer_components, peer_aliases, ordered_graders, overall_comments, uploaded_pdfs, annotated_file_names, student_pdf_view_url, user_id, gradeable_id, peer_feedback, anon_grader_id_mapping) -%}
+{%- macro renderPeerFeedbackTable(peer_components, peer_aliases, ordered_graders, overall_comments, uploaded_pdfs, annotated_file_names, student_pdf_view_url, user_id, gradeable_id, peer_feedback, anon_grader_id_mapping, num_decimals) -%}
     <div id="peer_feedback_wrapper" style="display: none;">
         <div class="box grade-results">
             {% for grader in ordered_graders %}
@@ -253,7 +253,7 @@ function switch_feedback_modes() {
                         {% endfor %}
                     </tbody>
                 </table>
-                {% if overall_comments[anon_grader_id_mapping[grader]] is not empty %}
+                {% if overall_comments[anon_grader_id_mapping[grader]] is defined %}
                     <div class="overall-comment-box">
                         <p class="overall-comment-author">
                             Overall note from grader:
@@ -265,7 +265,7 @@ function switch_feedback_modes() {
                 {% endif %}
 
             {% for file in uploaded_pdfs %}
-                {% if file.encoded_name in annotated_file_names and grader in file.graders%}
+                {% if file.encoded_name is defined and file.encoded_name in annotated_file_names and grader in file.graders%}
                     </br>
                     <p>
                         {{file.name}} :

From 2d07ecae8ecdfd95c3cbfdf50c4b88597dbe0996 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Thu, 29 Jul 2021 12:22:20 -0400
Subject: [PATCH 02/30] Revert "twig fixes"

This reverts commit 43dd31207b31f19f94fda9f9f0123c44e450755f.
---
 site/app/templates/autograding/PeerResults.twig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/site/app/templates/autograding/PeerResults.twig b/site/app/templates/autograding/PeerResults.twig
index 57d3ec9a02..cd0cc6b39d 100644
--- a/site/app/templates/autograding/PeerResults.twig
+++ b/site/app/templates/autograding/PeerResults.twig
@@ -92,13 +92,13 @@ function switch_feedback_modes() {
                     {% endif %}
                 {% endfor %}
             </div>
-            {{ self.renderPeerFeedbackTable(peer_components, peer_aliases, ordered_graders, overall_comments, uploaded_pdfs, annotated_file_names, student_pdf_view_url, user_id, gradeable_id, peer_feedback, anon_grader_id_mapping, num_decimals)  }}
+            {{ self.renderPeerFeedbackTable(peer_components, peer_aliases, ordered_graders, overall_comments, uploaded_pdfs, annotated_file_names, student_pdf_view_url, user_id, gradeable_id, peer_feedback, anon_grader_id_mapping)  }}
             {# /Peer Component boxes #}
         {% endif %}
 
         {# Overview #}
         <div id="comments_wrapper" class="no-border-box" style="padding: 10px; word-break: break-word;">
-            {% for user in ordered_graders|filter(user => overall_comments[user] is defined) %}
+            {% for user in ordered_graders|filter(user => overall_comments[user] is not empty) %}
                 <div class="overall-comment-box">
                     <p class="overall-comment-author">
                         Overall note from {{peer_aliases[user]}}:
@@ -220,7 +220,7 @@ function switch_feedback_modes() {
     </div>
 {%- endmacro -%}
 
-{%- macro renderPeerFeedbackTable(peer_components, peer_aliases, ordered_graders, overall_comments, uploaded_pdfs, annotated_file_names, student_pdf_view_url, user_id, gradeable_id, peer_feedback, anon_grader_id_mapping, num_decimals) -%}
+{%- macro renderPeerFeedbackTable(peer_components, peer_aliases, ordered_graders, overall_comments, uploaded_pdfs, annotated_file_names, student_pdf_view_url, user_id, gradeable_id, peer_feedback, anon_grader_id_mapping) -%}
     <div id="peer_feedback_wrapper" style="display: none;">
         <div class="box grade-results">
             {% for grader in ordered_graders %}
@@ -253,7 +253,7 @@ function switch_feedback_modes() {
                         {% endfor %}
                     </tbody>
                 </table>
-                {% if overall_comments[anon_grader_id_mapping[grader]] is defined %}
+                {% if overall_comments[anon_grader_id_mapping[grader]] is not empty %}
                     <div class="overall-comment-box">
                         <p class="overall-comment-author">
                             Overall note from grader:
@@ -265,7 +265,7 @@ function switch_feedback_modes() {
                 {% endif %}
 
             {% for file in uploaded_pdfs %}
-                {% if file.encoded_name is defined and file.encoded_name in annotated_file_names and grader in file.graders%}
+                {% if file.encoded_name in annotated_file_names and grader in file.graders%}
                     </br>
                     <p>
                         {{file.name}} :

From 9f214d93e9e3c2d645cd4271760903d87da32c44 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Wed, 8 Sep 2021 15:23:39 -0400
Subject: [PATCH 03/30] add alert message

---
 site/app/models/Button.php              |  4 ++++
 site/app/models/gradeable/Gradeable.php | 15 +++++++++++++++
 site/app/templates/Navigation.twig      |  1 +
 site/app/views/NavigationView.php       |  6 ++++--
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/site/app/models/Button.php b/site/app/models/Button.php
index be19ff8e47..fb1902ee01 100644
--- a/site/app/models/Button.php
+++ b/site/app/models/Button.php
@@ -15,6 +15,7 @@
  * @method string getClass()
  * @method string|null getId()
  * @method bool isDisabled()
+ * @method string getPrerequisite()
  * @method bool isTitleOnHover()
  * @method float|null getProgress()
  * @method string|null getAriaLabel()
@@ -54,6 +55,8 @@ class Button extends AbstractModel {
     protected $id;
     /** @prop @var bool $disabled */
     protected $disabled;
+    /** @prop @var string $prerequisite */
+    protected $prerequisite;
     /** @prop @var float|null $progress */
     protected $progress;
     /** @prop @var bool $title_on_hover */
@@ -81,6 +84,7 @@ public function __construct(Core $core, array $details) {
         $this->class    = $details["class"] ?? "btn";
         $this->id       = $details["id"] ?? null;
         $this->disabled = $details["disabled"] ?? false;
+        $this->prerequisite = $details["prerequisite"] ?? null;
         $this->progress = $details["progress"] ?? null;
         if ($this->progress !== null) {
             $this->progress = floatval($this->progress);
diff --git a/site/app/models/gradeable/Gradeable.php b/site/app/models/gradeable/Gradeable.php
index d2e1f8163b..065db2961c 100644
--- a/site/app/models/gradeable/Gradeable.php
+++ b/site/app/models/gradeable/Gradeable.php
@@ -2206,4 +2206,19 @@ public function isLocked(string $user_id): bool {
         }
         return true;
     }
+    /**
+     * Returns prerequisite for a gradeable
+     *
+     * @return string
+     */
+    public function getPrerequisite(): string  {
+        if ($this->depends_on !== null && $this->depends_on_points !== null) {
+            $dependent_gradeable = $this->core->getQueries()->getGradeableConfig($this->depends_on);
+            return $dependent_gradeable->getId();
+        }
+        else {
+            return '';
+        }
+    }
+
 }
diff --git a/site/app/templates/Navigation.twig b/site/app/templates/Navigation.twig
index c2bfafa535..44edf43bce 100644
--- a/site/app/templates/Navigation.twig
+++ b/site/app/templates/Navigation.twig
@@ -99,6 +99,7 @@
         <a class="{{ button.getClass() }}{{ (button.getTitle() == 'Edit' or button.getTitle() == 'Delete') and has_build_error ? 'edit-build-error' : '' }} {% if button.hasOnclick() %} key_to_click {% endif %}" tabindex="0"
             {% if button.isDisabled() %}
                 disabled
+                onclick="alert('Please complete {{ button.getPrerequisite()}} first' )"
             {% else %}
                 {# assigns the href unless button has onclick affect #}
                 {% if not button.hasOnclick() %}
diff --git a/site/app/views/NavigationView.php b/site/app/views/NavigationView.php
index 9b4bc3e29c..3928bb5361 100644
--- a/site/app/views/NavigationView.php
+++ b/site/app/views/NavigationView.php
@@ -591,10 +591,11 @@ public static function getSubmitButton(Core $core, Gradeable $gradeable, $graded
                 }
             }
         }
-
+        $prerequisite = '';
         if ($gradeable->isLocked($core->getUser()->getId())) {
             $disabled = true;
             $title = "LOCKED";
+            $prerequisite = $gradeable->getPrerequisite();
         }
 
         return new Button($core, [
@@ -605,7 +606,8 @@ public static function getSubmitButton(Core $core, Gradeable $gradeable, $graded
             "progress" => $progress,
             "disabled" => $disabled,
             "class" => "btn {$class} btn-nav btn-nav-submit",
-            "name" => "submit-btn"
+            "name" => "submit-btn",
+            "prerequisite" => $prerequisite
         ]);
     }
 

From d2931b932188393044e3dbf06a7babdf600e6832 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Wed, 8 Sep 2021 15:34:14 -0400
Subject: [PATCH 04/30] lint

---
 site/app/models/gradeable/Gradeable.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/site/app/models/gradeable/Gradeable.php b/site/app/models/gradeable/Gradeable.php
index 065db2961c..daa01dd61e 100644
--- a/site/app/models/gradeable/Gradeable.php
+++ b/site/app/models/gradeable/Gradeable.php
@@ -2211,7 +2211,7 @@ public function isLocked(string $user_id): bool {
      *
      * @return string
      */
-    public function getPrerequisite(): string  {
+    public function getPrerequisite(): string {
         if ($this->depends_on !== null && $this->depends_on_points !== null) {
             $dependent_gradeable = $this->core->getQueries()->getGradeableConfig($this->depends_on);
             return $dependent_gradeable->getId();
@@ -2220,5 +2220,4 @@ public function getPrerequisite(): string  {
             return '';
         }
     }
-
 }

From b3a45b662e3599137d7453320b1b1450511731cc Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Fri, 10 Sep 2021 17:46:51 -0400
Subject: [PATCH 05/30] requested changes

---
 site/app/models/gradeable/Gradeable.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/app/models/gradeable/Gradeable.php b/site/app/models/gradeable/Gradeable.php
index daa01dd61e..56c4a3965f 100644
--- a/site/app/models/gradeable/Gradeable.php
+++ b/site/app/models/gradeable/Gradeable.php
@@ -2214,7 +2214,7 @@ public function isLocked(string $user_id): bool {
     public function getPrerequisite(): string {
         if ($this->depends_on !== null && $this->depends_on_points !== null) {
             $dependent_gradeable = $this->core->getQueries()->getGradeableConfig($this->depends_on);
-            return $dependent_gradeable->getId();
+            return $dependent_gradeable->getTitle();
         }
         else {
             return '';

From 1872b1655ce6fc2cb46f6bececef3724a4f1bc34 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Wed, 15 Sep 2021 18:57:16 -0400
Subject: [PATCH 06/30] add tooltip

---
 site/app/templates/Navigation.twig |  6 +++++-
 site/public/css/navigation.css     | 27 +++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/site/app/templates/Navigation.twig b/site/app/templates/Navigation.twig
index 44edf43bce..71b1ff867b 100644
--- a/site/app/templates/Navigation.twig
+++ b/site/app/templates/Navigation.twig
@@ -96,7 +96,7 @@
     {% if button is null %}
         <div class="button-placeholder"></div>
     {% else %}
-        <a class="{{ button.getClass() }}{{ (button.getTitle() == 'Edit' or button.getTitle() == 'Delete') and has_build_error ? 'edit-build-error' : '' }} {% if button.hasOnclick() %} key_to_click {% endif %}" tabindex="0"
+        <a class="locked-gradeable-tooltip {{ button.getClass() }}{{ (button.getTitle() == 'Edit' or button.getTitle() == 'Delete') and has_build_error ? 'edit-build-error' : '' }} {% if button.hasOnclick() %} key_to_click {% endif %}" tabindex="0"
             {% if button.isDisabled() %}
                 disabled
                 onclick="alert('Please complete {{ button.getPrerequisite()}} first' )"
@@ -115,6 +115,9 @@
                 aria-label="{{ button.getAriaLabel() }}"
             {% endif %}
         >
+            {% if button.isDisabled() %}
+                <span class="locked-gradeable-tooltiptext" disabled="none">Please complete {{ button.getPrerequisite()}} first</span>
+            {% endif %}
             {% if button.getBadge() > 0 %}
                 <span class="notification-badge">{{  button.getBadge() }} </span>
             {% endif %}
@@ -140,3 +143,4 @@
         {% endif %}
     {% endif %}
 {% endmacro %}
+
diff --git a/site/public/css/navigation.css b/site/public/css/navigation.css
index 918d92724d..1f0f2fc28f 100644
--- a/site/public/css/navigation.css
+++ b/site/public/css/navigation.css
@@ -79,6 +79,33 @@
     display: inline;
 }
 
+.locked-gradeable-tooltip {
+    position: relative;
+    display: inline-block;
+}
+
+/* Tooltip text */
+.locked-gradeable-tooltip .locked-gradeable-tooltiptext {
+    visibility: hidden;
+    background-color: var(--standard-vibrant-dark-blue);
+    color: white;
+    text-align: center;
+    padding: 5px 0;
+    border-radius: 6px;
+
+    /* Position the tooltip text - see examples below! */
+    position: absolute;
+    z-index: 3;
+    top: -10%;
+    right: 105%;
+    margin-left: -60px;
+}
+
+/* Show the tooltip text when you mouse over the tooltip container */
+.locked-gradeable-tooltip:hover .locked-gradeable-tooltiptext {
+    visibility: visible;
+}
+
 @media (max-width: 401px) {
     .course-section-heading,
     .course-main .course-title {

From eed421e406344fa1f8a38f68043396487e981adc Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Mon, 20 Sep 2021 20:26:39 -0400
Subject: [PATCH 07/30] change tooltip

---
 site/app/templates/Navigation.twig |  6 ++----
 site/public/css/navigation.css     | 27 ---------------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/site/app/templates/Navigation.twig b/site/app/templates/Navigation.twig
index 71b1ff867b..746b53950e 100644
--- a/site/app/templates/Navigation.twig
+++ b/site/app/templates/Navigation.twig
@@ -96,10 +96,11 @@
     {% if button is null %}
         <div class="button-placeholder"></div>
     {% else %}
-        <a class="locked-gradeable-tooltip {{ button.getClass() }}{{ (button.getTitle() == 'Edit' or button.getTitle() == 'Delete') and has_build_error ? 'edit-build-error' : '' }} {% if button.hasOnclick() %} key_to_click {% endif %}" tabindex="0"
+        <a class="{{ button.getClass() }}{{ (button.getTitle() == 'Edit' or button.getTitle() == 'Delete') and has_build_error ? 'edit-build-error' : '' }} {% if button.hasOnclick() %} key_to_click {% endif %}" tabindex="0"
             {% if button.isDisabled() %}
                 disabled
                 onclick="alert('Please complete {{ button.getPrerequisite()}} first' )"
+                title='Please complete {{ button.getPrerequisite()}} first'
             {% else %}
                 {# assigns the href unless button has onclick affect #}
                 {% if not button.hasOnclick() %}
@@ -115,9 +116,6 @@
                 aria-label="{{ button.getAriaLabel() }}"
             {% endif %}
         >
-            {% if button.isDisabled() %}
-                <span class="locked-gradeable-tooltiptext" disabled="none">Please complete {{ button.getPrerequisite()}} first</span>
-            {% endif %}
             {% if button.getBadge() > 0 %}
                 <span class="notification-badge">{{  button.getBadge() }} </span>
             {% endif %}
diff --git a/site/public/css/navigation.css b/site/public/css/navigation.css
index 1f0f2fc28f..918d92724d 100644
--- a/site/public/css/navigation.css
+++ b/site/public/css/navigation.css
@@ -79,33 +79,6 @@
     display: inline;
 }
 
-.locked-gradeable-tooltip {
-    position: relative;
-    display: inline-block;
-}
-
-/* Tooltip text */
-.locked-gradeable-tooltip .locked-gradeable-tooltiptext {
-    visibility: hidden;
-    background-color: var(--standard-vibrant-dark-blue);
-    color: white;
-    text-align: center;
-    padding: 5px 0;
-    border-radius: 6px;
-
-    /* Position the tooltip text - see examples below! */
-    position: absolute;
-    z-index: 3;
-    top: -10%;
-    right: 105%;
-    margin-left: -60px;
-}
-
-/* Show the tooltip text when you mouse over the tooltip container */
-.locked-gradeable-tooltip:hover .locked-gradeable-tooltiptext {
-    visibility: visible;
-}
-
 @media (max-width: 401px) {
     .course-section-heading,
     .course-main .course-title {

From 38521348ca4ff2f1c8b9e0a8c5f5419cbfb5e41d Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Tue, 21 Sep 2021 15:35:12 -0400
Subject: [PATCH 08/30] new add queue modal

---
 site/app/templates/officeHoursQueue/NewQueue.twig | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/site/app/templates/officeHoursQueue/NewQueue.twig b/site/app/templates/officeHoursQueue/NewQueue.twig
index 13064a288a..05f9baeb54 100644
--- a/site/app/templates/officeHoursQueue/NewQueue.twig
+++ b/site/app/templates/officeHoursQueue/NewQueue.twig
@@ -12,9 +12,11 @@
                 <i class="fas fa-dice"></i>
             </a>
         </div>
-    {% if viewer.isContactInfoEnabled() %}
+    <br>
+    Require contact information
+    <input type="checkbox" name="enable_contact_info" onclick="toggleQueueRegex()"><br>
+    <div class="contact-information-regex" style="display: none">
         <input type="text" id="regex" name="regex" placeholder="Contact Info Regex Pattern" aria-label="Regex" style="min-width: 45%; margin-top: 1rem;">
-
         <div class="regex-help">
             <br>You may optionally specify a regular expression to ensure your students enter the requested
             format for the contact information.  For example: <br>
@@ -25,7 +27,7 @@
             <b>Skype link:&nbsp;&nbsp;</b> <tt>.*join\.skype\.com.*</tt><br>
             <b>Zoom link:&nbsp;&nbsp;</b> <tt>.*zoom\.us.*</tt><br><br>
         </div>
-    {% endif %}
+    </div>
     <button id="open_new_queue_btn" type="submit" class="btn btn-primary" >Open New Queue</button>
     </form>
     <script>
@@ -36,6 +38,10 @@
         }).mouseup(function(ev) {
             queueDraggable.draggable('enable');
         });
+
+        function toggleQueueRegex(){
+            $('.contact-information-regex').toggle();
+        }
     </script>
 {% endblock %}
 {% block form %}

From 38351c9af8c1fd50b0c8a8b27b72d92a7b26ffb2 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Tue, 21 Sep 2021 15:44:59 -0400
Subject: [PATCH 09/30] get post request

---
 site/app/controllers/OfficeHoursQueueController.php | 2 ++
 site/app/templates/officeHoursQueue/NewQueue.twig   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/site/app/controllers/OfficeHoursQueueController.php b/site/app/controllers/OfficeHoursQueueController.php
index 7881614978..c6f1b53a51 100644
--- a/site/app/controllers/OfficeHoursQueueController.php
+++ b/site/app/controllers/OfficeHoursQueueController.php
@@ -64,6 +64,8 @@ public function openQueue() {
             );
         }
 
+        $require_contact_info = $_POST['require_contact_information'];
+
         //Replace whitespace with "_"
         $queue_code = trim($_POST['code']);
         $token = trim($_POST['token']);
diff --git a/site/app/templates/officeHoursQueue/NewQueue.twig b/site/app/templates/officeHoursQueue/NewQueue.twig
index 05f9baeb54..e48d8793d3 100644
--- a/site/app/templates/officeHoursQueue/NewQueue.twig
+++ b/site/app/templates/officeHoursQueue/NewQueue.twig
@@ -14,7 +14,7 @@
         </div>
     <br>
     Require contact information
-    <input type="checkbox" name="enable_contact_info" onclick="toggleQueueRegex()"><br>
+    <input type="checkbox" name="require_contact_information" onclick="toggleQueueRegex()"><br>
     <div class="contact-information-regex" style="display: none">
         <input type="text" id="regex" name="regex" placeholder="Contact Info Regex Pattern" aria-label="Regex" style="min-width: 45%; margin-top: 1rem;">
         <div class="regex-help">

From 3817eb24dffce76ee6b8f53e534ac6cf56933882 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Tue, 21 Sep 2021 20:15:58 -0400
Subject: [PATCH 10/30] database migration

---
 migration/migrator/data/course_tables.sql     | 21 +++---------
 migration/migrator/data/submitty_db.sql       | 30 +++++-----------
 ...921195244_add_queue_contact_info_column.py | 34 +++++++++++++++++++
 3 files changed, 46 insertions(+), 39 deletions(-)
 create mode 100644 migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py

diff --git a/migration/migrator/data/course_tables.sql b/migration/migrator/data/course_tables.sql
index d60ee41058..ff3f6cf186 100644
--- a/migration/migrator/data/course_tables.sql
+++ b/migration/migrator/data/course_tables.sql
@@ -13,20 +13,6 @@ SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
---
--- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
---
-
-CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
-
-
---
--- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
---
-
-COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
-
-
 --
 -- Name: notifications_component; Type: TYPE; Schema: public; Owner: -
 --
@@ -134,7 +120,7 @@ $_$;
 
 SET default_tablespace = '';
 
-SET default_with_oids = false;
+SET default_table_access_method = heap;
 
 --
 -- Name: categories_list; Type: TABLE; Schema: public; Owner: -
@@ -779,7 +765,7 @@ CREATE TABLE public.polls (
     release_date date NOT NULL,
     image_path text,
     question_type character varying(35) DEFAULT 'single-response-multiple-correct'::character varying,
-    release_histogram character varying(10) NOT NULL
+    release_histogram character varying(10) DEFAULT 'never'::character varying
 );
 
 
@@ -897,7 +883,8 @@ CREATE TABLE public.queue_settings (
     open boolean NOT NULL,
     code text NOT NULL,
     token text NOT NULL,
-    regex_pattern character varying
+    regex_pattern character varying,
+    contact_information boolean DEFAULT true NOT NULL
 );
 
 
diff --git a/migration/migrator/data/submitty_db.sql b/migration/migrator/data/submitty_db.sql
index 6bc783c55e..70f29ba78f 100644
--- a/migration/migrator/data/submitty_db.sql
+++ b/migration/migrator/data/submitty_db.sql
@@ -13,20 +13,6 @@ SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
---
--- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
---
-
-CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
-
-
---
--- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
---
-
-COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
-
-
 --
 -- Name: dblink; Type: EXTENSION; Schema: -; Owner: -
 --
@@ -285,7 +271,7 @@ CREATE FUNCTION public.sync_user() RETURNS trigger
 
 SET default_tablespace = '';
 
-SET default_with_oids = false;
+SET default_table_access_method = heap;
 
 --
 -- Name: courses; Type: TABLE; Schema: public; Owner: -
@@ -551,49 +537,49 @@ ALTER TABLE ONLY public.users
 -- Name: courses_users after_delete_sync_delete_user_cleanup; Type: TRIGGER; Schema: public; Owner: -
 --
 
-CREATE TRIGGER after_delete_sync_delete_user_cleanup AFTER DELETE ON public.courses_users FOR EACH ROW EXECUTE PROCEDURE public.sync_delete_user_cleanup();
+CREATE TRIGGER after_delete_sync_delete_user_cleanup AFTER DELETE ON public.courses_users FOR EACH ROW EXECUTE FUNCTION public.sync_delete_user_cleanup();
 
 
 --
 -- Name: courses_users before_delete_sync_delete_user; Type: TRIGGER; Schema: public; Owner: -
 --
 
-CREATE TRIGGER before_delete_sync_delete_user BEFORE DELETE ON public.courses_users FOR EACH ROW EXECUTE PROCEDURE public.sync_delete_user();
+CREATE TRIGGER before_delete_sync_delete_user BEFORE DELETE ON public.courses_users FOR EACH ROW EXECUTE FUNCTION public.sync_delete_user();
 
 
 --
 -- Name: courses_registration_sections delete_sync_registration_id; Type: TRIGGER; Schema: public; Owner: -
 --
 
-CREATE TRIGGER delete_sync_registration_id BEFORE DELETE ON public.courses_registration_sections FOR EACH ROW EXECUTE PROCEDURE public.sync_delete_registration_section();
+CREATE TRIGGER delete_sync_registration_id BEFORE DELETE ON public.courses_registration_sections FOR EACH ROW EXECUTE FUNCTION public.sync_delete_registration_section();
 
 
 --
 -- Name: users generate_api_key; Type: TRIGGER; Schema: public; Owner: -
 --
 
-CREATE TRIGGER generate_api_key BEFORE INSERT OR UPDATE OF user_password ON public.users FOR EACH ROW EXECUTE PROCEDURE public.generate_api_key();
+CREATE TRIGGER generate_api_key BEFORE INSERT OR UPDATE OF user_password ON public.users FOR EACH ROW EXECUTE FUNCTION public.generate_api_key();
 
 
 --
 -- Name: courses_registration_sections insert_sync_registration_id; Type: TRIGGER; Schema: public; Owner: -
 --
 
-CREATE TRIGGER insert_sync_registration_id AFTER INSERT OR UPDATE ON public.courses_registration_sections FOR EACH ROW EXECUTE PROCEDURE public.sync_insert_registration_section();
+CREATE TRIGGER insert_sync_registration_id AFTER INSERT OR UPDATE ON public.courses_registration_sections FOR EACH ROW EXECUTE FUNCTION public.sync_insert_registration_section();
 
 
 --
 -- Name: courses_users user_sync_courses_users; Type: TRIGGER; Schema: public; Owner: -
 --
 
-CREATE TRIGGER user_sync_courses_users AFTER INSERT OR UPDATE ON public.courses_users FOR EACH ROW EXECUTE PROCEDURE public.sync_courses_user();
+CREATE TRIGGER user_sync_courses_users AFTER INSERT OR UPDATE ON public.courses_users FOR EACH ROW EXECUTE FUNCTION public.sync_courses_user();
 
 
 --
 -- Name: users user_sync_users; Type: TRIGGER; Schema: public; Owner: -
 --
 
-CREATE TRIGGER user_sync_users AFTER UPDATE ON public.users FOR EACH ROW EXECUTE PROCEDURE public.sync_user();
+CREATE TRIGGER user_sync_users AFTER UPDATE ON public.users FOR EACH ROW EXECUTE FUNCTION public.sync_user();
 
 
 --
diff --git a/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py b/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py
new file mode 100644
index 0000000000..564e1e1647
--- /dev/null
+++ b/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py
@@ -0,0 +1,34 @@
+"""Migration for a given Submitty course database."""
+
+
+def up(config, database, semester, course):
+    """
+    Run up migration.
+
+    :param config: Object holding configuration details about Submitty
+    :type config: migrator.config.Config
+    :param database: Object for interacting with given database for environment
+    :type database: migrator.db.Database
+    :param semester: Semester of the course being migrated
+    :type semester: str
+    :param course: Code of course being migrated
+    :type course: str
+    """
+    sql = "ALTER TABLE queue_settings ADD COLUMN IF NOT EXISTS contact_information BOOLEAN NOT NULL DEFAULT TRUE;"
+    database.execute(sql)
+
+
+def down(config, database, semester, course):
+    """
+    Run down migration (rollback).
+
+    :param config: Object holding configuration details about Submitty
+    :type config: migrator.config.Config
+    :param database: Object for interacting with given database for environment
+    :type database: migrator.db.Database
+    :param semester: Semester of the course being migrated
+    :type semester: str
+    :param course: Code of course being migrated
+    :type course: str
+    """
+    pass

From 8c6d11bb2bff27e67282e846b3e568d3f3bb236b Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Wed, 22 Sep 2021 21:44:57 -0400
Subject: [PATCH 11/30] new ui for joining queue

---
 .../OfficeHoursQueueController.php            |  4 +--
 .../libraries/database/DatabaseQueries.php    |  6 ++---
 .../officeHoursQueue/QueueStatus.twig         | 25 ++++++++++++++++---
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/site/app/controllers/OfficeHoursQueueController.php b/site/app/controllers/OfficeHoursQueueController.php
index c6f1b53a51..d7471ba5bd 100644
--- a/site/app/controllers/OfficeHoursQueueController.php
+++ b/site/app/controllers/OfficeHoursQueueController.php
@@ -64,7 +64,7 @@ public function openQueue() {
             );
         }
 
-        $require_contact_info = $_POST['require_contact_information'];
+        $require_contact_info = $_POST['require_contact_information'] == "on";
 
         //Replace whitespace with "_"
         $queue_code = trim($_POST['code']);
@@ -80,7 +80,7 @@ public function openQueue() {
             );
         }
         $regex_pattern = isset($_POST['regex']) ? trim($_POST['regex']) : '';
-        if ($this->core->getQueries()->openQueue($queue_code, $token, $regex_pattern)) {
+        if ($this->core->getQueries()->openQueue($queue_code, $token, $regex_pattern, $require_contact_info)) {
             $this->core->addSuccessMessage("New queue added");
             Logger::logQueueActivity($this->core->getConfig()->getSemester(), $this->core->getDisplayedCourseName(), $queue_code, "CREATED");
         }
diff --git a/site/app/libraries/database/DatabaseQueries.php b/site/app/libraries/database/DatabaseQueries.php
index e338c7cafd..59e5717af2 100644
--- a/site/app/libraries/database/DatabaseQueries.php
+++ b/site/app/libraries/database/DatabaseQueries.php
@@ -4304,7 +4304,7 @@ public function getUsersNotificationSettings(array $user_ids) {
      * Gets All Parent Authors who this user responded to
      *
      * @param string $post_author_id current_user_id
-     * @param string $post_id        the parent post id
+     * @param string $post_id        the parent post idgetAllQueues
      */
     public function getAllParentAuthors(string $post_author_id, string $post_id) {
         $params = [$post_id];
@@ -6178,7 +6178,7 @@ public function isAnyQueueOpen() {
     }
 
 
-    public function openQueue($queue_code, $token, $regex_pattern) {
+    public function openQueue($queue_code, $token, $regex_pattern, $require_contact_info) {
         $this->course_db->query("SELECT * FROM queue_settings WHERE UPPER(TRIM(code)) = UPPER(TRIM(?))", [$queue_code]);
 
         //cannot have more than one queue with the same code
@@ -6186,7 +6186,7 @@ public function openQueue($queue_code, $token, $regex_pattern) {
             return false;
         }
 
-        $this->course_db->query("INSERT INTO queue_settings (open,code,token,regex_pattern) VALUES (TRUE, TRIM(?), TRIM(?), ?)", [$queue_code,$token,$regex_pattern]);
+        $this->course_db->query("INSERT INTO queue_settings (open,code,token,regex_pattern, contact_information) VALUES (TRUE, TRIM(?), TRIM(?), ?, ?)", [$queue_code,$token,$regex_pattern,$require_contact_info]);
         return true;
     }
 
diff --git a/site/app/templates/officeHoursQueue/QueueStatus.twig b/site/app/templates/officeHoursQueue/QueueStatus.twig
index ef267e1f8a..ce72377373 100644
--- a/site/app/templates/officeHoursQueue/QueueStatus.twig
+++ b/site/app/templates/officeHoursQueue/QueueStatus.twig
@@ -17,16 +17,32 @@
     <label for="token_box">Queue Access Code:</label>
     <input type="text" name="token" id="token_box" placeholder="Queue Access Code" style="margin:.5rem" autocomplete="on" required="required">
     <br>
-    {% if viewer.isContactInfoEnabled() %}
+    <div class="enter-contact-info" style="display: none">
       <label for="contact_info">My Contact Information (follow instructor directions):</label>
-      <input type="text" name="contact_info" id="contact_info" style="margin:.5rem" placeholder="Contact Information (follow instructor directions)" value="{{viewer.getContactInfo()}}" autocomplete="on" required="required">
+      <input type="text" name="contact_info" id="contact_info" style="margin:.5rem" placeholder="Contact Information (follow instructor directions)" value="{{viewer.getContactInfo()}}" autocomplete="on">
       <br>
-    {% endif %}
+    </div>
     <button id="join_queue_btn" type="submit" class="btn btn-primary">Join</button>
   </form>
     <script>
         $('#queue_code').change(function(){
-        document.getElementById('add_to_queue').action = '{{base_url}}/'+encodeURIComponent(this.value)+'/add';
+            document.getElementById('add_to_queue').action = '{{base_url}}/'+encodeURIComponent(this.value)+'/add';
+
+            const selected_queue =  $("#queue_code").val();
+            let queue='temp';
+            let found = false;
+            {% for queue in viewer.getAllQueues()|filter(queue => queue['contact_information'] == 'true') %}
+                queue = "{{ queue['code'] }}";
+                if (queue === selected_queue){
+                    $('.enter-contact-info').css('display', 'block');
+                    $('#contact_info').prop('required', true);
+                    found = true;
+                }
+            {% endfor %}
+            if (found === false){
+                $('.enter-contact-info').css('display', 'none');
+                $('#contact_info').prop('required', false);
+            }
         });
     </script>
 
@@ -115,3 +131,4 @@
     </form>
   </div>
 {% endif %}
+

From 344b622ee9415649cf1e89f27376c0bb16e855b7 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Wed, 22 Sep 2021 21:54:26 -0400
Subject: [PATCH 12/30] allow students to join without info

---
 .../OfficeHoursQueueController.php            | 39 +++++++++----------
 .../libraries/database/DatabaseQueries.php    |  5 +++
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/site/app/controllers/OfficeHoursQueueController.php b/site/app/controllers/OfficeHoursQueueController.php
index d7471ba5bd..721f0a47c0 100644
--- a/site/app/controllers/OfficeHoursQueueController.php
+++ b/site/app/controllers/OfficeHoursQueueController.php
@@ -119,31 +119,30 @@ public function addPerson($queue_code) {
                 new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
             );
         }
-
         $contact_info = null;
-        if ($this->core->getConfig()->getQueueContactInfo()) {
-            if (empty($_POST['contact_info'])) {
-                $this->core->addErrorMessage("Missing contact info");
-                return MultiResponse::RedirectOnlyResponse(
-                    new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
-                );
-            }
-            else {
-                $contact_info = trim($_POST['contact_info']);
-                //make sure contact information matches instructors regex pattern
-                $regex_pattern = $this->core->getQueries()->getQueueRegex($queue_code)[0]['regex_pattern'];
-                if ($regex_pattern !== '') {
-                    $regex_pattern = '#' . $regex_pattern . '#';
-                    if (preg_match($regex_pattern, $contact_info) == 0) {
-                        $this->core->addErrorMessage("Invalid contact information format.  Please re-read the course-specific instructions about the necessary information you should provide when you join this office hours queue.");
-                        return MultiResponse::RedirectOnlyResponse(
-                            new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
-                        );
+        if($this->core->getQueries()->getQueueHasContactInformation($queue_code)) {
+            if ($this->core->getConfig()->getQueueContactInfo()) {
+                if (empty($_POST['contact_info'])) {
+                    $this->core->addErrorMessage("Missing contact info");
+                    return MultiResponse::RedirectOnlyResponse(
+                        new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
+                    );
+                } else {
+                    $contact_info = trim($_POST['contact_info']);
+                    //make sure contact information matches instructors regex pattern
+                    $regex_pattern = $this->core->getQueries()->getQueueRegex($queue_code)[0]['regex_pattern'];
+                    if ($regex_pattern !== '') {
+                        $regex_pattern = '#' . $regex_pattern . '#';
+                        if (preg_match($regex_pattern, $contact_info) == 0) {
+                            $this->core->addErrorMessage("Invalid contact information format.  Please re-read the course-specific instructions about the necessary information you should provide when you join this office hours queue.");
+                            return MultiResponse::RedirectOnlyResponse(
+                                new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
+                            );
+                        }
                     }
                 }
             }
         }
-
         $queue_code = trim($queue_code);
         $token = trim($_POST['token']);
 
diff --git a/site/app/libraries/database/DatabaseQueries.php b/site/app/libraries/database/DatabaseQueries.php
index 59e5717af2..1f189a6b93 100644
--- a/site/app/libraries/database/DatabaseQueries.php
+++ b/site/app/libraries/database/DatabaseQueries.php
@@ -6241,6 +6241,11 @@ public function getQueueId($queue_code) {
         return $this->course_db->rows()[0]['id'];
     }
 
+    public function getQueueHasContactInformation($queue_code){
+        $this->course_db->query("select * from queue_settings where code = ?;", [$queue_code]);
+        return $this->course_db->rows()[0]['contact_information'];
+    }
+
     public function addToQueue($queue_code, $user_id, $name, $contact_info) {
         $last_time_in_queue = $this->getLastTimeInQueue($user_id, $queue_code);
         $this->course_db->query("INSERT INTO queue

From ef3c5d649c511015880486253822041b03fa5f6f Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Wed, 22 Sep 2021 22:18:08 -0400
Subject: [PATCH 13/30] remove contact information from queue settings

---
 .../OfficeHoursQueueController.php            | 34 +++++++++----------
 .../admin/ConfigurationController.php         |  2 --
 site/app/models/Config.php                    |  1 -
 site/app/models/OfficeHoursQueueModel.php     |  4 ---
 site/app/templates/admin/Configuration.twig   |  8 -----
 .../officeHoursQueue/CurrentQueue.twig        |  2 --
 .../officeHoursQueue/QueueFilter.twig         | 30 ++++++++--------
 7 files changed, 30 insertions(+), 51 deletions(-)

diff --git a/site/app/controllers/OfficeHoursQueueController.php b/site/app/controllers/OfficeHoursQueueController.php
index 721f0a47c0..5a60e95132 100644
--- a/site/app/controllers/OfficeHoursQueueController.php
+++ b/site/app/controllers/OfficeHoursQueueController.php
@@ -121,24 +121,22 @@ public function addPerson($queue_code) {
         }
         $contact_info = null;
         if($this->core->getQueries()->getQueueHasContactInformation($queue_code)) {
-            if ($this->core->getConfig()->getQueueContactInfo()) {
-                if (empty($_POST['contact_info'])) {
-                    $this->core->addErrorMessage("Missing contact info");
-                    return MultiResponse::RedirectOnlyResponse(
-                        new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
-                    );
-                } else {
-                    $contact_info = trim($_POST['contact_info']);
-                    //make sure contact information matches instructors regex pattern
-                    $regex_pattern = $this->core->getQueries()->getQueueRegex($queue_code)[0]['regex_pattern'];
-                    if ($regex_pattern !== '') {
-                        $regex_pattern = '#' . $regex_pattern . '#';
-                        if (preg_match($regex_pattern, $contact_info) == 0) {
-                            $this->core->addErrorMessage("Invalid contact information format.  Please re-read the course-specific instructions about the necessary information you should provide when you join this office hours queue.");
-                            return MultiResponse::RedirectOnlyResponse(
-                                new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
-                            );
-                        }
+            if (empty($_POST['contact_info'])) {
+                $this->core->addErrorMessage("Missing contact info");
+                return MultiResponse::RedirectOnlyResponse(
+                    new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
+                );
+            } else {
+                $contact_info = trim($_POST['contact_info']);
+                //make sure contact information matches instructors regex pattern
+                $regex_pattern = $this->core->getQueries()->getQueueRegex($queue_code)[0]['regex_pattern'];
+                if ($regex_pattern !== '') {
+                    $regex_pattern = '#' . $regex_pattern . '#';
+                    if (preg_match($regex_pattern, $contact_info) == 0) {
+                        $this->core->addErrorMessage("Invalid contact information format.  Please re-read the course-specific instructions about the necessary information you should provide when you join this office hours queue.");
+                        return MultiResponse::RedirectOnlyResponse(
+                            new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
+                        );
                     }
                 }
             }
diff --git a/site/app/controllers/admin/ConfigurationController.php b/site/app/controllers/admin/ConfigurationController.php
index 51ae6b28b5..f970d5453f 100644
--- a/site/app/controllers/admin/ConfigurationController.php
+++ b/site/app/controllers/admin/ConfigurationController.php
@@ -53,7 +53,6 @@ public function viewConfiguration(): MultiResponse {
             'seating_only_for_instructor'    => $this->core->getConfig()->isSeatingOnlyForInstructor(),
             'auto_rainbow_grades'            => $this->core->getConfig()->getAutoRainbowGrades(),
             'queue_enabled'                  => $this->core->getConfig()->isQueueEnabled(),
-            'queue_contact_info'             => $this->core->getConfig()->getQueueContactInfo(),
             'queue_message'                  => $this->core->getConfig()->getQueueMessage(),
             'seek_message_enabled'           => $this->core->getConfig()->isSeekMessageEnabled(),
             'seek_message_instructions'      => $this->core->getConfig()->getSeekMessageInstructions(),
@@ -148,7 +147,6 @@ public function updateConfiguration(): MultiResponse {
                     'regrade_enabled',
                     'seating_only_for_instructor',
                     'queue_enabled',
-                    'queue_contact_info',
                     'seek_message_enabled',
                     'polls_enabled'
                 ]
diff --git a/site/app/models/Config.php b/site/app/models/Config.php
index d99c0bf2fb..9dc44b2eeb 100644
--- a/site/app/models/Config.php
+++ b/site/app/models/Config.php
@@ -64,7 +64,6 @@
  * @method string getAutoRainbowGrades()
  * @method string|null getVerifiedSubmittyAdminUser()
  * @method bool isQueueEnabled()
- * @method bool getQueueContactInfo()
  * @method bool isSeekMessageEnabled()
  * @method bool isPollsEnabled()
  * @method void setSemester(string $semester)
diff --git a/site/app/models/OfficeHoursQueueModel.php b/site/app/models/OfficeHoursQueueModel.php
index 914214159c..3ae4e13d24 100644
--- a/site/app/models/OfficeHoursQueueModel.php
+++ b/site/app/models/OfficeHoursQueueModel.php
@@ -238,10 +238,6 @@ public function getColorFromCode($code) {
         return $this->colors[$this->getIndexFromCode($code)];
     }
 
-    public function isContactInfoEnabled() {
-        return $this->core->getConfig()->getQueueContactInfo();
-    }
-
     public function getQueueMessage() {
         return $this->core->getConfig()->getQueueMessage();
     }
diff --git a/site/app/templates/admin/Configuration.twig b/site/app/templates/admin/Configuration.twig
index 5e4581c999..64af8bf42b 100644
--- a/site/app/templates/admin/Configuration.twig
+++ b/site/app/templates/admin/Configuration.twig
@@ -54,14 +54,6 @@
                 <span class="option-alt">Choose whether to enable an Office Hours Queue for this course.</span>
             </label>
         </div>
-        <div id="queue-contact-info-wrapper" class="config-row checkbox-row">
-            <input type="checkbox" name="queue_contact_info" id="queue-contact-info" value="true" {{ fields['queue_contact_info'] ? 'checked': '' }} />
-            <label for="queue-contact-info">
-                <span class="option-title">Contact Info for Office Hours Queue</span>
-                <br>
-                <span class="option-alt">Check this box to require that students specify their contact information for office hours help (e.g., email address, video chat, virtual meeting URL, phone number).  This setting should only be enabled if the queue is used for remote or online instruction and tutoring.</san>
-            </label>
-        </div>
 
         <label for="queue-message" class="config-row">
             <span class="option-title">Office Hours Queue Welcome Message (Optional)</span>
diff --git a/site/app/templates/officeHoursQueue/CurrentQueue.twig b/site/app/templates/officeHoursQueue/CurrentQueue.twig
index 53bfb8ac7c..4c0c9e6806 100644
--- a/site/app/templates/officeHoursQueue/CurrentQueue.twig
+++ b/site/app/templates/officeHoursQueue/CurrentQueue.twig
@@ -88,11 +88,9 @@
             </form>
           </td>
         </tr>
-        {% if viewer.isContactInfoEnabled() %}
           <tr class="contact_info row_color_{{viewer.getIndexFromCode(entry['queue_code'])}} queue_current_{{viewer.cleanForId(entry['queue_code'])}} current_queue_row" style="display:none;border-top:0px">
             <td colspan="8" style="border-top:0px; word-wrap:anywhere;">{{entry['contact_info']}}</td>
           </tr>
-        {% endif %}
       {% endfor %}
     </tbody>
   </table>
diff --git a/site/app/templates/officeHoursQueue/QueueFilter.twig b/site/app/templates/officeHoursQueue/QueueFilter.twig
index ab3317245a..520af5883b 100644
--- a/site/app/templates/officeHoursQueue/QueueFilter.twig
+++ b/site/app/templates/officeHoursQueue/QueueFilter.twig
@@ -19,22 +19,20 @@
     <button id="change_code_btn" type="submit" class="btn btn-primary">Change Queue Access Code</button>
   </form>
     <br>
-    {% if viewer.isContactInfoEnabled() %}
-        <hr>
-        <span class="option-title">Modify regex pattern</span>
-        <form method="post" id="change_queue_regex" action="{{base_url}}/no_code_added/change_regex" style="height:auto;">
-            <input type="hidden" name="csrf_token" value="{{ csrf_token }}"/>
-            <select id="old_queue_code_2" class="form-control" name="code" aria-label="Access Code" required="required">
-                <option value="">Queue Name</option>
-                {% for queue in viewer.getAllQueues() %}
-                    <option value="{{queue['code']}}">{{queue['code']}}</option>
-                {% endfor %}
-            </select>
-            <input type="text" id="old_queue_regex" name="regex" placeholder="Contact Info Regex Pattern" aria-label="New Access Code" required="required" style="min-width: 40%;">
-            <button id="change_regex_btn" type="submit" class="btn btn-primary">Change Queue Regex Pattern </button>
-        </form>
-        <br>
-    {% endif %}
+    <hr>
+    <span class="option-title">Modify regex pattern</span>
+    <form method="post" id="change_queue_regex" action="{{base_url}}/no_code_added/change_regex" style="height:auto;">
+        <input type="hidden" name="csrf_token" value="{{ csrf_token }}"/>
+        <select id="old_queue_code_2" class="form-control" name="code" aria-label="Access Code" required="required">
+            <option value="">Queue Name</option>
+            {% for queue in viewer.getAllQueues() %}
+                <option value="{{queue['code']}}">{{queue['code']}}</option>
+            {% endfor %}
+        </select>
+        <input type="text" id="old_queue_regex" name="regex" placeholder="Contact Info Regex Pattern" aria-label="New Access Code" required="required" style="min-width: 40%;">
+        <button id="change_regex_btn" type="submit" class="btn btn-primary">Change Queue Regex Pattern </button>
+    </form>
+    <br>
   <span class="option-title"> Modify queue status </span>
   <table class="table table-striped" style="width:100%;">
     <thead>

From ada646b81f7db2361e8e589e5eb4ebefec383c2f Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Wed, 22 Sep 2021 22:40:41 -0400
Subject: [PATCH 14/30] allow editing of contact info field

---
 .../OfficeHoursQueueController.php            | 23 +++++++++++++++++++
 .../libraries/database/DatabaseQueries.php    |  3 +++
 .../officeHoursQueue/QueueFilter.twig         | 19 ++++++++++++++-
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/site/app/controllers/OfficeHoursQueueController.php b/site/app/controllers/OfficeHoursQueueController.php
index 5a60e95132..c59b90674d 100644
--- a/site/app/controllers/OfficeHoursQueueController.php
+++ b/site/app/controllers/OfficeHoursQueueController.php
@@ -451,6 +451,29 @@ public function changeRegex($queue_code) {
         );
     }
 
+    /**
+     * @Route("/courses/{_semester}/{_course}/office_hours_queue/{queue_code}/change_contact_information", methods={"POST"})
+     * @AccessControl(role="LIMITED_ACCESS_GRADER")
+     * @return MultiResponse
+     */
+    public function changeContactInformation($queue_code) {
+        if (empty($queue_code)) {
+            $this->core->addErrorMessage("Missing queue name");
+            return MultiResponse::RedirectOnlyResponse(
+                new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
+            );
+        }
+
+        $contact_information = $_POST['contact_information'] == "true";
+
+        $queue_code = trim($_POST['code']);
+        $this->core->getQueries()->changeQueueContactInformation($contact_information, $queue_code);
+        $this->core->addSuccessMessage("Queue Contact Information Changed");
+        return MultiResponse::RedirectOnlyResponse(
+            new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
+        );
+    }
+
     /**
      * @Route("/courses/{_semester}/{_course}/office_hours_queue/current_queue", methods={"GET"})
      * @return MultiResponse
diff --git a/site/app/libraries/database/DatabaseQueries.php b/site/app/libraries/database/DatabaseQueries.php
index 1f189a6b93..f60e9ea79e 100644
--- a/site/app/libraries/database/DatabaseQueries.php
+++ b/site/app/libraries/database/DatabaseQueries.php
@@ -6428,6 +6428,9 @@ public function changeQueueRegex($regex_pattern, $queue_code) {
         $this->course_db->query("UPDATE queue_settings SET regex_pattern = ? WHERE code = ?", [$regex_pattern, $queue_code]);
     }
 
+    public function changeQueueContactInformation($contact_information, $queue_code) {
+        $this->course_db->query("UPDATE queue_settings SET contact_information = ? WHERE code = ?", [$contact_information, $queue_code]);
+    }
 
     public function getNumberAheadInQueueThisWeek($queue_code, $time_in) {
         $day_threshold = $this->core->getDateTimeNow()->modify('-4 day')->format('Y-m-d 00:00:00O');
diff --git a/site/app/templates/officeHoursQueue/QueueFilter.twig b/site/app/templates/officeHoursQueue/QueueFilter.twig
index 520af5883b..a0d40d7f0b 100644
--- a/site/app/templates/officeHoursQueue/QueueFilter.twig
+++ b/site/app/templates/officeHoursQueue/QueueFilter.twig
@@ -20,7 +20,22 @@
   </form>
     <br>
     <hr>
-    <span class="option-title">Modify regex pattern</span>
+    <span class="option-title">Modify Contact Information</span>
+    <form method="post" id="change_queue_contact_information" action="{{base_url}}/no_code_added/change_contact_information" style="height:auto;">
+        <input type="hidden" name="csrf_token" value="{{ csrf_token }}"/>
+        <select id="old_queue_code_1" class="form-control" name="code" aria-label="Access Code" required="required">
+            <option value="">Queue Name</option>
+            {% for queue in viewer.getAllQueues() %}
+                <option value="{{queue['code']}}">{{queue['code']}}</option>
+            {% endfor %}
+        </select>
+        <select id="old_queue_contact_information" name="contact_information" aria-label="New Access Code" required="required">
+            <option value="true"> On </option>
+            <option value="false"> Off </option>
+        </select>
+        <button id="change_contact_information_btn" type="submit" class="btn btn-primary">Change Queue Contact Information</button>
+    </form>
+    <br>
     <form method="post" id="change_queue_regex" action="{{base_url}}/no_code_added/change_regex" style="height:auto;">
         <input type="hidden" name="csrf_token" value="{{ csrf_token }}"/>
         <select id="old_queue_code_2" class="form-control" name="code" aria-label="Access Code" required="required">
@@ -32,6 +47,8 @@
         <input type="text" id="old_queue_regex" name="regex" placeholder="Contact Info Regex Pattern" aria-label="New Access Code" required="required" style="min-width: 40%;">
         <button id="change_regex_btn" type="submit" class="btn btn-primary">Change Queue Regex Pattern </button>
     </form>
+    <hr>
+
     <br>
   <span class="option-title"> Modify queue status </span>
   <table class="table table-striped" style="width:100%;">

From 3d55ff69337d103362753d5f04afe7d7bbe13ac8 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Wed, 22 Sep 2021 22:44:52 -0400
Subject: [PATCH 15/30] enhance edit queue UI

---
 site/app/templates/officeHoursQueue/QueueFilter.twig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/site/app/templates/officeHoursQueue/QueueFilter.twig b/site/app/templates/officeHoursQueue/QueueFilter.twig
index a0d40d7f0b..fc89221ad1 100644
--- a/site/app/templates/officeHoursQueue/QueueFilter.twig
+++ b/site/app/templates/officeHoursQueue/QueueFilter.twig
@@ -66,9 +66,12 @@
           <td style="text-align: left;">
               <b>Name: </b>{{queue['code']}}<br>
               <b>Access Code: </b>{{queue['token']}}<br>
-              {% if queue['regex_pattern'] is defined and queue['regex_pattern'] != '' %}
+              <b>Contact Information: </b>{{ queue['contact_information'] ? "On" : "Off" }}<br>
+              {% if queue['regex_pattern'] is defined and queue['regex_pattern'] != '' and queue['contact_information'] %}
                 <b>Regex Pattern: </b>{{queue['regex_pattern']}}</td>
               {% endif %}
+
+
           <td>
               <input type="checkbox" class="toggle-queue-checkbox" aria-label="Toggle open/close for: {{queue['code']|upper}}" id="toggle-queue-{{loop.index}}" onchange="toggleQueue({{loop.index}}, '{{queue['code']}}')" {% if queue['open'] %} checked {% endif %} />
           </td>

From e0122bfe5f4aa36c7e59bd217f3862d90c16c93d Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Wed, 22 Sep 2021 23:06:49 -0400
Subject: [PATCH 16/30] linter

---
 site/app/controllers/OfficeHoursQueueController.php | 5 +++--
 site/app/libraries/database/DatabaseQueries.php     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/site/app/controllers/OfficeHoursQueueController.php b/site/app/controllers/OfficeHoursQueueController.php
index c59b90674d..583392764e 100644
--- a/site/app/controllers/OfficeHoursQueueController.php
+++ b/site/app/controllers/OfficeHoursQueueController.php
@@ -120,13 +120,14 @@ public function addPerson($queue_code) {
             );
         }
         $contact_info = null;
-        if($this->core->getQueries()->getQueueHasContactInformation($queue_code)) {
+        if ($this->core->getQueries()->getQueueHasContactInformation($queue_code)) {
             if (empty($_POST['contact_info'])) {
                 $this->core->addErrorMessage("Missing contact info");
                 return MultiResponse::RedirectOnlyResponse(
                     new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
                 );
-            } else {
+            }
+            else {
                 $contact_info = trim($_POST['contact_info']);
                 //make sure contact information matches instructors regex pattern
                 $regex_pattern = $this->core->getQueries()->getQueueRegex($queue_code)[0]['regex_pattern'];
diff --git a/site/app/libraries/database/DatabaseQueries.php b/site/app/libraries/database/DatabaseQueries.php
index f60e9ea79e..ec00144238 100644
--- a/site/app/libraries/database/DatabaseQueries.php
+++ b/site/app/libraries/database/DatabaseQueries.php
@@ -6241,7 +6241,7 @@ public function getQueueId($queue_code) {
         return $this->course_db->rows()[0]['id'];
     }
 
-    public function getQueueHasContactInformation($queue_code){
+    public function getQueueHasContactInformation($queue_code) {
         $this->course_db->query("select * from queue_settings where code = ?;", [$queue_code]);
         return $this->course_db->rows()[0]['contact_information'];
     }

From 735255daed9f295f7543fbefa260d7c75e85fee9 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Thu, 23 Sep 2021 13:56:09 -0400
Subject: [PATCH 17/30] fix unit tests

---
 .../app/controllers/admin/ConfigurationControllerTester.php  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/site/tests/app/controllers/admin/ConfigurationControllerTester.php b/site/tests/app/controllers/admin/ConfigurationControllerTester.php
index 1796a44244..08d31daca7 100644
--- a/site/tests/app/controllers/admin/ConfigurationControllerTester.php
+++ b/site/tests/app/controllers/admin/ConfigurationControllerTester.php
@@ -41,7 +41,7 @@ public function setUpConfig($seating_dirs = []): void {
         $this->course_config = FileUtils::joinPaths($this->test_dir, 'course.json');
         file_put_contents(
             $this->course_config,
-            '{"database_details":{"dbname":"submitty_f19_sample"},"course_details":{"course_name":"Submitty Sample","course_home_url":"","default_hw_late_days":0,"default_student_late_days":0,"zero_rubric_grades":false,"upload_message":"Hit Submit","display_rainbow_grades_summary":false,"display_custom_message":false,"course_email":"Please contact your TA or instructor to submit a grade inquiry.","vcs_base_url":"","vcs_type":"git","private_repository":"","forum_enabled":true,"forum_create_thread_message":"","regrade_enabled":false,"regrade_message":"Regrade Message","seating_only_for_instructor":false,"room_seating_gradeable_id":"","auto_rainbow_grades":false, "queue_enabled": false, "queue_contact_info": false, "queue_message":"Welcome to the OH/Lab queue", "queue_announcement_message":"announcement message", "seek_message_enabled":false, "seek_message_instructions":"", "polls_enabled": false}}'
+            '{"database_details":{"dbname":"submitty_f19_sample"},"course_details":{"course_name":"Submitty Sample","course_home_url":"","default_hw_late_days":0,"default_student_late_days":0,"zero_rubric_grades":false,"upload_message":"Hit Submit","display_rainbow_grades_summary":false,"display_custom_message":false,"course_email":"Please contact your TA or instructor to submit a grade inquiry.","vcs_base_url":"","vcs_type":"git","private_repository":"","forum_enabled":true,"forum_create_thread_message":"","regrade_enabled":false,"regrade_message":"Regrade Message","seating_only_for_instructor":false,"room_seating_gradeable_id":"","auto_rainbow_grades":false, "queue_enabled": false, "queue_message":"Welcome to the OH/Lab queue", "queue_announcement_message":"announcement message", "seek_message_enabled":false, "seek_message_instructions":"", "polls_enabled": false}}'
         );
         FileUtils::createDir(FileUtils::joinPaths($this->test_dir, 'courses', 'f19', 'sample', 'reports', 'seating'), true);
         foreach ($seating_dirs as $dir) {
@@ -104,7 +104,6 @@ public function testViewConfiguration(): void {
             'seating_only_for_instructor'    => false,
             'auto_rainbow_grades'            => false,
             'queue_enabled'                  => false,
-            'queue_contact_info'             => false,
             'queue_message'                  => 'Welcome to the OH/Lab queue',
             'queue_announcement_message'     => 'announcement message',
             'seek_message_enabled'           => false,
@@ -188,7 +187,6 @@ public function testViewConfigurationWithSeatingChartsFirstItem(): void {
             'seating_only_for_instructor'    => false,
             'auto_rainbow_grades'            => false,
             'queue_enabled'                  => false,
-            'queue_contact_info'             => false,
             'queue_message'                  => 'Welcome to the OH/Lab queue',
             'queue_announcement_message'     => 'announcement message',
             'seek_message_enabled'           => false,
@@ -279,7 +277,6 @@ public function testViewConfigurationWithSeatingChartsNonFirstItem(): void {
             'seating_only_for_instructor'    => false,
             'auto_rainbow_grades'            => false,
             'queue_enabled'                  => false,
-            'queue_contact_info'             => false,
             'queue_message'                  => 'Welcome to the OH/Lab queue',
             'queue_announcement_message'     => 'announcement message',
             'seek_message_enabled'           => false,

From 35171c41454e6b51c28d3c05a0f461d9e8bc0a46 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Fri, 24 Sep 2021 10:55:25 -0400
Subject: [PATCH 18/30] remove tests for course config

---
 .setup/bin/setup_sample_courses.py                         | 1 -
 .../course/20200311135223_oh_queue_contact_info.py         | 3 ---
 site/app/models/Config.php                                 | 5 +----
 site/config/course_template.json                           | 1 -
 site/tests/app/models/ConfigTester.php                     | 7 ++-----
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/.setup/bin/setup_sample_courses.py b/.setup/bin/setup_sample_courses.py
index b37255b31a..1a4d29e0aa 100644
--- a/.setup/bin/setup_sample_courses.py
+++ b/.setup/bin/setup_sample_courses.py
@@ -1309,7 +1309,6 @@ def add_sample_queue_data(self):
         with open(course_json_file, 'r+') as open_file:
             course_json = json.load(open_file)
             course_json['course_details']['queue_enabled'] = True
-            course_json['course_details']['queue_contact_info'] = True
             course_json['course_details']['queue_message'] = queue_data["queue_message"]
             course_json['course_details']['queue_announcement_message'] = queue_data["queue_announcement_message"]
             open_file.seek(0)
diff --git a/migration/migrator/migrations/course/20200311135223_oh_queue_contact_info.py b/migration/migrator/migrations/course/20200311135223_oh_queue_contact_info.py
index ff884a82f5..89fe6ae702 100644
--- a/migration/migrator/migrations/course/20200311135223_oh_queue_contact_info.py
+++ b/migration/migrator/migrations/course/20200311135223_oh_queue_contact_info.py
@@ -24,9 +24,6 @@ def up(config, database, semester, course):
         with open(config_file, 'r') as in_file:
             j = json.load(in_file)
 
-        if 'queue_contact_info' not in j['course_details']:
-            j['course_details']['queue_contact_info'] = False
-
         with open(config_file, 'w') as out_file:
             json.dump(j, out_file, indent=4)
 
diff --git a/site/app/models/Config.php b/site/app/models/Config.php
index 9dc44b2eeb..1d5e27a35a 100644
--- a/site/app/models/Config.php
+++ b/site/app/models/Config.php
@@ -250,8 +250,6 @@ class Config extends AbstractModel {
     protected $queue_enabled;
     /** @prop @var bool */
     protected $seek_message_enabled;
-    /** @prop @var bool */
-    protected $queue_contact_info;
     /** @prop @var string */
     protected $queue_message;
     /** @prop @var string */
@@ -469,7 +467,7 @@ public function loadCourseJson($semester, $course, $course_json_path) {
             'zero_rubric_grades', 'upload_message', 'display_rainbow_grades_summary',
             'display_custom_message', 'room_seating_gradeable_id', 'course_email', 'vcs_base_url', 'vcs_type',
             'private_repository', 'forum_enabled', 'forum_create_thread_message', 'regrade_enabled', 'seating_only_for_instructor',
-            'regrade_message', 'auto_rainbow_grades', 'queue_enabled', 'queue_contact_info', 'queue_message', 'polls_enabled', 'queue_announcement_message', 'seek_message_enabled', 'seek_message_instructions'
+            'regrade_message', 'auto_rainbow_grades', 'queue_enabled', 'queue_message', 'polls_enabled', 'queue_announcement_message', 'seek_message_enabled', 'seek_message_instructions'
         ];
         $this->setConfigValues($this->course_json, 'course_details', $array);
 
@@ -498,7 +496,6 @@ public function loadCourseJson($semester, $course, $course_json_path) {
             'regrade_enabled',
             'seating_only_for_instructor',
             'queue_enabled',
-            'queue_contact_info',
             'polls_enabled',
             'seek_message_enabled',
         ];
diff --git a/site/config/course_template.json b/site/config/course_template.json
index 569e914432..80c5422043 100644
--- a/site/config/course_template.json
+++ b/site/config/course_template.json
@@ -23,7 +23,6 @@
         "room_seating_gradeable_id": "",
         "auto_rainbow_grades": false,
         "queue_enabled": false,
-        "queue_contact_info": false,
         "queue_message": "",
         "queue_announcement_message": "",
         "polls_enabled": false,
diff --git a/site/tests/app/models/ConfigTester.php b/site/tests/app/models/ConfigTester.php
index aafe6fdf27..c0d502c7fc 100644
--- a/site/tests/app/models/ConfigTester.php
+++ b/site/tests/app/models/ConfigTester.php
@@ -118,7 +118,6 @@ private function createConfigFile($extra = []) {
                 'room_seating_gradeable_id' => "",
                 'auto_rainbow_grades' => false,
                 'queue_enabled' => true,
-                'queue_contact_info' => true,
                 'queue_message' => '',
                 'queue_announcement_message' => '',
                 'seek_message_enabled'           => false,
@@ -284,7 +283,6 @@ public function testConfig() {
                     'room_seating_gradeable_id' => "",
                     'auto_rainbow_grades' => false,
                     'queue_enabled' => true,
-                    'queue_contact_info' => true,
                     'queue_message' => '',
                     'queue_announcement_message' => '',
                     'seek_message_enabled'           => false,
@@ -317,7 +315,6 @@ public function testConfig() {
             'verified_submitty_admin_user' => null,
             'php_user' => null,
             'queue_enabled' => true,
-            'queue_contact_info' => true,
             'queue_message' => '',
             'queue_announcement_message' => '',
             'seek_message_enabled'           => false,
@@ -499,8 +496,8 @@ public function getRequiredSettings() {
                 'zero_rubric_grades', 'upload_message', 'display_rainbow_grades_summary',
                 'display_custom_message', 'course_email', 'vcs_base_url', 'vcs_type', 'private_repository',
                 'forum_enabled', 'forum_create_thread_message', 'regrade_enabled', 'seating_only_for_instructor',
-                'regrade_message', 'room_seating_gradeable_id', 'queue_enabled', 'queue_contact_info',
-                'queue_message', 'queue_announcement_message', 'polls_enabled', 'seek_message_enabled', 'seek_message_instructions'
+                'regrade_message', 'room_seating_gradeable_id', 'queue_enabled', 'queue_message',
+                'queue_announcement_message', 'polls_enabled', 'seek_message_enabled', 'seek_message_instructions'
             ],
         ];
         $return = [];

From 70fa5e70a85dfe76651413d810b12a3c362e1894 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Fri, 24 Sep 2021 12:09:16 -0400
Subject: [PATCH 19/30] fix e2e

---
 tests/e2e/test_office_hours_queue.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/e2e/test_office_hours_queue.py b/tests/e2e/test_office_hours_queue.py
index ecae3f7666..c385ce9afc 100644
--- a/tests/e2e/test_office_hours_queue.py
+++ b/tests/e2e/test_office_hours_queue.py
@@ -311,11 +311,8 @@ def enableQueue(self):
     self.wait_for_element((By.ID, 'queue-enabled'))
     if(not self.driver.find_element(By.ID, 'queue-enabled').is_selected()):
         self.driver.find_element(By.ID, 'queue-enabled').click()
-    if(self.driver.find_element(By.ID, 'queue-contact-info').is_selected()):
-        self.driver.find_element(By.ID, 'queue-contact-info').click()
 
     self.assertEqual(True, self.driver.find_element(By.ID, 'queue-enabled').is_selected())
-    self.assertEqual(False, self.driver.find_element(By.ID, 'queue-contact-info').is_selected())
 
 
 def disableQueue(self):

From 04b3fcf8826d733680bb02939e6b84c03f080c4f Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Fri, 24 Sep 2021 20:22:32 -0400
Subject: [PATCH 20/30] fix accesibilty test

---
 site/app/templates/officeHoursQueue/QueueFilter.twig | 2 +-
 tests/e2e/test_office_hours_queue.py                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/app/templates/officeHoursQueue/QueueFilter.twig b/site/app/templates/officeHoursQueue/QueueFilter.twig
index fc89221ad1..73b3a4fa18 100644
--- a/site/app/templates/officeHoursQueue/QueueFilter.twig
+++ b/site/app/templates/officeHoursQueue/QueueFilter.twig
@@ -29,7 +29,7 @@
                 <option value="{{queue['code']}}">{{queue['code']}}</option>
             {% endfor %}
         </select>
-        <select id="old_queue_contact_information" name="contact_information" aria-label="New Access Code" required="required">
+        <select id="old_queue_contact_information" name="contact_information" aria-label="New Access Code" required="required" size="2">
             <option value="true"> On </option>
             <option value="false"> Off </option>
         </select>
diff --git a/tests/e2e/test_office_hours_queue.py b/tests/e2e/test_office_hours_queue.py
index c385ce9afc..cac54bbc5c 100644
--- a/tests/e2e/test_office_hours_queue.py
+++ b/tests/e2e/test_office_hours_queue.py
@@ -311,7 +311,7 @@ def enableQueue(self):
     self.wait_for_element((By.ID, 'queue-enabled'))
     if(not self.driver.find_element(By.ID, 'queue-enabled').is_selected()):
         self.driver.find_element(By.ID, 'queue-enabled').click()
-
+#     TODO add tests for contact information
     self.assertEqual(True, self.driver.find_element(By.ID, 'queue-enabled').is_selected())
 
 

From 81347fc3e320b0be1c21749522ccea2373bb4934 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Fri, 24 Sep 2021 21:04:40 -0400
Subject: [PATCH 21/30] requested changes

---
 migration/migrator/data/course_tables.sql     | 18 +++++++++++--
 migration/migrator/data/submitty_db.sql       | 26 ++++++++++++++-----
 .../OfficeHoursQueueController.php            | 17 +++++-------
 .../libraries/database/DatabaseQueries.php    |  6 ++---
 site/app/models/Button.php                    |  4 ---
 site/app/models/gradeable/Gradeable.php       | 14 ----------
 site/app/templates/Navigation.twig            |  2 --
 .../officeHoursQueue/QueueFilter.twig         |  3 ++-
 site/app/views/NavigationView.php             |  6 ++---
 9 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/migration/migrator/data/course_tables.sql b/migration/migrator/data/course_tables.sql
index ff3f6cf186..a661429aff 100644
--- a/migration/migrator/data/course_tables.sql
+++ b/migration/migrator/data/course_tables.sql
@@ -13,6 +13,20 @@ SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
+--
+-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
+--
+
+CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
+
+
+--
+-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
+--
+
+COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
+
+
 --
 -- Name: notifications_component; Type: TYPE; Schema: public; Owner: -
 --
@@ -120,7 +134,7 @@ $_$;
 
 SET default_tablespace = '';
 
-SET default_table_access_method = heap;
+SET default_with_oids = false;
 
 --
 -- Name: categories_list; Type: TABLE; Schema: public; Owner: -
@@ -765,7 +779,7 @@ CREATE TABLE public.polls (
     release_date date NOT NULL,
     image_path text,
     question_type character varying(35) DEFAULT 'single-response-multiple-correct'::character varying,
-    release_histogram character varying(10) DEFAULT 'never'::character varying
+    release_histogram character varying(10) NOT NULL
 );
 
 
diff --git a/migration/migrator/data/submitty_db.sql b/migration/migrator/data/submitty_db.sql
index 70f29ba78f..a1f99c09d6 100644
--- a/migration/migrator/data/submitty_db.sql
+++ b/migration/migrator/data/submitty_db.sql
@@ -13,6 +13,20 @@ SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
+--
+-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
+--
+
+CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
+
+
+--
+-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
+--
+
+COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
+
+
 --
 -- Name: dblink; Type: EXTENSION; Schema: -; Owner: -
 --
@@ -271,7 +285,7 @@ CREATE FUNCTION public.sync_user() RETURNS trigger
 
 SET default_tablespace = '';
 
-SET default_table_access_method = heap;
+SET default_with_oids = false;
 
 --
 -- Name: courses; Type: TABLE; Schema: public; Owner: -
@@ -537,7 +551,7 @@ ALTER TABLE ONLY public.users
 -- Name: courses_users after_delete_sync_delete_user_cleanup; Type: TRIGGER; Schema: public; Owner: -
 --
 
-CREATE TRIGGER after_delete_sync_delete_user_cleanup AFTER DELETE ON public.courses_users FOR EACH ROW EXECUTE FUNCTION public.sync_delete_user_cleanup();
+CREATE TRIGGER after_delete_sync_delete_user_cleanup AFTER DELETE ON public.courses_users FOR EACH ROW EXECUTE PROCEDURE public.sync_delete_user_cleanup();
 
 
 --
@@ -558,28 +572,28 @@ CREATE TRIGGER delete_sync_registration_id BEFORE DELETE ON public.courses_regis
 -- Name: users generate_api_key; Type: TRIGGER; Schema: public; Owner: -
 --
 
-CREATE TRIGGER generate_api_key BEFORE INSERT OR UPDATE OF user_password ON public.users FOR EACH ROW EXECUTE FUNCTION public.generate_api_key();
+CREATE TRIGGER generate_api_key BEFORE INSERT OR UPDATE OF user_password ON public.users FOR EACH ROW EXECUTE PROCEDURE public.generate_api_key();
 
 
 --
 -- Name: courses_registration_sections insert_sync_registration_id; Type: TRIGGER; Schema: public; Owner: -
 --
 
-CREATE TRIGGER insert_sync_registration_id AFTER INSERT OR UPDATE ON public.courses_registration_sections FOR EACH ROW EXECUTE FUNCTION public.sync_insert_registration_section();
+CREATE TRIGGER insert_sync_registration_id AFTER INSERT OR UPDATE ON public.courses_registration_sections FOR EACH ROW EXECUTE PROCEDURE public.sync_insert_registration_section();
 
 
 --
 -- Name: courses_users user_sync_courses_users; Type: TRIGGER; Schema: public; Owner: -
 --
 
-CREATE TRIGGER user_sync_courses_users AFTER INSERT OR UPDATE ON public.courses_users FOR EACH ROW EXECUTE FUNCTION public.sync_courses_user();
+CREATE TRIGGER user_sync_courses_users AFTER INSERT OR UPDATE ON public.courses_users FOR EACH ROW EXECUTE PROCEDURE public.sync_courses_user();
 
 
 --
 -- Name: users user_sync_users; Type: TRIGGER; Schema: public; Owner: -
 --
 
-CREATE TRIGGER user_sync_users AFTER UPDATE ON public.users FOR EACH ROW EXECUTE FUNCTION public.sync_user();
+CREATE TRIGGER user_sync_users AFTER UPDATE ON public.users FOR EACH ROW EXECUTE PROCEDURE public.sync_user();
 
 
 --
diff --git a/site/app/controllers/OfficeHoursQueueController.php b/site/app/controllers/OfficeHoursQueueController.php
index 583392764e..d4c8d18a68 100644
--- a/site/app/controllers/OfficeHoursQueueController.php
+++ b/site/app/controllers/OfficeHoursQueueController.php
@@ -121,7 +121,7 @@ public function addPerson($queue_code) {
         }
         $contact_info = null;
         if ($this->core->getQueries()->getQueueHasContactInformation($queue_code)) {
-            if (empty($_POST['contact_info'])) {
+            if (!isset($_POST['contact_info'])) {
                 $this->core->addErrorMessage("Missing contact info");
                 return MultiResponse::RedirectOnlyResponse(
                     new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
@@ -455,24 +455,21 @@ public function changeRegex($queue_code) {
     /**
      * @Route("/courses/{_semester}/{_course}/office_hours_queue/{queue_code}/change_contact_information", methods={"POST"})
      * @AccessControl(role="LIMITED_ACCESS_GRADER")
-     * @return MultiResponse
+     * @return RedirectResponse
      */
     public function changeContactInformation($queue_code) {
-        if (empty($queue_code)) {
+        if (!isset($queue_code)) {
             $this->core->addErrorMessage("Missing queue name");
-            return MultiResponse::RedirectOnlyResponse(
-                new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
-            );
+            return new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']));
         }
 
-        $contact_information = $_POST['contact_information'] == "true";
+        $contact_information = $_POST['contact_information'] === "true";
 
         $queue_code = trim($_POST['code']);
         $this->core->getQueries()->changeQueueContactInformation($contact_information, $queue_code);
         $this->core->addSuccessMessage("Queue Contact Information Changed");
-        return MultiResponse::RedirectOnlyResponse(
-            new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
-        );
+        return new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']));
+
     }
 
     /**
diff --git a/site/app/libraries/database/DatabaseQueries.php b/site/app/libraries/database/DatabaseQueries.php
index ec00144238..8afe20a699 100644
--- a/site/app/libraries/database/DatabaseQueries.php
+++ b/site/app/libraries/database/DatabaseQueries.php
@@ -4304,7 +4304,7 @@ public function getUsersNotificationSettings(array $user_ids) {
      * Gets All Parent Authors who this user responded to
      *
      * @param string $post_author_id current_user_id
-     * @param string $post_id        the parent post idgetAllQueues
+     * @param string $post_id        the parent post id
      */
     public function getAllParentAuthors(string $post_author_id, string $post_id) {
         $params = [$post_id];
@@ -6241,7 +6241,7 @@ public function getQueueId($queue_code) {
         return $this->course_db->rows()[0]['id'];
     }
 
-    public function getQueueHasContactInformation($queue_code) {
+    public function getQueueHasContactInformation(string $queue_code) {
         $this->course_db->query("select * from queue_settings where code = ?;", [$queue_code]);
         return $this->course_db->rows()[0]['contact_information'];
     }
@@ -6428,7 +6428,7 @@ public function changeQueueRegex($regex_pattern, $queue_code) {
         $this->course_db->query("UPDATE queue_settings SET regex_pattern = ? WHERE code = ?", [$regex_pattern, $queue_code]);
     }
 
-    public function changeQueueContactInformation($contact_information, $queue_code) {
+    public function changeQueueContactInformation(bool $contact_information,string $queue_code) {
         $this->course_db->query("UPDATE queue_settings SET contact_information = ? WHERE code = ?", [$contact_information, $queue_code]);
     }
 
diff --git a/site/app/models/Button.php b/site/app/models/Button.php
index fb1902ee01..be19ff8e47 100644
--- a/site/app/models/Button.php
+++ b/site/app/models/Button.php
@@ -15,7 +15,6 @@
  * @method string getClass()
  * @method string|null getId()
  * @method bool isDisabled()
- * @method string getPrerequisite()
  * @method bool isTitleOnHover()
  * @method float|null getProgress()
  * @method string|null getAriaLabel()
@@ -55,8 +54,6 @@ class Button extends AbstractModel {
     protected $id;
     /** @prop @var bool $disabled */
     protected $disabled;
-    /** @prop @var string $prerequisite */
-    protected $prerequisite;
     /** @prop @var float|null $progress */
     protected $progress;
     /** @prop @var bool $title_on_hover */
@@ -84,7 +81,6 @@ public function __construct(Core $core, array $details) {
         $this->class    = $details["class"] ?? "btn";
         $this->id       = $details["id"] ?? null;
         $this->disabled = $details["disabled"] ?? false;
-        $this->prerequisite = $details["prerequisite"] ?? null;
         $this->progress = $details["progress"] ?? null;
         if ($this->progress !== null) {
             $this->progress = floatval($this->progress);
diff --git a/site/app/models/gradeable/Gradeable.php b/site/app/models/gradeable/Gradeable.php
index 8c4723da0c..160dd42a53 100644
--- a/site/app/models/gradeable/Gradeable.php
+++ b/site/app/models/gradeable/Gradeable.php
@@ -2208,18 +2208,4 @@ public function isLocked(string $user_id): bool {
         }
         return true;
     }
-    /**
-     * Returns prerequisite for a gradeable
-     *
-     * @return string
-     */
-    public function getPrerequisite(): string {
-        if ($this->depends_on !== null && $this->depends_on_points !== null) {
-            $dependent_gradeable = $this->core->getQueries()->getGradeableConfig($this->depends_on);
-            return $dependent_gradeable->getTitle();
-        }
-        else {
-            return '';
-        }
-    }
 }
diff --git a/site/app/templates/Navigation.twig b/site/app/templates/Navigation.twig
index 746b53950e..0d6259987a 100644
--- a/site/app/templates/Navigation.twig
+++ b/site/app/templates/Navigation.twig
@@ -99,8 +99,6 @@
         <a class="{{ button.getClass() }}{{ (button.getTitle() == 'Edit' or button.getTitle() == 'Delete') and has_build_error ? 'edit-build-error' : '' }} {% if button.hasOnclick() %} key_to_click {% endif %}" tabindex="0"
             {% if button.isDisabled() %}
                 disabled
-                onclick="alert('Please complete {{ button.getPrerequisite()}} first' )"
-                title='Please complete {{ button.getPrerequisite()}} first'
             {% else %}
                 {# assigns the href unless button has onclick affect #}
                 {% if not button.hasOnclick() %}
diff --git a/site/app/templates/officeHoursQueue/QueueFilter.twig b/site/app/templates/officeHoursQueue/QueueFilter.twig
index 73b3a4fa18..ee87df8fdf 100644
--- a/site/app/templates/officeHoursQueue/QueueFilter.twig
+++ b/site/app/templates/officeHoursQueue/QueueFilter.twig
@@ -29,7 +29,8 @@
                 <option value="{{queue['code']}}">{{queue['code']}}</option>
             {% endfor %}
         </select>
-        <select id="old_queue_contact_information" name="contact_information" aria-label="New Access Code" required="required" size="2">
+        <select id="old_queue_contact_information" name="contact_information" aria-label="New Access Code" required="required">
+            <option value="">choose option</option>
             <option value="true"> On </option>
             <option value="false"> Off </option>
         </select>
diff --git a/site/app/views/NavigationView.php b/site/app/views/NavigationView.php
index 3928bb5361..9b4bc3e29c 100644
--- a/site/app/views/NavigationView.php
+++ b/site/app/views/NavigationView.php
@@ -591,11 +591,10 @@ public static function getSubmitButton(Core $core, Gradeable $gradeable, $graded
                 }
             }
         }
-        $prerequisite = '';
+
         if ($gradeable->isLocked($core->getUser()->getId())) {
             $disabled = true;
             $title = "LOCKED";
-            $prerequisite = $gradeable->getPrerequisite();
         }
 
         return new Button($core, [
@@ -606,8 +605,7 @@ public static function getSubmitButton(Core $core, Gradeable $gradeable, $graded
             "progress" => $progress,
             "disabled" => $disabled,
             "class" => "btn {$class} btn-nav btn-nav-submit",
-            "name" => "submit-btn",
-            "prerequisite" => $prerequisite
+            "name" => "submit-btn"
         ]);
     }
 

From f660efcd3a2ebe977c79bbc4d949bae546cecd13 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Fri, 24 Sep 2021 21:09:41 -0400
Subject: [PATCH 22/30] linter again

---
 site/app/controllers/OfficeHoursQueueController.php | 1 -
 site/app/libraries/database/DatabaseQueries.php     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/site/app/controllers/OfficeHoursQueueController.php b/site/app/controllers/OfficeHoursQueueController.php
index d4c8d18a68..58054d0c1a 100644
--- a/site/app/controllers/OfficeHoursQueueController.php
+++ b/site/app/controllers/OfficeHoursQueueController.php
@@ -469,7 +469,6 @@ public function changeContactInformation($queue_code) {
         $this->core->getQueries()->changeQueueContactInformation($contact_information, $queue_code);
         $this->core->addSuccessMessage("Queue Contact Information Changed");
         return new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']));
-
     }
 
     /**
diff --git a/site/app/libraries/database/DatabaseQueries.php b/site/app/libraries/database/DatabaseQueries.php
index 8afe20a699..51d98e34a7 100644
--- a/site/app/libraries/database/DatabaseQueries.php
+++ b/site/app/libraries/database/DatabaseQueries.php
@@ -6428,7 +6428,7 @@ public function changeQueueRegex($regex_pattern, $queue_code) {
         $this->course_db->query("UPDATE queue_settings SET regex_pattern = ? WHERE code = ?", [$regex_pattern, $queue_code]);
     }
 
-    public function changeQueueContactInformation(bool $contact_information,string $queue_code) {
+    public function changeQueueContactInformation(bool $contact_information, string $queue_code) {
         $this->course_db->query("UPDATE queue_settings SET contact_information = ? WHERE code = ?", [$contact_information, $queue_code]);
     }
 

From fd9cbb3efa35eda9a7cc65411626afdb1eb3fb47 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Sat, 25 Sep 2021 10:36:09 -0400
Subject: [PATCH 23/30] e2e again

---
 .../app/templates/officeHoursQueue/CurrentQueue.twig |  4 ++--
 site/app/templates/officeHoursQueue/NewQueue.twig    | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/site/app/templates/officeHoursQueue/CurrentQueue.twig b/site/app/templates/officeHoursQueue/CurrentQueue.twig
index 4c0c9e6806..e694a9cbf4 100644
--- a/site/app/templates/officeHoursQueue/CurrentQueue.twig
+++ b/site/app/templates/officeHoursQueue/CurrentQueue.twig
@@ -88,9 +88,9 @@
             </form>
           </td>
         </tr>
-          <tr class="contact_info row_color_{{viewer.getIndexFromCode(entry['queue_code'])}} queue_current_{{viewer.cleanForId(entry['queue_code'])}} current_queue_row" style="display:none;border-top:0px">
+        <tr class="contact_info row_color_{{viewer.getIndexFromCode(entry['queue_code'])}} queue_current_{{viewer.cleanForId(entry['queue_code'])}} current_queue_row" style="display:none;border-top:0px">
             <td colspan="8" style="border-top:0px; word-wrap:anywhere;">{{entry['contact_info']}}</td>
-          </tr>
+        </tr>
       {% endfor %}
     </tbody>
   </table>
diff --git a/site/app/templates/officeHoursQueue/NewQueue.twig b/site/app/templates/officeHoursQueue/NewQueue.twig
index 45fc1c3710..df0e15214a 100644
--- a/site/app/templates/officeHoursQueue/NewQueue.twig
+++ b/site/app/templates/officeHoursQueue/NewQueue.twig
@@ -21,12 +21,12 @@
         <div class="regex-help">
             <br>You may optionally specify a regular expression to ensure your students enter the requested
             format for the contact information.  For example: <br>
-            <b>Gmail:&nbsp;&nbsp;</b> <tt>.+@gmail.com</tt><br>
-            <b>Email:&nbsp;&nbsp;</b> <tt>.+@.+\..+</tt><br>
-            <b>Webex Personal Room:&nbsp;&nbsp;</b> <tt>^https:\/\/.+\.webex\.com\/meet\/.*</tt><br>
-            <b>Webex Meeting:&nbsp;&nbsp;</b> <tt>^https:\/\/.+\.webex\.com\/.*</tt><br>
-            <b>Skype link:&nbsp;&nbsp;</b> <tt>.*join\.skype\.com.*</tt><br>
-            <b>Zoom link:&nbsp;&nbsp;</b> <tt>.*zoom\.us.*</tt><br><br>
+            <b>Gmail:&nbsp;&nbsp;</b> .+@gmail.com<br>
+            <b>Email:&nbsp;&nbsp;</b> .+@.+\..+<br>
+            <b>Webex Personal Room:&nbsp;&nbsp;</b> ^https:\/\/.+\.webex\.com\/meet\/.*<br>
+            <b>Webex Meeting:&nbsp;&nbsp;</b> ^https:\/\/.+\.webex\.com\/.*<br>
+            <b>Skype link:&nbsp;&nbsp;</b> .*join\.skype\.com.*<br>
+            <b>Zoom link:&nbsp;&nbsp;</b> .*zoom\.us.* <br><br>
         </div>
     </div>
     <button id="open_new_queue_btn" type="submit" class="btn btn-primary" >Open New Queue</button>

From ea68544347b7ccadfc7bae1c2b56884fadc4135a Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Sat, 25 Sep 2021 12:34:14 -0400
Subject: [PATCH 24/30] hopefully fix accesibilty check

---
 site/app/templates/officeHoursQueue/CurrentQueue.twig | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/site/app/templates/officeHoursQueue/CurrentQueue.twig b/site/app/templates/officeHoursQueue/CurrentQueue.twig
index e694a9cbf4..40a2b2e01d 100644
--- a/site/app/templates/officeHoursQueue/CurrentQueue.twig
+++ b/site/app/templates/officeHoursQueue/CurrentQueue.twig
@@ -88,9 +88,11 @@
             </form>
           </td>
         </tr>
-        <tr class="contact_info row_color_{{viewer.getIndexFromCode(entry['queue_code'])}} queue_current_{{viewer.cleanForId(entry['queue_code'])}} current_queue_row" style="display:none;border-top:0px">
-            <td colspan="8" style="border-top:0px; word-wrap:anywhere;">{{entry['contact_info']}}</td>
-        </tr>
+        {% if entry['contact_info'] != '' %}
+            <tr class="contact_info row_color_{{viewer.getIndexFromCode(entry['queue_code'])}} queue_current_{{viewer.cleanForId(entry['queue_code'])}} current_queue_row" style="display:none;border-top:0px">
+                <td colspan="8" style="border-top:0px; word-wrap:anywhere;">{{entry['contact_info']}}</td>
+            </tr>
+        {% endif %}
       {% endfor %}
     </tbody>
   </table>

From 252bff4fc063d5064a3233239a1776b18b718241 Mon Sep 17 00:00:00 2001
From: Miles Ednie <edniem@rpi.edu>
Date: Sat, 25 Sep 2021 13:53:58 -0400
Subject: [PATCH 25/30] fix col length

---
 site/app/templates/officeHoursQueue/CurrentQueue.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/app/templates/officeHoursQueue/CurrentQueue.twig b/site/app/templates/officeHoursQueue/CurrentQueue.twig
index 40a2b2e01d..eb5147db35 100644
--- a/site/app/templates/officeHoursQueue/CurrentQueue.twig
+++ b/site/app/templates/officeHoursQueue/CurrentQueue.twig
@@ -90,7 +90,7 @@
         </tr>
         {% if entry['contact_info'] != '' %}
             <tr class="contact_info row_color_{{viewer.getIndexFromCode(entry['queue_code'])}} queue_current_{{viewer.cleanForId(entry['queue_code'])}} current_queue_row" style="display:none;border-top:0px">
-                <td colspan="8" style="border-top:0px; word-wrap:anywhere;">{{entry['contact_info']}}</td>
+                <td colspan="7" style="border-top:0px; word-wrap:anywhere;">{{entry['contact_info']}}</td>
             </tr>
         {% endif %}
       {% endfor %}

From 061006c545551e65d137a1b84bebc20f2dec9f5a Mon Sep 17 00:00:00 2001
From: Miles Ednie <66340271+loadedskiffer@users.noreply.github.com>
Date: Fri, 1 Oct 2021 19:29:08 -0400
Subject: [PATCH 26/30] requested changes

---
 .../controllers/OfficeHoursQueueController.php   | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/site/app/controllers/OfficeHoursQueueController.php b/site/app/controllers/OfficeHoursQueueController.php
index 2593720531..dfcdfdfb2c 100644
--- a/site/app/controllers/OfficeHoursQueueController.php
+++ b/site/app/controllers/OfficeHoursQueueController.php
@@ -57,15 +57,7 @@ public function openQueue() {
             );
         }
 
-        if (empty($_POST['token'])) {
-            $this->core->addErrorMessage("Missing secret code");
-            return MultiResponse::RedirectOnlyResponse(
-                new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
-            );
-        }
-
-        $require_contact_info = $_POST['require_contact_information'] == "on";
-
+        $require_contact_info = isset($_POST['require_contact_information']);
 
         //Replace whitespace with "_"
         $queue_code = trim($_POST['code']);
@@ -117,12 +109,6 @@ public function addPerson($queue_code) {
             );
         }
 
-        if (empty($_POST['token'])) {
-            $this->core->addErrorMessage("Missing secret code");
-            return MultiResponse::RedirectOnlyResponse(
-                new RedirectResponse($this->core->buildCourseUrl(['office_hours_queue']))
-            );
-        }
 
         $contact_info = null;
         if ($this->core->getQueries()->getQueueHasContactInformation($queue_code)) {

From c436d903cde9064ce48f7667847b470a580bbbbc Mon Sep 17 00:00:00 2001
From: Miles Ednie <66340271+loadedskiffer@users.noreply.github.com>
Date: Mon, 11 Oct 2021 12:03:16 -0400
Subject: [PATCH 27/30] fix migration

---
 .../course/20200311135223_oh_queue_contact_info.py   |  3 +++
 .../20210921195244_add_queue_contact_info_column.py  | 12 +++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/migration/migrator/migrations/course/20200311135223_oh_queue_contact_info.py b/migration/migrator/migrations/course/20200311135223_oh_queue_contact_info.py
index 89fe6ae702..ff884a82f5 100644
--- a/migration/migrator/migrations/course/20200311135223_oh_queue_contact_info.py
+++ b/migration/migrator/migrations/course/20200311135223_oh_queue_contact_info.py
@@ -24,6 +24,9 @@ def up(config, database, semester, course):
         with open(config_file, 'r') as in_file:
             j = json.load(in_file)
 
+        if 'queue_contact_info' not in j['course_details']:
+            j['course_details']['queue_contact_info'] = False
+
         with open(config_file, 'w') as out_file:
             json.dump(j, out_file, indent=4)
 
diff --git a/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py b/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py
index 564e1e1647..45a1e92d1a 100644
--- a/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py
+++ b/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py
@@ -1,5 +1,6 @@
 """Migration for a given Submitty course database."""
-
+from pathlib import Path
+import json
 
 def up(config, database, semester, course):
     """
@@ -16,6 +17,15 @@ def up(config, database, semester, course):
     """
     sql = "ALTER TABLE queue_settings ADD COLUMN IF NOT EXISTS contact_information BOOLEAN NOT NULL DEFAULT TRUE;"
     database.execute(sql)
+    course_dir = Path(config.submitty['submitty_data_dir'], 'courses', semester, course)
+        # add boolean to course config
+    config_file = Path(course_dir, 'config', 'config.json')
+    if config_file.is_file():
+        with open(config_file, 'r') as in_file:
+            j = json.load(in_file)
+        contact_information = j['course_details']['queue_contact_info']
+        sql = "UPDATE queue_settings SET contact_information = ?", [contact_information]
+        database.execute(sql)
 
 
 def down(config, database, semester, course):

From a9ca759183347e228b4ae8e07b25425a06aa0257 Mon Sep 17 00:00:00 2001
From: Miles Ednie <66340271+loadedskiffer@users.noreply.github.com>
Date: Mon, 11 Oct 2021 12:23:02 -0400
Subject: [PATCH 28/30] fix migration

---
 .../20210921195244_add_queue_contact_info_column.py    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py b/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py
index 45a1e92d1a..3877fd70d8 100644
--- a/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py
+++ b/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py
@@ -23,9 +23,13 @@ def up(config, database, semester, course):
     if config_file.is_file():
         with open(config_file, 'r') as in_file:
             j = json.load(in_file)
-        contact_information = j['course_details']['queue_contact_info']
-        sql = "UPDATE queue_settings SET contact_information = ?", [contact_information]
-        database.execute(sql)
+        contact_information_enabled = j['course_details']['queue_contact_info']
+        query = """
+            UPDATE queue_settings
+            SET contact_information = :contact_information_enabled;
+        """
+        params = {'contact_information_enabled' : contact_information_enabled}
+        database.session.execute(query, params)
 
 
 def down(config, database, semester, course):

From 43f719c6d42b9a23a830b256154ae1ccec83bef9 Mon Sep 17 00:00:00 2001
From: Miles Ednie <66340271+loadedskiffer@users.noreply.github.com>
Date: Mon, 11 Oct 2021 20:34:13 -0400
Subject: [PATCH 29/30] add check for field in migration

---
 ...0210921195244_add_queue_contact_info_column.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py b/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py
index 3877fd70d8..138e1c90b3 100644
--- a/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py
+++ b/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py
@@ -23,13 +23,14 @@ def up(config, database, semester, course):
     if config_file.is_file():
         with open(config_file, 'r') as in_file:
             j = json.load(in_file)
-        contact_information_enabled = j['course_details']['queue_contact_info']
-        query = """
-            UPDATE queue_settings
-            SET contact_information = :contact_information_enabled;
-        """
-        params = {'contact_information_enabled' : contact_information_enabled}
-        database.session.execute(query, params)
+        if 'queue_contact_info' in j['course_details']:
+            contact_information_enabled = j['course_details']['queue_contact_info']
+            query = """
+                UPDATE queue_settings
+                SET contact_information = :contact_information_enabled;
+            """
+            params = {'contact_information_enabled' : contact_information_enabled}
+            database.session.execute(query, params)
 
 
 def down(config, database, semester, course):

From 6d074ac3ec0684885682a56a936f060e1b2ceef3 Mon Sep 17 00:00:00 2001
From: Matthew Peveler <matt.peveler@gmail.com>
Date: Tue, 12 Oct 2021 08:11:18 -1000
Subject: [PATCH 30/30] Update
 migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py

---
 .../course/20210921195244_add_queue_contact_info_column.py      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py b/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py
index 138e1c90b3..36c1fbf156 100644
--- a/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py
+++ b/migration/migrator/migrations/course/20210921195244_add_queue_contact_info_column.py
@@ -21,7 +21,7 @@ def up(config, database, semester, course):
         # add boolean to course config
     config_file = Path(course_dir, 'config', 'config.json')
     if config_file.is_file():
-        with open(config_file, 'r') as in_file:
+        with config_file.open() as in_file:
             j = json.load(in_file)
         if 'queue_contact_info' in j['course_details']:
             contact_information_enabled = j['course_details']['queue_contact_info']