From 5af16f9784d634e56c2f9d6c2227f9cabc70032c Mon Sep 17 00:00:00 2001 From: Bilal Date: Mon, 27 Jul 2020 03:45:06 +0200 Subject: [PATCH 1/4] add guardian fields to acq releases --- .../acquired_media_releases_controller.rb | 95 ++++++++++++------ .../acquired_media_releases_controller.rb | 87 ++++++++++++----- app/models/acquired_media_release.rb | 40 +++++++- .../acquired_media_releases/_form.html.erb | 64 +++++++++++++ app/views/contract_templates/_form.html.erb | 2 +- .../acquired_media_releases/new.html.erb | 96 +++++++++++++++++++ config/locales/en.yml | 44 +++++++++ config/locales/es.yml | 50 ++++++++++ ...dians_fields_to_acquired_media_releases.rb | 25 +++++ 9 files changed, 448 insertions(+), 55 deletions(-) create mode 100644 db/migrate/20200725231419_add_guardians_fields_to_acquired_media_releases.rb diff --git a/app/controllers/acquired_media_releases_controller.rb b/app/controllers/acquired_media_releases_controller.rb index 9c1858e..fc233ba 100644 --- a/app/controllers/acquired_media_releases_controller.rb +++ b/app/controllers/acquired_media_releases_controller.rb @@ -56,35 +56,74 @@ class AcquiredMediaReleasesController < ApplicationController end end + def person_params + %i[ + person_first_name + person_last_name + person_phone + person_company + person_email + person_title + person_address_street1 + person_address_street2 + person_address_city + person_address_state + person_address_zip + person_address_country + ] + end + + def guardian_params + %i[ + guardian_first_name + guardian_last_name + guardian_phone + guardian_email + guardian_photo + guardian_address_street1 + guardian_address_street2 + guardian_address_city + guardian_address_state + guardian_address_zip + guardian_address_country + ] + end + + def second_guardian_params + %i[ + guardian_2_first_name + guardian_2_last_name + guardian_2_phone + guardian_2_email + guardian_2_photo + guardian_2_address_street1 + guardian_2_address_street2 + guardian_2_address_city + guardian_2_address_state + guardian_2_address_zip + guardian_2_address_country + ] + end + def acquired_media_release_params - params.require(:acquired_media_release).permit( - :name, - :territory, - :term, - :person_first_name, - :person_last_name, - :person_phone, - :person_email, - :person_company, - :person_title, - :person_address_street1, - :person_address_street2, - :person_address_city, - :person_address_state, - :person_address_zip, - :person_address_country, - :contract, - :applicable_medium_id, :applicable_medium_text, - :territory_id, :territory_text, - :term_id, :term_text, - :restriction_id, :restriction_text, - categories: [], - file_infos_attributes: [ - :filename, - :content_type, - :byte_size - ] - ) + params.require(:acquired_media_release).permit(person_params, + guardian_params, + second_guardian_params, + :minor, + :name, + :territory, + :term, + :contract, + :applicable_medium_id, :applicable_medium_text, + :territory_id, :territory_text, + :term_id, :term_text, + :restriction_id, :restriction_text, + categories: [], + file_infos_attributes: %i[ + filename + content_type + byte_size + ]) end def build_acquired_media_release(attrs = {}) diff --git a/app/controllers/public/acquired_media_releases_controller.rb b/app/controllers/public/acquired_media_releases_controller.rb index 5288601..9554c08 100644 --- a/app/controllers/public/acquired_media_releases_controller.rb +++ b/app/controllers/public/acquired_media_releases_controller.rb @@ -41,31 +41,70 @@ class Public::AcquiredMediaReleasesController < Public::BaseController end end + def person_params + %i[ + person_first_name + person_last_name + person_phone + person_fax + person_email + person_title + person_address_street1 + person_address_street2 + person_address_city + person_address_state + person_address_zip + person_address_country + ] + end + + def guardian_params + %i[ + guardian_first_name + guardian_last_name + guardian_phone + guardian_email + guardian_photo + guardian_address_street1 + guardian_address_street2 + guardian_address_city + guardian_address_state + guardian_address_zip + guardian_address_country + ] + end + + def second_guardian_params + %i[ + guardian_2_first_name + guardian_2_last_name + guardian_2_phone + guardian_2_email + guardian_2_photo + guardian_2_address_street1 + guardian_2_address_street2 + guardian_2_address_city + guardian_2_address_state + guardian_2_address_zip + guardian_2_address_country + ] + end + def acquired_media_release_params - params.require(:acquired_media_release).permit( - :name, - :description, - :person_first_name, - :person_last_name, - :person_email, - :person_title, - :person_phone, - :person_fax, - :person_address_street1, - :person_address_street2, - :person_address_city, - :person_address_state, - :person_address_zip, - :person_address_country, - :signature_base64, - :locale, :contract_template, - categories: [], - file_infos_attributes: [ - :filename, - :content_type, - :byte_size - ] - ) + params.require(:acquired_media_release).permit(person_params, + guardian_params, + second_guardian_params, + :minor, + :name, + :description, + :signature_base64, + :locale, :contract_template, + categories: [], + file_infos_attributes: %i[ + filename + content_type + byte_size + ]) end def acquired_media_release_params_with_locale diff --git a/app/models/acquired_media_release.rb b/app/models/acquired_media_release.rb index d05f127..0c6d2cf 100644 --- a/app/models/acquired_media_release.rb +++ b/app/models/acquired_media_release.rb @@ -11,6 +11,10 @@ class AcquiredMediaRelease < ApplicationRecord include PersonName include CsvExportable include Approvable + include GuardianPhotoable + include SecondGuardianPhotoable + include GuardianName + include SecondGuardianName class << self def custom_csv_exportable_headers @@ -33,6 +37,38 @@ class AcquiredMediaRelease < ApplicationRecord %w(person_address_country country) ] + composed_of :guardian_address, + class_name: 'Address', + mapping: [ + %w[guardian_address_street1 street1], + %w[guardian_address_street2 street2], + %w[guardian_address_city city], + %w[guardian_address_state state], + %w[guardian_address_zip zip], + %w[guardian_address_country country] + ] + + composed_of :guardian_2_address, + class_name: 'Address', + mapping: [ + %w[guardian_2_address_street1 street1], + %w[guardian_2_address_street2 street2], + %w[guardian_2_address_city city], + %w[guardian_2_address_state state], + %w[guardian_2_address_zip zip], + %w[guardian_2_address_country country] + ] + + # We don't care for the argument but method WILL receive option name + # when called from inside with_option block, hence * argument + def self.face_photo_acceptable_content_types(*) + ['image/png', 'image/jpeg'] + end + + def self.acceptable_import_file_extensions + ['.png', '.jpeg', '.jpg', '.pdf'] + end + validates :name, presence: true validates :person_email, email: true, allow_blank: true @@ -54,8 +90,8 @@ class AcquiredMediaRelease < ApplicationRecord # CATEGORIES = ["Artwork", "Film Footage", "Video Footage", "Still Photograph"].freeze CATEGORIES = ["Film Footage", "Video Footage", "Still Photograph"].freeze - def minor? - false + def second_guardian_present? + guardian_2_first_name.present? end def contact_person diff --git a/app/views/acquired_media_releases/_form.html.erb b/app/views/acquired_media_releases/_form.html.erb index 4f54715..54c5804 100644 --- a/app/views/acquired_media_releases/_form.html.erb +++ b/app/views/acquired_media_releases/_form.html.erb @@ -1,6 +1,10 @@ <%= errors_summary_for acquired_media_release %> <%= bootstrap_form_with model: model, local: true do |form| %> <%= field_set_tag content_tag(:span, t(".acquired_media_details.heading"), class: "h6 text-muted text-uppercase") do %> + <%= form.form_group :minor do %> + <%= form.check_box :minor, label: t("helpers.label.talent_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %> + <% end %> +
<%= form.text_field :name, required: true, wrapper_class: "col-12" %>
@@ -9,6 +13,28 @@ <%= form.check_box :categories, { multiple: true, label: category }, category, false %> <% end %> <% end %> + +
!acquired_media_release.minor?) %>" data-ujs-target="guardian-fields"> + <%= card_field_set_tag t(".guardian_info.heading") do %> +
+ <%= form.text_field :guardian_first_name, required: acquired_media_release.minor?, wrapper_class: "col-sm-3" %> + <%= form.text_field :guardian_last_name, required: acquired_media_release.minor?, wrapper_class: "col-sm-3" %> + <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %> + <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %> +
+ <%= render "shared/address_fields", form: form, subject: "guardian" %> + <% end %> + + <%= card_field_set_tag t(".guardian_2_info.heading") do %> +
+ <%= form.text_field :guardian_2_first_name, wrapper_class: "col-sm-3" %> + <%= form.text_field :guardian_2_last_name, wrapper_class: "col-sm-3" %> + <%= form.phone_field :guardian_2_phone, wrapper_class: "col-sm-6" %> + <%= form.text_field :guardian_2_email, wrapper_class: "col-sm-6" %> +
+ <%= render "shared/address_fields", form: form, subject: "guardian_2" %> + <% end %> +
<% end %>
@@ -19,6 +45,44 @@ For optimal accuracy, please ensure video file names and photo file names match the source file name in the editing sequence. <%= render "shared/file_infos_dropzone", form: form, releasable: acquired_media_release %> + +
!acquired_media_release.minor?) %>" data-ujs-target="guardian-fields"> +
+
+

