rebase against main and fix merge conflict in seed data

cs169 · Feb 27, 2024 · ac57d48 · ac57d48
2 parents 96c18ec + 325fb70
commit ac57d48
Show file tree

Hide file tree

Showing 12 changed files with 429 additions and 324 deletions.
diff --git a/.github/workflows/specs.yml b/.github/workflows/specs.yml
@@ -1,6 +1,6 @@
 name: All Specs
 
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   specs:

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
@@ -95,6 +95,7 @@ def page_params
   #     teacher_school_website: @teacher.school.website,
   #     piazza_password: Rails.application.secrets[:piazza_password],
   #     denial_reason: @denial_reason
+  #     request_reason: @request_reason
   #   }.with_indifferent_access
   # end
 

diff --git a/app/controllers/teachers_controller.rb b/app/controllers/teachers_controller.rb
@@ -130,7 +130,7 @@ def update
   def request_info
     @teacher.info_needed!
     if !params[:skip_email].present?
-      TeacherMailer.request_info_email(@teacher, params[:denial_reason]).deliver_now
+      TeacherMailer.request_info_email(@teacher, params[:request_reason]).deliver_now
     end
     redirect_to root_path
   end
@@ -146,6 +146,7 @@ def deny
     @teacher.denied!
     if !params[:skip_email].present?
       # TODO: Update dropdown to select the email template.
+      puts params[:denial_reason]
       TeacherMailer.deny_email(@teacher, params[:denial_reason]).deliver_now
     end
     redirect_to root_path
@@ -160,7 +161,12 @@ def destroy
   def resend_welcome_email
     if @teacher.validated? || @is_admin
       TeacherMailer.welcome_email(@teacher).deliver_now
+      flash[:success] = "Welcome email resent successfully!"
+    else
+      flash[:alert] = "Error resending welcome email. \
+      Please ensure that your account has been validated by an administrator."
     end
+    redirect_to edit_teacher_path(@teacher)
   end
 
   def import

diff --git a/app/mailers/teacher_mailer.rb b/app/mailers/teacher_mailer.rb
@@ -52,7 +52,9 @@ def liquid_assigns
     base_rules = {
       bjc_password: Rails.application.secrets[:bjc_password],
       piazza_password: Rails.application.secrets[:piazza_password],
-      denial_reason: @denial_reason
+      # TODO: Review if below two are needed, or can they be refractored?
+      denial_reason: @denial_reason,
+      request_reason: @request_reason
     }
     base_rules.merge!(@teacher.email_attributes)
     base_rules.with_indifferent_access

diff --git a/app/views/email_templates/_liquid_fields.erb b/app/views/email_templates/_liquid_fields.erb
@@ -27,5 +27,9 @@
       <td><code>{{denial_reason}}</code></td>
       <td>(Only on denial emails.)</td>
     </tr>
+    <tr>
+      <td><code>{{request_reason}}</code></td>
+      <td>(Only on request emails.)</td>
+    </tr>
   </tbody>
 </table>
diff --git a/app/views/main/_deny_modal.html.erb b/app/views/main/_deny_modal.html.erb
@@ -5,23 +5,25 @@
         <h4 class="modal-title"></h4>
         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
       </div>
+      <!-- default action is deny, but it can be dynamically changed. Check the js at the bottom of this file -->
       <%= form_tag deny_teacher_path(0), method: :post, class: "form-horizontal" do %>
         <div class="modal-body">
