fix MR comment

app/controllers/location_releases_controller.rb

@@ -68,8 +68,7 @@ class LocationReleasesController < ApplicationController
       :territory_id, :territory_text,
       :term_id, :term_text,
       :restriction_id, :restriction_text,
-      :filming_started_on, :filming_ended_on,
-      :filming_hours
+      :filming_started_on, :filming_ended_on
     )
   end
 

app/controllers/public/location_releases_controller.rb

@@ -63,8 +63,7 @@ class Public::LocationReleasesController < Public::BaseController
       :person_address_zip, 
       :person_address_country,
       :signature_base64,
-      :locale, :contract_template, :filming_started_on, :filming_ended_on,
-      :filming_hours
+      :locale, :contract_template, :filming_started_on, :filming_ended_on
     )
   end
 

app/views/admin/task_requests/_task_request.html.erb

@@ -2,6 +2,12 @@
   <td>
     <%= task_request.id %>
   </td>
+  <td>
+    <%= task_request.project.account.name %>
+  </td>
+  <td>
+    <%= task_request.project.name %>
+  </td>
   <td>
     <%= task_request.created_at.strftime("%D") %>
   </td>

app/views/admin/task_requests/index.html.erb

@@ -3,6 +3,8 @@
     <thead class="thead-light">
       <tr>
         <th>Task ID</th>
+        <th>Account Name</th>
+        <th>Project Name</th>
         <th>Created On</th>
         <th>Deadline</th>
         <th>Time Allowed</th>
@@ -15,7 +17,7 @@
         <%= render @task_requests %>
       <% else %>
         <tr>
-          <td colspan="6" class="py-4 text-center text-muted"><%= t(".empty") %></td>
+          <td colspan="20" class="py-4 text-center text-muted"><%= t(".empty") %></td>
         </tr>
       <% end %>
     </tbody>

app/views/contracts/_signature_page.html.erb

@@ -29,7 +29,6 @@
   <% if releasable.model_name == "LocationRelease" %>
     <%= description_list_pair "Filming Started On:", releasable&.filming_started_on&.strftime("%D") %>
     <%= description_list_pair "Filming Ended On:", releasable&.filming_ended_on&.strftime("%D") %>
-    <%= description_list_pair "Filming Hours:", releasable&.filming_hours %>
   <% end %>
   <% if contract_template.fee? %>
     <%= description_list_pair "Fee:", number_to_currency(contract_template.fee) %>

app/views/location_releases/_form.html.erb

@@ -39,9 +39,6 @@
       <%= form.text_field :filming_started_on, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true  %>
       <%= form.text_field :filming_ended_on, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %>
     </div>
-    <div class="form-row">
-      <%= form.text_field :filming_hours, wrapper_class: "col-sm-12" %>
-    </div>
   <% end %>
 
   <hr>

app/views/public/location_releases/new.html.erb

@@ -46,9 +46,6 @@
           <%= form.text_field :filming_started_on, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %>
           <%= form.text_field :filming_ended_on, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %>
         </div>
-        <div class="form-row">
-          <%= form.text_field :filming_hours, wrapper_class: "col-sm-12" %>
-        </div>
       <% end %>
 
       <%= card_field_set_tag t(".signature.heading") do %>

db/migrate/20200603090419_add_filming_hours_to_location_releases.rb

@@ -1,5 +0,0 @@
-class AddFilmingHoursToLocationReleases < ActiveRecord::Migration[6.0]
-  def change
-    add_column :location_releases, :filming_hours, :text, default: ''
-  end
-end

spec/features/admin_managing_task_requests_spec.rb

@@ -0,0 +1,48 @@
+require "rails_helper"
+
+feature "Admin managing task requests" do
+  let(:current_user) { create(:user, admin: true, email: "user@test.com") }
+  let(:project) { create(:project, account: current_user.primary_account, name: "Test Project") }
+
+  before do
+    sign_in current_user
+  end
+
+  scenario "task requests table is visible" do
+    visit admin_task_requests_path
+
+    expect(page).to have_content "Task ID"
+    expect(page).to have_content "Account Name"
+    expect(page).to have_content "Project Name"
+    expect(page).to have_content "Created On"
+    expect(page).to have_content "Deadline"
+    expect(page).to have_content "Time Allowed"
+    expect(page).to have_content "Status"
+  end
+
+  scenario "sees list of task requests" do
+    visit admin_task_requests_path
+
+    expect(page).to have_content no_task_requests_label
+
+    task_request = create(:task_request)
+
+    visit admin_task_requests_path
+
+    expect(page).not_to have_content no_task_requests_label
+
+    expect(page).to have_content task_request.id
+    expect(page).to have_content task_request.project.account.name
+    expect(page).to have_content task_request.project.name
+    expect(page).to have_content task_request.created_at.try(:strftime, '%D')
+    expect(page).to have_content task_request.deadline.try(:strftime, '%D')
+    expect(page).to have_content task_request.time_allowed
+    expect(page).to have_content task_request.status.capitalize
+  end
+
+  private
+
+  def no_task_requests_label
+    "Task requests will appear here"
+  end
+end

spec/features/user_managing_location_releases_spec.rb

@@ -17,7 +17,6 @@ feature "User managing location releases" do
         fill_in person_phone_field, with: "555-555-5555"
         fill_in person_email_field, with: "jane.doe@test.com"
         fill_in person_address_street1_field, with: "100 Broadway"
-        fill_in filming_hours_field, with: "04:00 - 22:00"
         draw_signature file_fixture("signature.png"), "location_release_signature_base64"
       end
 
@@ -52,7 +51,6 @@ feature "User managing location releases" do
 
       by "filling out the remaining information" do
           fill_in_release_fields name: "Test Location Release"
-          fill_in filming_hours_field, with: "04:00 - 22:00"
           click_button create_release_button
           expect(page).to have_content(create_release_notice)
           expect(page).to have_photo("location_photo.png")
@@ -138,7 +136,6 @@ feature "User managing location releases" do
                               :native,
                               project: project,
                               name: "Benny's Burritos",
-                              filming_hours: "06:00 - 20:00",
                               tag_list: "Restaurant",
                               notes: [
                                 build(:note, 
@@ -175,8 +172,6 @@ feature "User managing location releases" do
     expect(pdf_body).to have_content("Restaurant")
     expect(pdf_body).to have_content photos_heading.upcase
     expect(pdf_body).to have_content("location_photo.png")
-    expect(pdf_body).to have_content("Filming Hours")
-    expect(pdf_body).to have_content("06:00 - 20:00")
   end
 
   context "when the user is associate" do
@@ -227,10 +222,6 @@ feature "User managing location releases" do
     "location_release[person_phone]"
   end
 
-  def filming_hours_field
-    "location_release[filming_hours]"
-  end
-
   def have_photo(filename, attr: "src")
     have_selector("img[#{attr}*='#{filename}']")
   end