<%= t(".photos.guardian_photo.heading") %>

+
+
+ No photo yet +
+
+ <% if acquired_media_release.guardian_photo.attached? %> + <%= javascript_tag nonce: true do %> + App.PhotoPreview.set("#guardian-photo-preview", "<%= url_for(acquired_media_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>"); + <% end %> + <% end %> +
+ <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if acquired_media_release.guardian_photo.attached?%> + <%= form.file_field :guardian_photo, hide_label: true, data: { ujs_target: "guardian-photo-input" }, help: "PNG or JPG only", accept: acquired_media_release.class.face_photo_acceptable_content_types.join(",") %> +
+ +

<%= t(".photos.guardian_2_photo.heading") %>

+
+
+ No photo yet +
+
+ <% if acquired_media_release.guardian_2_photo.attached? %> + <%= javascript_tag nonce: true do %> + App.PhotoPreview.set("#guardian-2-photo-preview", "<%= url_for(acquired_media_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>"); + <% end %> + <% end %> +
+ <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if acquired_media_release.guardian_2_photo.attached?%> + <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, help: "PNG or JPG only", accept: acquired_media_release.class.face_photo_acceptable_content_types.join(",") %> +
+
+
+
<% end %>
diff --git a/app/views/contract_templates/_form.html.erb b/app/views/contract_templates/_form.html.erb index 15d37ff..5871713 100644 --- a/app/views/contract_templates/_form.html.erb +++ b/app/views/contract_templates/_form.html.erb @@ -2,7 +2,7 @@ <%= field_set_tag content_tag(:span, t(".release_info.heading"), class: "h6 text-muted text-uppercase") do %>
<%= form.text_field :name, wrapper_class: "col-sm-6" %> - <%= form.select :release_type, options_for_release_type_select(project, @release_type), { wrapper_class: "col-sm-6" }, data: { toggle: "collapse-select", target_show_values_mapping: { "#guardian_clause": %w(appearance talent misc medical), "#fee_field": %w(appearance talent location material acquired_media), "#exploitable_rights_fields": %w(appearance talent location material acquired_media), "#custom_fields": %w(medical misc), "#amendment_clause": %w(location) } }, class: "form-control custom-select" %> + <%= form.select :release_type, options_for_release_type_select(project, @release_type), { wrapper_class: "col-sm-6" }, data: { toggle: "collapse-select", target_show_values_mapping: { "#guardian_clause": %w(acquired_media appearance talent misc medical), "#fee_field": %w(appearance talent location material acquired_media), "#exploitable_rights_fields": %w(appearance talent location material acquired_media), "#custom_fields": %w(medical misc), "#amendment_clause": %w(location) } }, class: "form-control custom-select" %>
<%= form.radio_button :accessibility, :public_template, label: "Public", wrapper_class: "mr-3" %> diff --git a/app/views/public/acquired_media_releases/new.html.erb b/app/views/public/acquired_media_releases/new.html.erb index f8297fc..9730f2e 100644 --- a/app/views/public/acquired_media_releases/new.html.erb +++ b/app/views/public/acquired_media_releases/new.html.erb @@ -13,6 +13,17 @@
+ <% unless @contract_template.guardian_clause.blank? %> + <%= form.form_group :minor do %> + <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %> + <% end %> + + <%= card_field_set_tag t(".guardian_clause.heading") do %> +