-            <%= label_tag 'denial_reason', 'Reason', class: 'control-label' %>
-            <%= text_field_tag :denial_reason, params[:denial_reason], class: "form-control" %>
-            <!-- <div class="form-group">
-              <label for="reason-select">Reason for Denial (Select)</label>
-              <select id="reason-select" name="reason-select" class="form-control">
-                <option value="">Select a reason</option>
-                <option value="Incomplete Application">Incomplete Application</option>
-                <option value="Insufficient Experience">Insufficient Experience</option>
-                <option value="Unfavorable References">Unfavorable References</option>
-              </select>
-            </div> -->
-            <div class="form-check">
-              <%= check_box_tag :skip_email, 'skip_email', false, class: 'form-check-input' %>
-              <%= label_tag 'skip_email', 'Skip email notifcation?', class: 'form-check-label' %>
-            </div>
+          <%= hidden_field_tag :action_type, '', class: "form-control action-type" %>
+          <%= label_tag 'action_reason', 'Reason', class: 'control-label' %>
+          <%= text_field_tag :action_reason_placeholder, '', class: "form-control action-reason", id: "action_reason" %>
+          <!-- <div class="form-group">
+            <label for="reason-select">Reason for Denial (Select)</label>
+            <select id="reason-select" name="reason-select" class="form-control">
+              <option value="">Select a reason</option>
+              <option value="Incomplete Application">Incomplete Application</option>
+              <option value="Insufficient Experience">Insufficient Experience</option>
+              <option value="Unfavorable References">Unfavorable References</option>
+            </select>
+          </div> -->
+          <div class="form-check">
+            <%= check_box_tag :skip_email, 'skip_email', false, class: 'form-check-input' %>
+            <%= label_tag 'skip_email', 'Skip email notifcation?', class: 'form-check-label' %>
+          </div>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-danger" data-dismiss="modal">Cancel</button>
@@ -33,31 +35,43 @@
 </div>
 
 <script type="text/javascript">
-  let modal = $('.js-denialModal');
-  modal.on('shown.bs.modal', function (event) {
-    let button = $(event.relatedTarget);
-    let teacherId = button.data('teacher-id');
-    let teacherName = button.data('teacher-name');
-    let newAction = null;
-    let newTitle = null;
-    switch(button.data('modal-type')) {
-      case "deny":
-        newAction = `/teachers/${teacherId}/deny`;
-        newTitle = 'Deny ' + teacherName;
-        break;
-      case "request_info":
-        newAction = `/teachers/${teacherId}/request_info`;
-        newTitle = 'Request Info from ' + teacherName;
-        break;
-      default:
-        newAction = `/teachers/${teacherId}/deny`;
-        newTitle = 'Deny ' + teacherName;
-    }
-    modal.find('.form-horizontal').attr('action', newAction);
-    modal.find('.modal-title').text(newTitle);
-  });
-  modal.on('hidden.bs.modal', function () {
-    $('input[name="denial_reason"]').val('');
-    modal.find('.modal-title').text('');
-  });
+    let modal = $('.js-denialModal');
+    modal.on('shown.bs.modal', function (event) {
+        let button = $(event.relatedTarget); // Button that triggered the modal
+        let teacherId = button.data('teacher-id');
+        let teacherName = button.data('teacher-name');
+        let actionType = button.data('modal-type'); // Action type, e.g., "deny", "request_info"
+        let newAction, newTitle, inputName;
+
+        // Determine the action and title based on the button clicked
+        switch(actionType) {
+            case "deny":
+                newAction = `/teachers/${teacherId}/deny`;
+                newTitle = 'Deny ' + teacherName;
+                inputName = 'denial_reason'; // The dynamic part for the input's name attribute
+                break;
+            case "request_info":
+                newAction = `/teachers/${teacherId}/request_info`;
+                newTitle = 'Request Info from ' + teacherName;
+                inputName = 'request_reason'; // Change accordingly
+                break;
+            default:
+                newAction = `/teachers/${teacherId}/deny`;
+                newTitle = 'Deny ' + teacherName;
+                inputName = 'denial_reason'; // Fallback option
+        }
+
+        // Update the form's action and the modal's title
+        modal.find('.form-horizontal').attr('action', newAction);
+        modal.find('.modal-title').text(newTitle);
+
+        // Dynamically change the name attribute of the input field
+        modal.find('#action_reason').attr('name', inputName);
+    });
+
+    // Reset the input field when the modal is closed
+    modal.on('hidden.bs.modal', function () {
+        modal.find('#action_reason').val('').attr('name', 'action_reason_placeholder');
+        modal.find('.modal-title').text('');
+    });
 </script>
