add filming location field to the location releases
This commit is contained in:
@@ -68,7 +68,8 @@ class LocationReleasesController < ApplicationController
|
|||||||
:territory_id, :territory_text,
|
:territory_id, :territory_text,
|
||||||
:term_id, :term_text,
|
:term_id, :term_text,
|
||||||
:restriction_id, :restriction_text,
|
:restriction_id, :restriction_text,
|
||||||
:filming_started_on, :filming_ended_on
|
:filming_started_on, :filming_ended_on,
|
||||||
|
:filming_hours
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -63,7 +63,8 @@ class Public::LocationReleasesController < Public::BaseController
|
|||||||
:person_address_zip,
|
:person_address_zip,
|
||||||
:person_address_country,
|
:person_address_country,
|
||||||
:signature_base64,
|
:signature_base64,
|
||||||
:locale, :contract_template, :filming_started_on, :filming_ended_on
|
:locale, :contract_template, :filming_started_on, :filming_ended_on,
|
||||||
|
:filming_hours
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,7 @@
|
|||||||
<% if releasable.model_name == "LocationRelease" %>
|
<% if releasable.model_name == "LocationRelease" %>
|
||||||
<%= description_list_pair "Filming Started On:", releasable&.filming_started_on&.strftime("%D") %>
|
<%= 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 Ended On:", releasable&.filming_ended_on&.strftime("%D") %>
|
||||||
|
<%= description_list_pair "Filming Hours:", releasable&.filming_hours %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% if contract_template.fee? %>
|
<% if contract_template.fee? %>
|
||||||
<%= description_list_pair "Fee:", number_to_currency(contract_template.fee) %>
|
<%= description_list_pair "Fee:", number_to_currency(contract_template.fee) %>
|
||||||
|
|||||||
@@ -39,6 +39,9 @@
|
|||||||
<%= form.text_field :filming_started_on, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %>
|
<%= 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 %>
|
<%= form.text_field :filming_ended_on, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-row">
|
||||||
|
<%= form.text_field :filming_hours, wrapper_class: "col-sm-12" %>
|
||||||
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
|
|||||||
@@ -46,6 +46,9 @@
|
|||||||
<%= form.text_field :filming_started_on, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %>
|
<%= 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 %>
|
<%= form.text_field :filming_ended_on, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-row">
|
||||||
|
<%= form.text_field :filming_hours, wrapper_class: "col-sm-12" %>
|
||||||
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= card_field_set_tag t(".signature.heading") do %>
|
<%= card_field_set_tag t(".signature.heading") do %>
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
class AddFilmingHoursToLocationReleases < ActiveRecord::Migration[6.0]
|
||||||
|
def change
|
||||||
|
add_column :location_releases, :filming_hours, :text, default: ''
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -17,6 +17,7 @@ feature "User managing location releases" do
|
|||||||
fill_in person_phone_field, with: "555-555-5555"
|
fill_in person_phone_field, with: "555-555-5555"
|
||||||
fill_in person_email_field, with: "jane.doe@test.com"
|
fill_in person_email_field, with: "jane.doe@test.com"
|
||||||
fill_in person_address_street1_field, with: "100 Broadway"
|
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"
|
draw_signature file_fixture("signature.png"), "location_release_signature_base64"
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -51,6 +52,7 @@ feature "User managing location releases" do
|
|||||||
|
|
||||||
by "filling out the remaining information" do
|
by "filling out the remaining information" do
|
||||||
fill_in_release_fields name: "Test Location Release"
|
fill_in_release_fields name: "Test Location Release"
|
||||||
|
fill_in filming_hours_field, with: "04:00 - 22:00"
|
||||||
click_button create_release_button
|
click_button create_release_button
|
||||||
expect(page).to have_content(create_release_notice)
|
expect(page).to have_content(create_release_notice)
|
||||||
expect(page).to have_photo("location_photo.png")
|
expect(page).to have_photo("location_photo.png")
|
||||||
@@ -136,6 +138,7 @@ feature "User managing location releases" do
|
|||||||
:native,
|
:native,
|
||||||
project: project,
|
project: project,
|
||||||
name: "Benny's Burritos",
|
name: "Benny's Burritos",
|
||||||
|
filming_hours: "06:00 - 20:00",
|
||||||
tag_list: "Restaurant",
|
tag_list: "Restaurant",
|
||||||
notes: [
|
notes: [
|
||||||
build(:note,
|
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("Restaurant")
|
||||||
expect(pdf_body).to have_content photos_heading.upcase
|
expect(pdf_body).to have_content photos_heading.upcase
|
||||||
expect(pdf_body).to have_content("location_photo.png")
|
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
|
end
|
||||||
|
|
||||||
context "when the user is associate" do
|
context "when the user is associate" do
|
||||||
@@ -222,6 +227,10 @@ feature "User managing location releases" do
|
|||||||
"location_release[person_phone]"
|
"location_release[person_phone]"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def filming_hours_field
|
||||||
|
"location_release[filming_hours]"
|
||||||
|
end
|
||||||
|
|
||||||
def have_photo(filename, attr: "src")
|
def have_photo(filename, attr: "src")
|
||||||
have_selector("img[#{attr}*='#{filename}']")
|
have_selector("img[#{attr}*='#{filename}']")
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user