<%= @contract_template.guardian_clause %>

+ <% end %> +
+ <% end %> + <%= card_field_set_tag t(".acquired_media_info.heading") do %>
<%= form.text_field :name, required: true, wrapper_class: "col-12" %> @@ -49,6 +60,91 @@
+ <% unless @contract_template.guardian_clause.blank? %> +
!@acquired_media_release.minor?) %>" data-ujs-target="guardian-fields"> + <%= card_field_set_tag t(".guardian_info.heading") do %> +
+ <%= form.text_field :guardian_first_name, required: @acquired_media_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %> + <%= form.text_field :guardian_last_name, required: @acquired_media_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %> + <%= form.phone_field :guardian_phone, required: @acquired_media_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %> + <%= form.text_field :guardian_email, required: @acquired_media_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %> +
+ <%= render "shared/address_fields", form: form, subject: "guardian", required: @acquired_media_release.minor?, data: { required_tag: "guardian" } %> + <% end %> + +
+ + <%= card_field_set_tag t(".guardian_photo.heading") do %> +
<%= t ".guardian_photo.instructions" %>
+
+
+
+ <%= t ".photo.no_photo" %> +
+
+
+ <% if @acquired_media_release.guardian_photo.attached? %> + <%= javascript_tag nonce: true do %> + App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@acquired_media_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>"); + <% end %> + <% end %> +
+ <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if @acquired_media_release.guardian_photo.attached? %> + <%= form.file_field :guardian_photo, required: @acquired_media_release.minor?, hide_label: true, data: { ujs_target: "guardian-photo-input" }, accept: @acquired_media_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %> +
+ <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=guardian-photo-input]" } %> +
+

+ <%= t ".photo.warning" %> +

+
+ <% end %> + +
+ + <%= card_field_set_tag t(".guardian_2_info.heading") do %> +
+ <%= form.text_field :guardian_2_first_name, wrapper_class: "col-sm-3" %> + <%= form.text_field :guardian_2_last_name, wrapper_class: "col-sm-3" %> + <%= form.phone_field :guardian_2_phone, wrapper_class: "col-sm-6" %> + <%= form.text_field :guardian_2_email, wrapper_class: "col-sm-6" %> +
+ <%= render "shared/address_fields", form: form, subject: "guardian_2" %> + <% end %> + +
+ + <%= card_field_set_tag t(".guardian_2_photo.heading") do %> +
<%= t ".guardian_2_photo.instructions" %>
+
+
+
+ <%= t ".photo.no_photo" %> +
+
+
+ <% if @acquired_media_release.guardian_2_photo.attached? %> + <%= javascript_tag nonce: true do %> + App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@acquired_media_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>"); + <% end %> + <% end %> +
+ <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if @acquired_media_release.guardian_2_photo.attached? %> + <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, accept: @acquired_media_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %> +
+ <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=guardian-2-photo-input]" } %> +
+