diff --git a/app/views/main/dashboard.html.erb b/app/views/main/dashboard.html.erb
@@ -1,44 +1,44 @@
 <% provide(:title, "BJC Teacher Dashboard") %>
 <div class="requests-dashboard">
   <h2>New Requests</h2>
-    <table class="table js-dataTable">
-      <thead class="thead-dark">
-        <tr>
-          <%= render 'teachers/table_headers' %>
-          <th scope="col">Actions</th>
-        </tr>
-      </thead>
-      <tbody>
-        <% @unreviewed_teachers.each do |teacher| %>
-        <tr>
-          <%= render 'teachers/teacher', teacher: teacher %>
-          <td>
-            <div class="btn-group" role="group" aria-label="Validate or Remove Teacher">
-              <%= button_to("✔️", validate_teacher_path(teacher.id),
-                 class: 'btn-group btn btn-outline-success', type: 'button') %>
-              <!-- <span>
+  <table class="table js-dataTable">
+    <thead class="thead-dark">
+    <tr>
+      <%= render 'teachers/table_headers' %>
+      <th scope="col">Actions</th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @unreviewed_teachers.each do |teacher| %>
+      <tr>
+        <%= render 'teachers/teacher', teacher: teacher %>
+        <td>
+          <div class="btn-group" role="group" aria-label="Validate or Remove Teacher">
+            <%= button_to("✔️", validate_teacher_path(teacher.id),
+                          class: 'btn-group btn btn-outline-success', type: 'button') %>
+            <span>
                 <button class="btn btn-outline-warning" type="button" data-toggle="modal" data-target=".js-denialModal"
-                  data-modal-type="request_info" data-teacher-id="<%= teacher.id %>" data-teacher-name="<%= teacher.full_name %>">
+                        data-modal-type="request_info" data-teacher-id="<%= teacher.id %>" data-teacher-name="<%= teacher.full_name %>">
                   ❓
                 </button>
-              </span> -->
-              <span>
+              </span>
+            <span>
                 <button class="btn btn-outline-danger" type="button" data-toggle="modal" data-target=".js-denialModal"
-                  data-modal-type="deny" data-teacher-id="<%= teacher.id %>" data-teacher-name="<%= teacher.full_name %>">
+                        data-modal-type="deny" data-teacher-id="<%= teacher.id %>" data-teacher-name="<%= teacher.full_name %>">
                   ❌
                 </button>
               </span>
-            </div>
-          </td>
-        </tr>
-        <% end %>
-      </tbody>
-    </table>
-    <% if @unreviewed_teachers.empty? %>
-      <div class="alert alert-success" role="alert">
-        <strong>No unreviewed forms!</strong>
-      </div>
+          </div>
+        </td>
+      </tr>
     <% end %>
+    </tbody>
+  </table>
+  <% if @unreviewed_teachers.empty? %>
+    <div class="alert alert-success" role="alert">
+      <strong>No unreviewed forms!</strong>
+    </div>
+  <% end %>
 </div>
 
 <%= render 'deny_modal' %>
@@ -52,65 +52,65 @@
     <h2>Course Statistics</h2>
     <table class="table">
       <thead class="thead-dark">
-        <tr>
+      <tr>
         <th scope="col"> Status </th>
         <th scope="col"> Count </th>
-        </tr>
+      </tr>
       </thead>
       <tbody>
-        <% @statuses.each do |key, value| %>
+      <% @statuses.each do |key, value| %>
         <tr>
           <td> <%= key.humanize.titlecase %> </td>
           <td> <%= value %> </td>
         </tr>
