add specs to check if filming hours is present in form and contract

app/controllers/location_releases_controller.rb

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

app/controllers/public/location_releases_controller.rb

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

app/policies/task_request_policy.rb

@@ -22,8 +22,4 @@ class TaskRequestPolicy < ApplicationPolicy
   def cancel?
     true
   end
-
-  def open_deliverable?
-    true
-  end
 end

app/views/contracts/_signature_page.html.erb

@@ -29,6 +29,7 @@
   <% 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,6 +39,9 @@
       <%= 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,6 +46,9 @@
           <%= 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 %>

app/views/task_requests/_task_request.html.erb

@@ -26,9 +26,6 @@
         <% if policy(task_request).edit? %>
           <%= link_to fa_icon("pencil fw", text: "Edit"), [:edit, task_request.project, task_request], class: "dropdown-item" %>
         <% end %>
-        <% if policy(task_request).open_deliverable? && task_request.status == "completed" %>
-          <%= link_to fa_icon("external-link fw", text: t(".actions.open_deliverable")), task_request.deliverable_url, class: "dropdown-item", target: '_blank' %>
-        <% end %>
         <% if policy(task_request).cancel? && !task_request.cancelled? %>
           <%= link_to fa_icon("ban fw", text: "Cancel"), [:cancel, task_request.project, task_request], class: "dropdown-item", method: :post %>
         <% end %>

config/locales/en.yml

@@ -959,7 +959,6 @@ en:
     task_request:
       actions:
         manage: Manage
-        open_deliverable: Open Deliverable
     update:
       notice: Task request updated successfully.
   user_mailer: 

config/locales/es.yml

@@ -182,8 +182,3 @@ es:
       photos:
         guardian_photo:
           heading: Guardian Photo (ES)
-  task_requests:
-    task_request:
-      actions:
-        manage: Manage (ES)
-        open_deliverable: Open Deliverable (ES)

db/migrate/20200603090419_add_filming_hours_to_location_releases.rb

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

spec/features/user_managing_location_releases_spec.rb

@@ -17,6 +17,7 @@ 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
 
@@ -51,6 +52,7 @@ 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")
@@ -136,6 +138,7 @@ 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, 
@@ -172,6 +175,8 @@ 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
@@ -222,6 +227,10 @@ 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

spec/features/user_managing_task_requests_spec.rb

@@ -1,73 +0,0 @@
-require "rails_helper"
-
-feature "User managing task requests" do
-  let(:current_user) { create(:user) }
-  let(:project) { create(:project, account: current_user.primary_account) }
-
-  before :each do
-    sign_in current_user
-  end
-
-  scenario "task requests table is visible" do
-    visit project_task_requests_path(project)
-
-    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 project_task_requests_path(project)
-
-    expect(page).to have_content no_task_requests_label
-
-    task_request = create(:task_request, project: project)
-
-    visit project_task_requests_path(project)
-
-    expect(page).not_to have_content no_task_requests_label
-
-    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
-
-  scenario "user does not see open deliverable action in manage dropdown if task status is not completed" do
-    task_request = create(:task_request, project: project)
-    visit project_task_requests_path(project)
-
-    click_on manage_button
-    expect(page).not_to have_content open_deliverable_action_label
-  end
-
-  scenario "user can click deliverable action in manage dropdown if task status is completed", js: true do
-    create(:task_request, project: project, status: "completed", deliverable_url: "/")
-    visit project_task_requests_path(project)
-
-    click_on manage_button
-    expect(page).to have_content open_deliverable_action_label
-    click_link open_deliverable_action_label
-    switch_to_window(windows.last)
-    expect(page).to have_content add_new_project_label
-  end
-
-  private
-
-  def no_task_requests_label
-    "Task requests will appear here"
-  end
-
-  def manage_button
-    t "task_requests.task_request.actions.manage"
-  end
-
-  def open_deliverable_action_label
-    t "task_requests.task_request.actions.open_deliverable"
-  end
-
-  def add_new_project_label
-    t "projects.index.actions.new"
-  end
-end