+ <%= t ".photo.warning" %> +

+
+ <% end %> + +
+ +
+ <% end %> + <%= card_field_set_tag t(".signature.heading") do %> <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 7363cdd..c5acb94 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -46,6 +46,15 @@ en: heading: 3 of 3 Contract & Exploitable Rights files: heading: 2 of 3 Files + guardian_2_info: + heading: Guardian Information (if company requires) + guardian_info: + heading: Guardian Information + photos: + guardian_2_photo: + heading: Second Guardian Photo + guardian_photo: + heading: Guardian Photo index: actions: new: Import Release @@ -436,6 +445,23 @@ en: label: acquired_media_release: description: Description of property + guardian_2_address_city: Guardian 2 city + guardian_2_address_country: Guardian 2 country + guardian_2_address_state: Guardian 2 state + guardian_2_address_street1: Guardian 2 address + guardian_2_address_street2: Guardian 2 address (Line 2) + guardian_2_address_zip: Guardian 2 zip code + guardian_2_email: Guardian 2 email + guardian_2_first_name: Guardian 2 first name + guardian_2_last_name: Guardian 2 last name + guardian_2_phone: Guardian 2 phone + guardian_address_city: Guardian city + guardian_address_country: Guardian country + guardian_address_state: Guardian state + guardian_address_street1: Guardian address + guardian_address_street2: Guardian address (Line 2) + guardian_address_zip: Guardian zip code + minor: Is the person a minor? name: Name of property person_address: Address person_address_city: City @@ -1042,10 +1068,28 @@ en: cancel: Cancel files: heading: File Information + guardian_2_info: + heading: Second Guardian Information (if company requires) + guardian_2_photo: + heading: Second Guardian Photo + instructions: > + Lastly, it's time for second guardian to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese! + guardian_clause: + heading: Guardian Clause + guardian_info: + heading: Guardian Information + guardian_photo: + heading: Guardian Photo + instructions: > + Lastly, it's time for guardian to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese! legal: heading: Legal personal_info: heading: Licensor/Owner Contact Information + photo: + no_photo: No photo yet + take_photo: Take Photo + warning: If your photo appears sideways, it will be autocorrected when you submit your release. signature: heading: Signature amendments: diff --git a/config/locales/es.yml b/config/locales/es.yml index a4a4688..46f8fce 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -2,6 +2,16 @@ es: acquired_media_releases: acquired_media_release: no_media: No Media (ES) + form: + guardian_2_info: + heading: Guardian Information (if company requires) [ES] + guardian_info: + heading: Guardian Information (ES) + photos: + guardian_2_photo: + heading: Second Guardian Photo + guardian_photo: + heading: Guardian Photo index: table_headers: file_infos_count: No. Files (ES) @@ -222,6 +232,26 @@ es: guardian_clause: Leave blank if not required for this contract (ES) signature_legal_text: Leave blank if not required for this contract (ES) label: + acquired_media_release: + guardian_2_address_city: Guardian 2 city (ES) + guardian_2_address_country: Guardian 2 country (ES) + guardian_2_address_state: Guardian 2 state (ES) + guardian_2_address_street1: Guardian 2 address (ES) + guardian_2_address_street2: Guardian 2 address (Line 2) (ES) + guardian_2_address_zip: Guardian 2 zip code (ES) + guardian_2_email: Guardian 2 email (ES) + guardian_2_first_name: Guardian 2 first name (ES) + guardian_2_last_name: Guardian 2 last name (ES) + guardian_2_phone: Guardian 2 phone (ES) + guardian_address_city: Guardian city (ES) + guardian_address_country: Guardian country (ES) + guardian_address_state: Guardian state (ES) + guardian_address_street1: Dirección del tutor legal + guardian_address_street2: Dirección del tutor legal (Línea 2) + guardian_address_zip: Guardian zip code (ES) + guardian_name: Nómbre del tutor legal + guardian_phone: Número de teléfono del tutor legal + minor: El firmante es un menor appearance_release: guardian_2_address_city: Guardian 2 city (ES) guardian_2_address_country: Guardian 2 country (ES) @@ -401,6 +431,26 @@ es: signed_at: Date Signed (ES) tags: Tags (ES) public: + acquired_media_releases: + new: + guardian_2_info: + heading: Second Guardian Information (if company requires) [ES] + guardian_2_photo: + heading: Second Guardian Photo (ES) + instructions: > + (ES) Lastly, it's time for second guardian to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese! (ES) + guardian_clause: + heading: Guardian Clause (ES) + guardian_info: + heading: Guardian Information (ES) + guardian_photo: + heading: Guardian Photo (ES) + instructions: > + (ES) Lastly, it's time for guardian to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese! (ES) + photo: + no_photo: No photo yet (ES) + take_photo: Take Photo (ES) + warning: If your photo appears sideways, it will be autocorrected when you submit your release. (ES) amendments: create: amendment_already_signed_message: Release amendment is already signed! (ES) diff --git a/db/migrate/20200725231419_add_guardians_fields_to_acquired_media_releases.rb b/db/migrate/20200725231419_add_guardians_fields_to_acquired_media_releases.rb new file mode 100644 index 0000000..9cf38e3 --- /dev/null +++ b/db/migrate/20200725231419_add_guardians_fields_to_acquired_media_releases.rb @@ -0,0 +1,25 @@ +class AddGuardiansFieldsToAcquiredMediaReleases < ActiveRecord::Migration[6.0] + def change + add_column :acquired_media_releases, :minor, :boolean, default: false + add_column :acquired_media_releases, :guardian_first_name, :string + add_column :acquired_media_releases, :guardian_last_name, :string + add_column :acquired_media_releases, :guardian_email, :string + add_column :acquired_media_releases, :guardian_phone, :string + add_column :acquired_media_releases, :guardian_address_street1, :string + add_column :acquired_media_releases, :guardian_address_street2, :string + add_column :acquired_media_releases, :guardian_address_city, :string + add_column :acquired_media_releases, :guardian_address_state, :string + add_column :acquired_media_releases, :guardian_address_zip, :string + add_column :acquired_media_releases, :guardian_address_country, :string + add_column :acquired_media_releases, :guardian_2_first_name, :string + add_column :acquired_media_releases, :guardian_2_last_name, :string + add_column :acquired_media_releases, :guardian_2_email, :string + add_column :acquired_media_releases, :guardian_2_phone, :string + add_column :acquired_media_releases, :guardian_2_address_street1, :string + add_column :acquired_media_releases, :guardian_2_address_street2, :string + add_column :acquired_media_releases, :guardian_2_address_city, :string + add_column :acquired_media_releases, :guardian_2_address_state, :string + add_column :acquired_media_releases, :guardian_2_address_zip, :string + add_column :acquired_media_releases, :guardian_2_address_country, :string + end +end \ No newline at end of file -- 2.47.3 From e8851283d81a06b75cbccdfeb8063a1aef59994f Mon Sep 17 00:00:00 2001 From: Bilal Date: Mon, 27 Jul 2020 12:31:50 +0200 Subject: [PATCH 2/4] add specs --- config/locales/en.yml | 8 +- config/locales/es.yml | 7 + spec/factories/acquired_media_releases.rb | 10 + ...r_managing_acquired_media_releases_spec.rb | 338 +++++++++++++++++- 4 files changed, 357 insertions(+), 6 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index c5acb94..46f0db3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -47,7 +47,7 @@ en: files: heading: 2 of 3 Files guardian_2_info: - heading: Guardian Information (if company requires) + heading: Second Guardian Information (if company requires) guardian_info: heading: Guardian Information photos: @@ -461,6 +461,10 @@ en: guardian_address_street1: Guardian address guardian_address_street2: Guardian address (Line 2) guardian_address_zip: Guardian zip code + guardian_email: Guardian email + guardian_first_name: Guardian first name + guardian_last_name: Guardian last name + guardian_phone: Guardian phone minor: Is the person a minor? name: Name of property person_address: Address @@ -747,6 +751,8 @@ en: acquired_media_release: create: Import Release update: Save Changes + acquired_media_releases: + create: Import Release appearance_release: create: Import Release update: Save Changes diff --git a/config/locales/es.yml b/config/locales/es.yml index 46f8fce..db3048b 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -2,6 +2,8 @@ es: acquired_media_releases: acquired_media_release: no_media: No Media (ES) + create: + notice: The acquired media release has been created (ES) form: guardian_2_info: heading: Guardian Information (if company requires) [ES] @@ -249,6 +251,9 @@ es: guardian_address_street1: Dirección del tutor legal guardian_address_street2: Dirección del tutor legal (Línea 2) guardian_address_zip: Guardian zip code (ES) + guardian_email: Guardian email (ES) + guardian_first_name: Guardian first name (ES) + guardian_last_name: Guardian last name (ES) guardian_name: Nómbre del tutor legal guardian_phone: Número de teléfono del tutor legal minor: El firmante es un menor @@ -358,6 +363,8 @@ es: person_name: Jane Doe person_phone: 555-555-5555 submit: + acquired_media_releases: + create: Import Release (ES) appearance_release: create: Crear Autorización broadcast: diff --git a/spec/factories/acquired_media_releases.rb b/spec/factories/acquired_media_releases.rb index 699d7ac..952f049 100644 --- a/spec/factories/acquired_media_releases.rb +++ b/spec/factories/acquired_media_releases.rb @@ -18,6 +18,16 @@ FactoryBot.define do end end + trait :minor do + minor true + guardian_first_name "Guardian1" + guardian_last_name "First" + guardian_2_first_name "Guardian2" + guardian_2_last_name "Second" + guardian_phone "1111" + guardian_2_phone "2222" + end + factory :acquired_media_release_with_contract_template do after(:build) do |acquired_media_release, _| acquired_media_release.contract_template = build(:acquired_media_release_contract_template) diff --git a/spec/features/user_managing_acquired_media_releases_spec.rb b/spec/features/user_managing_acquired_media_releases_spec.rb index 453a12e..61ac8c8 100644 --- a/spec/features/user_managing_acquired_media_releases_spec.rb +++ b/spec/features/user_managing_acquired_media_releases_spec.rb @@ -12,7 +12,7 @@ feature "User managing acquired_media releases" do expect(country_field_value).to eq "US" end - scenario "creating a release", js: true do + scenario "creating a release for an adult", js: true do contract_template = create(:contract_template, project: project) visit new_account_project_contract_template_acquired_media_release_path(project.account, project, contract_template) @@ -35,11 +35,121 @@ feature "User managing acquired_media releases" do draw_signature file_fixture("signature.png"), "acquired_media_release_signature_base64" end - click_button "I have read and agree to the above" + click_button submit_release_button expect(AcquiredMediaRelease.last.categories).to include("Video Footage") expect(AcquiredMediaRelease.last.categories).to include("Still Photograph") - expect(page).to have_content("Your release was successfully submitted. Thank you.") + expect(page).to have_content successful_submission_message + end + + scenario "creating a release for a minor - guardian fields are required when minor checkbox is checked", js: true do + contract_template = create(:contract_template, project: project) + + visit new_account_project_contract_template_acquired_media_release_path(project.account, project, contract_template) + + all('input[data-required-tag="guardian"]').each do |field| + expect(field['required']).to eq 'false' + expect(field).not_to be_visible + end + + page.check person_is_minor_checkbox + + all('input[data-required-tag="guardian"]').each do |field| + expect(field['required']).to eq 'true' + expect(field).to be_visible + end + end + + scenario 'creating a release for a minor', js: true do + project = create(:project, members: current_user, account: current_user.primary_account) + contract_template = create(:contract_template, project: project) + + visit new_account_project_contract_template_acquired_media_release_path(project.account, project, contract_template) + + expect(page).not_to have_content guardian_information_heading.upcase + expect(page).not_to have_content guardian_photo_heading.upcase + + page.check person_is_minor_checkbox + + expect(page).to have_content guardian_information_heading.upcase + expect(page).to have_content guardian_photo_heading.upcase + expect(page).to have_content guardian_email_field.titleize + + fill_in acquired_media_name_field, with: "Jane Doe" + acquired_media_category_fields + fill_in acquried_media_description_field, with: "Description" + fill_in acquried_media_owner_first_name, with: "Jane" + fill_in acquried_media_owner_last_name, with: "Doe" + fill_in acquired_media_person_title, with: "Ms." + fill_in acquired_media_person_phone, with: "555-5555-5555" + fill_in acquired_media_person_email, with: "person@example.com" + fill_in acquired_media_person_fax, with: "FAX" + fill_in acquired_media_person_address_street_1, with: "Street 1" + fill_in acquired_media_person_address_city, with: "City" + fill_in acquired_media_person_address_state, with: "State" + fill_in acquired_media_release_person_address_zip, with: "ZIP" + + fill_in guardian_first_name_field, with: 'Guardian' + fill_in guardian_last_name_field, with: 'Name' + fill_in guardian_phone_field, with: '001101' + fill_in guardian_email_field, with: 'valid@email.com' + attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all + fill_in_guardian_address_fields + draw_signature file_fixture("signature.png"), "acquired_media_release_signature_base64" + + click_button submit_release_button + + expect(page).to have_content(successful_submission_message) + end + + scenario 'creating a release for a minor with two guardians', js: true do + project = create(:project, members: current_user, account: current_user.primary_account) + contract_template = create(:contract_template, project: project) + + visit new_account_project_contract_template_acquired_media_release_path(project.account, project, contract_template) + + expect(page).not_to have_content guardian_2_information_heading.upcase + expect(page).not_to have_content guardian_2_photo_heading.upcase + + page.check person_is_minor_checkbox + expect(page).to have_content guardian_information_heading.upcase + expect(page).to have_content guardian_photo_heading.upcase + expect(page).to have_content guardian_email_field.titleize + + expect(page).to have_content guardian_2_information_heading.upcase + expect(page).to have_content guardian_2_photo_heading.upcase + expect(page).to have_content guardian_2_phone_field.titleize + + fill_in acquired_media_name_field, with: "Jane Doe" + acquired_media_category_fields + fill_in acquried_media_description_field, with: "Description" + fill_in acquried_media_owner_first_name, with: "Jane" + fill_in acquried_media_owner_last_name, with: "Doe" + fill_in acquired_media_person_title, with: "Ms." + fill_in acquired_media_person_phone, with: "555-5555-5555" + fill_in acquired_media_person_email, with: "person@example.com" + fill_in acquired_media_person_fax, with: "FAX" + fill_in acquired_media_person_address_street_1, with: "Street 1" + fill_in acquired_media_person_address_city, with: "City" + fill_in acquired_media_person_address_state, with: "State" + fill_in acquired_media_release_person_address_zip, with: "ZIP" + + fill_in guardian_first_name_field, with: 'Guardian' + fill_in guardian_last_name_field, with: 'Name' + fill_in guardian_phone_field, with: '001101' + fill_in guardian_email_field, with: 'valid@email.com' + attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all + fill_in_guardian_address_fields + draw_signature file_fixture("signature.png"), "acquired_media_release_signature_base64" + + fill_in guardian_2_first_name_field, with: 'Second' + fill_in guardian_2_last_name_field, with: 'Guardian' + fill_in guardian_2_phone_field, with: '999' + + click_button submit_release_button + + expect(page).to have_content(successful_submission_message) + expect(AcquiredMediaRelease.last.guardian_2_first_name).to eq 'Second' end scenario "creating a release, if contract template contains signature legal language, it is shown" do @@ -51,6 +161,106 @@ feature "User managing acquired_media releases" do end context "when signed in" do + before do + sign_in current_user + end + + scenario "creating a release for an adult", js: true do + visit new_project_acquired_media_release_path(project) + + fill_in acquired_media_name_field, with: "Jane Doe" + acquired_media_category_fields + + attach_file contract_field, Rails.root.join(file_fixture("contract.pdf")), visible: false + + click_button import_release_button + + expect(page).to have_content successful_import_message + end + + scenario "creating a release for a minor - guardian fields are required when minor checkbox is checked", js: true do + visit new_project_acquired_media_release_path(project) + + all('input[data-required-tag="guardian"]').each do |field| + expect(field['required']).to eq 'false' + expect(field).not_to be_visible + end + + page.check person_is_minor_checkbox + + all('input[data-required-tag="guardian"]').each do |field| + expect(field['required']).to eq 'true' + expect(field).to be_visible + end + end + + scenario "creating a release for a minor", js: true do + visit new_project_acquired_media_release_path(project) + + expect(page).not_to have_content guardian_information_heading.upcase + expect(page).not_to have_content guardian_photo_heading + + page.check person_is_minor_checkbox + + expect(page).to have_content guardian_information_heading.upcase + expect(page).to have_content guardian_photo_heading + expect(page).to have_content guardian_email_field.titleize + + fill_in acquired_media_name_field, with: "Jane Doe" + acquired_media_category_fields + attach_file contract_field, Rails.root.join(file_fixture("contract.pdf")), visible: false + + fill_in guardian_first_name_field, with: 'Guardian' + fill_in guardian_last_name_field, with: 'Name' + fill_in guardian_phone_field, with: '001101' + fill_in guardian_email_field, with: 'valid@email.com' + attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all + fill_in_guardian_address_fields + + click_button import_release_button + + expect(page).to have_content successful_import_message + expect(AcquiredMediaRelease.last.guardian_first_name).to eq 'Guardian' + end + + scenario "creating a release for a minor with two guardians", js: true do + visit new_project_acquired_media_release_path(project) + + expect(page).not_to have_content guardian_2_information_heading.upcase + expect(page).not_to have_content guardian_2_photo_heading + + page.check person_is_minor_checkbox + + expect(page).to have_content guardian_information_heading.upcase + expect(page).to have_content guardian_photo_heading + expect(page).to have_content guardian_email_field.titleize + + expect(page).to have_content guardian_2_information_heading.upcase + expect(page).to have_content guardian_2_photo_heading + expect(page).to have_content guardian_2_phone_field.titleize + + fill_in acquired_media_name_field, with: "Jane Doe" + acquired_media_category_fields + attach_file contract_field, Rails.root.join(file_fixture("contract.pdf")), visible: false + + fill_in guardian_first_name_field, with: 'Guardian' + fill_in guardian_last_name_field, with: 'Name' + fill_in guardian_phone_field, with: '001101' + fill_in guardian_email_field, with: 'valid@email.com' + attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all + fill_in_guardian_address_fields + + fill_in guardian_2_first_name_field, with: 'Second' + fill_in guardian_2_last_name_field, with: 'Guardian' + fill_in guardian_2_phone_field, with: '999' + + click_button import_release_button + + expect(page).to have_content successful_import_message + expect(AcquiredMediaRelease.last.guardian_first_name).to eq 'Guardian' + expect(AcquiredMediaRelease.last.guardian_2_first_name).to eq 'Second' + end + scenario "creating, updating, destroying a release", js: true do release_data = { name: "Test Acquired Media Release", @@ -65,7 +275,7 @@ feature "User managing acquired_media releases" do visit new_project_acquired_media_release_path(project) by "attaching only a contract" do - attach_file "acquired_media_release[contract]", Rails.root.join(file_fixture("contract.pdf")), visible: false + attach_file contract_field, Rails.root.join(file_fixture("contract.pdf")), visible: false click_button create_release_button expect(page).to have_invalid_field(acquired_media_name_field) @@ -117,7 +327,7 @@ feature "User managing acquired_media releases" do end end - scenario "viewing the contract PDF" do + scenario "viewing the contract PDF for an adult" do acquired_media_release = create(:acquired_media_release_with_contract_template, :native, project: project, @@ -176,6 +386,25 @@ feature "User managing acquired_media releases" do expect(pdf_body).to have_content("Other files") end + scenario "viewing the contract PDF for a minor" do + acquired_media_release = create(:acquired_media_release_with_contract_template, + :native, + :minor, + project: project, + person_name: "Jane Doe") + + visit project_acquired_media_releases_path(project) + click_link *view_release_pdf_link_for(acquired_media_release) + + expect(content_type).to eq("application/pdf") + expect(pdf_body).to have_content acquired_media_release.guardian_first_name + expect(pdf_body).to have_content acquired_media_release.guardian_last_name + expect(pdf_body).to have_content acquired_media_release.guardian_2_first_name + expect(pdf_body).to have_content acquired_media_release.guardian_2_last_name + expect(pdf_body).to have_content acquired_media_release.guardian_phone + expect(pdf_body).to have_content acquired_media_release.guardian_2_phone + end + scenario "searching for a release", js: true do collection1 = create(:acquired_media_release, name: "EDM Music", project: project) collection2 = create(:acquired_media_release, name: "Classical Music", project: project) @@ -508,4 +737,103 @@ feature "User managing acquired_media releases" do def date_issued t 'contracts.for_office_use_only.description_labels.date_issued' end + + def person_is_minor_checkbox + 'acquired_media_release_minor' + end + + def guardian_2_first_name_field + t 'helpers.label.acquired_media_release.guardian_2_first_name' + end + + def guardian_2_last_name_field + t 'helpers.label.acquired_media_release.guardian_2_last_name' + end + + def guardian_2_phone_field + t 'helpers.label.acquired_media_release.guardian_2_phone' + end + + def guardian_first_name_field + t 'helpers.label.acquired_media_release.guardian_first_name' + end + + def guardian_last_name_field + t 'helpers.label.acquired_media_release.guardian_last_name' + end + + def guardian_phone_field + t 'helpers.label.acquired_media_release.guardian_phone' + end + + def guardian_email_field + t 'helpers.label.acquired_media_release.guardian_email' + end + + def guardian_address_street1_field + t('helpers.label.acquired_media_release.guardian_address_street1') + end + + def guardian_address_city_field + t('helpers.label.acquired_media_release.guardian_address_city') + end + + def guardian_address_state_field + t('helpers.label.acquired_media_release.guardian_address_state') + end + + def guardian_address_zip_field + t('helpers.label.acquired_media_release.guardian_address_zip') + end + + def guardian_photo_field + 'acquired_media_release[guardian_photo]' + end + + def guardian_2_photo_field + 'acquired_media_release[guardian_2_photo]' + end + + def fill_in_guardian_address_fields + fill_in guardian_address_street1_field, with: "124 Test Lane" + fill_in guardian_address_city_field, with: "New York" + fill_in guardian_address_state_field, with: "NY" + fill_in guardian_address_zip_field, with: '1000' + end + + def submit_release_button + 'I have read and agree to the above' + end + + def successful_submission_message + 'Your release was successfully submitted. Thank you.' + end + + def guardian_information_heading + t 'public.acquired_media_releases.new.guardian_info.heading' + end + + def guardian_photo_heading + t 'public.acquired_media_releases.new.guardian_photo.heading' + end + + def guardian_2_information_heading + t 'public.acquired_media_releases.new.guardian_2_info.heading' + end + + def guardian_2_photo_heading + t 'public.acquired_media_releases.new.guardian_2_photo.heading' + end + + def contract_field + 'acquired_media_release[contract]' + end + + def import_release_button + t 'helpers.submit.acquired_media_releases.create' + end + + def successful_import_message + t 'acquired_media_releases.create.notice' + end end -- 2.47.3 From 13910fe60fc31a1923990263e9a7d0020f1c195a Mon Sep 17 00:00:00 2001 From: Bilal Date: Mon, 27 Jul 2020 12:55:10 +0200 Subject: [PATCH 3/4] fix spec --- spec/features/user_manages_contract_templates_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/user_manages_contract_templates_spec.rb b/spec/features/user_manages_contract_templates_spec.rb index 48ba336..c2c1bcb 100644 --- a/spec/features/user_manages_contract_templates_spec.rb +++ b/spec/features/user_manages_contract_templates_spec.rb @@ -160,7 +160,7 @@ RSpec.feature 'User manages contract templates', type: :feature do expect(content_disposition).to include('inline') expect(pdf_body).to have_content('PREVIEW ONLY') expect(pdf_body).to have_content('Acquired Media Release') - expect(pdf_body).not_to have_content('Guardian') + expect(pdf_body).to have_content('Guardian') visit new_project_contract_template_path(project) select 'Location Release', from: 'Release type' -- 2.47.3 From a8806680997758d2ed18a15a6349e5a1de9b4db0 Mon Sep 17 00:00:00 2001 From: Bilal Date: Mon, 27 Jul 2020 13:07:04 +0200 Subject: [PATCH 4/4] rebase --- db/structure.sql | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/db/structure.sql b/db/structure.sql index 76a20f1..fce0e15 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -161,7 +161,28 @@ CREATE TABLE public.acquired_media_releases ( signed_at timestamp without time zone, approved_by_user_name text, approved_by_user_email text, - approved_at timestamp without time zone + approved_at timestamp without time zone, + minor boolean DEFAULT false, + guardian_first_name character varying, + guardian_last_name character varying, + guardian_email character varying, + guardian_phone character varying, + guardian_address_street1 character varying, + guardian_address_street2 character varying, + guardian_address_city character varying, + guardian_address_state character varying, + guardian_address_zip character varying, + guardian_address_country character varying, + guardian_2_first_name character varying, + guardian_2_last_name character varying, + guardian_2_email character varying, + guardian_2_phone character varying, + guardian_2_address_street1 character varying, + guardian_2_address_street2 character varying, + guardian_2_address_city character varying, + guardian_2_address_state character varying, + guardian_2_address_zip character varying, + guardian_2_address_country character varying ); @@ -3944,6 +3965,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20200716105723'), ('20200720051634'), ('20200720131309'), -('20200721140821'); +('20200721140821'), +('20200725231419'); -- 2.47.3