-        <% end %>
+      <% end %>
       </tbody>
-      </table>
+    </table>
   </div>
 
   <div class="col-6">
     <h2>School Statistics</h2>
     <table class="table">
       <thead class="thead-dark">
-        <tr>
+      <tr>
         <th scope="col">School</th>
         <th scope="col">Location</th>
         <th scope="col">Teachers</th>
-        </tr>
+      </tr>
       </thead>
       <tbody>
-        <% @schools.each do |school| %>
+      <% @schools.each do |school| %>
         <tr>
           <td><%= link_to(school.name, school_path(school)) %></td>
           <td><%= school.location %></td>
           <td><%= school.teachers_count %></td>
         </tr>
-        <% end %>
+      <% end %>
       </tbody>
     </table>
   </div>
 </div>
 
 <script>
-  let map;
-  function initMap() {
-    map = new google.maps.Map(document.getElementById('map'), {
-      center: {lat: 39.50, lng: -98.35},
-      zoom: 4
-    });
+    let map;
+    function initMap() {
+        map = new google.maps.Map(document.getElementById('map'), {
+            center: {lat: 39.50, lng: -98.35},
+            zoom: 4
+        });
 
-    let school_data = <%= School.all_maps_data.html_safe %>;
-    for (let school of school_data) {
-      let marker = new google.maps.Marker({
-        position: school.position,
-        map: map
-      });
-      let infoWindow = new google.maps.InfoWindow({ content: school.name });
-      marker.addListener('click', () => { infoWindow.open(map, marker) });
+        let school_data = <%= School.all_maps_data.html_safe %>;
+        for (let school of school_data) {
+            let marker = new google.maps.Marker({
+                position: school.position,
+                map: map
+            });
+            let infoWindow = new google.maps.InfoWindow({ content: school.name });
+            marker.addListener('click', () => { infoWindow.open(map, marker) });
+        }
     }
-  }
 </script>
 
 <script async defer
-  src="https://maps.googleapis.com/maps/api/js?key=AIzaSyA9YjQt1uyBo0rEKe7UWMeW9GUryKtaMVo&callback=initMap">
+        src="https://maps.googleapis.com/maps/api/js?key=AIzaSyA9YjQt1uyBo0rEKe7UWMeW9GUryKtaMVo&callback=initMap">
 </script>
diff --git a/db/seed_data.rb b/db/seed_data.rb
@@ -59,6 +59,29 @@ module SeedData
 
   DENY_EMAIL3
 
+  @request_info_email = <<-REQUEST_INFO_EMAIL
+    <p>Dear {{teacher_first_name}},</p>
+
+    <p>We hope this message finds you well. We're writing to you regarding your ongoing application with BJC. As part of our review process, we've identified that some additional information is required to move forward.</p>
+
+    <p><strong>Required Information:</strong><br>
+    We kindly ask you to provide the following details to complete your application:</p>
+    <p>{{ request_reason | strip_tags }}</p>
+
+    <p>To submit the requested information, please follow these steps:</p>
+    <ol>
+      <li>Log into your BJC account using your registered email and password.</li>
+      <li>Locate your current application and update the information.</li>
+      <li>Fill in the necessary details in the provided fields and submit the update.</li>
+    </ol>
+
+    <p>Thank you for your attention to this matter. We look forward to receiving the additional information and advancing your application process.</p>
+
+    <p>Warm regards,</p>
+    <p>[Your Name]</p>
+  REQUEST_INFO_EMAIL
+
+
   @default_to_field = "{{teacher_email}}, {{teacher_personal_email}}"
 
   def self.emails
@@ -100,8 +123,8 @@ def self.emails
         subject: "Deny Email"
       },
       {
+        body: @request_info_email,
         to: @default_to_field,
-        body: @basic_email_with_reason,
         path: "teacher_mailer/request_info_email",
         locale: nil,
         handler: "liquid",