fix appearance release spec

app/assets/javascripts/collapse_select.js

@@ -1,16 +1,11 @@
 $(document).on("change", "[data-toggle=collapse-select]", function(event) {
   const select = event.target;
-  const mappings = JSON.parse(select.dataset.targetShowValuesMapping);
-  
-  $.each(mappings, function( key, value ) {
-    if (value.indexOf(select.value) > -1) {
-      $(key).show("fast");
-    } else {
-      $(key).hide("fast");
-    }
-  });
-});
+  const target = select.dataset.target;
+  const showValues = JSON.parse(select.dataset.showValues);
 
-$(document).on("turbolinks:load", function() {
-  $("[data-toggle=collapse-select]").trigger("change");
-});
+  if (showValues.indexOf(select.value) > -1) {
+    $(target).show("fast");
+  } else {
+    $(target).hide("fast");
+  }
+});

app/controllers/contract_templates_controller.rb

@@ -61,12 +61,7 @@ class ContractTemplatesController < ApplicationController
               :applicable_medium_id, :applicable_medium_text,
               :territory_id, :territory_text,
               :term_id, :term_text,
-              :restriction_id, :restriction_text,
-              :question_1_text, :question_2_text, 
-              :question_3_text, :question_4_text, 
-              :question_5_text, :question_6_text, 
-              :question_7_text, :question_8_text, 
-              :question_9_text, :question_10_text)
+              :restriction_id, :restriction_text)
   end
 
   def download_attributes

app/controllers/public/appearance_releases_controller.rb

@@ -41,7 +41,7 @@ class Public::AppearanceReleasesController < Public::BaseController
 
   def appearance_release_params
     params.require(:appearance_release).permit(:person_address, :person_first_name, :person_last_name, :person_phone, :person_email, :person_photo,
-                                               :guardian_address, :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_photo, :minor,
+                                               :guardian_address, :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_email, :guardian_photo, :minor,
                                                :signature_base64, :person_date_of_birth,
                                                :locale, :contract_template,)
   end

app/controllers/public/medical_releases_controller.rb

@@ -48,11 +48,6 @@ class Public::MedicalReleasesController < Public::BaseController
         :signature_base64,
         :locale,
         :contract_template,
-        :question_1_answer, :question_2_answer,
-        :question_3_answer, :question_4_answer,
-        :question_5_answer, :question_6_answer,
-        :question_7_answer, :question_8_answer,
-        :question_9_answer, :question_10_answer,
         photos: [],
       )
   end

app/models/appearance_release.rb

@@ -39,6 +39,7 @@ class AppearanceRelease < ApplicationRecord
   # These validations apply to releases being signed by a minor
   with_options if: :minor? do
     validates :guardian_first_name, :guardian_last_name, presence: true
+    validates :guardian_email, email: true, allow_blank: true
   end
 
   validates :person_photo, content_type: face_photo_acceptable_content_types

app/views/contract_templates/_form.html.erb

@@ -2,25 +2,21 @@
   <%= field_set_tag content_tag(:span, t(".release_info.heading"), class: "h6 text-muted text-uppercase") do %>
     <div class="form-row">
       <%= 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), "#fee_field": %w(appearance talent location material acquired_media), "#exploitable_rights_fields": %w(appearance talent location material acquired_media), "#custom_fields": %w(medical) } }, 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: "#guardian_clause", show_values: %w(appearance talent) }, class: "form-control custom-select" %>
     </div>
-    <div class="form-row" id="fee_field">
+    <div class="form-row">
       <%= form.number_field :fee, min:"0", max:"99999999",  step: "0.01", prepend: "$", help: "Leave at $0.00 for no-fee", wrapper_class: "col-sm-6" %>
     </div>
   <% end %>
 
   <hr>
 
-  <%= field_set_tag content_tag(:span, t(".exploitable_rights.heading"), class: "h6 text-muted text-uppercase"), id: "exploitable_rights_fields" do %>
+  <%= field_set_tag content_tag(:span, t(".exploitable_rights.heading"), class: "h6 text-muted text-uppercase")do %>
     <%= render "shared/exploitable_rights_fields", form: form %>
-    <hr>
-  <% end %>
-  
-  <%= field_set_tag content_tag(:span, t(".custom_fields.heading"), class: "h6 text-muted text-uppercase"), id: "custom_fields", style: "display: none;" do %>
-    <%= render "shared/custom_fields", form: form %>
-    <hr>
   <% end %>
 
+  <hr>
+
   <%= field_set_tag content_tag(:span, t(".legal.heading"), class: "h6 text-muted text-uppercase") do %>
     <%= form.form_group do %>
       <%= form.rich_text_area :body %>

app/views/contracts/_signature_page.html.erb

@@ -39,15 +39,6 @@
   <% end %>
 </dl>
 
-<% if releasable.model_name == "MedicalRelease" %>
-  <% (1..10).each do |n| %>
-    <% if contract_template.public_send("question_#{n}_text").present? %>
-      <p><strong><%= contract_template.public_send("question_#{n}_text") %></strong></p>
-      <p><%= releasable.public_send("question_#{n}_answer") %></p>
-    <% end %>
-  <% end %>
-<% end %>
-
 <% if releasable.minor? %>
   <br/>
   <p class="text-left"><strong>Guardian Information</strong></p>
@@ -65,6 +56,7 @@
     <%= description_list_pair_for releasable, :guardian_name, append: ":" %>
     <%= description_list_pair_for releasable, :guardian_address, append: ":" %>
     <%= description_list_pair_for releasable, :guardian_phone, append: ":" %>
+    <%= description_list_pair_for releasable, :guardian_email, append: ":" %>
     <%= description_list_pair_for releasable, :signed_on, append: ":" %>
   </dl>
 

app/views/projects/_form.html.erb

@@ -1,6 +1,6 @@
 <%= bootstrap_form_with model: project, local: true do |form| %>
   <%= form.text_field :name %>
-  <%= form.select :predefined_client_name, options_for_select(options_for_predefined_client_name_select, selected_project_client_value(project)), {}, data: { toggle: "collapse-select", target_show_values_mapping: { "#other_client": [:other] }  }, class: "form-control custom-select" %>
+  <%= form.select :predefined_client_name, options_for_select(options_for_predefined_client_name_select, selected_project_client_value(project)), {}, data: { toggle: "collapse-select", target: "#other_client", show_values: [:other] }, class: "form-control custom-select" %>
   <div id="other_client" style="<%='display: none' if selected_project_client_value(project) != 'other'%>">
     <%= form.text_field :client_name, placeholder: true %>
     <%= form.form_group do %>

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

@@ -76,6 +76,9 @@
               <%= form.text_field :guardian_last_name, required: @appearance_release.minor?, wrapper_class: "col-sm-3" %>
               <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
             </div>
+            <div class="form-row">
+              <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
+            </div>
             <div class="form-row">
               <%= form.text_field :guardian_address, wrapper_class: "col-sm-6" %>
             </div>

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

@@ -13,19 +13,6 @@
       <% end %>
 
       <hr>
-      
-      <% if (1..10).map {|n| @contract_template.public_send("question_#{n}_text").presence }.compact.any? %>
-        <%= card_field_set_tag t(".questionnaire.heading") do %>
-          <% (1..10).each do |n| %>
-            <% if @contract_template.public_send("question_#{n}_text").present? %>
-              <div class="form-row">
-                <%= form.text_area "question_#{n}_answer", wrapper_class: "col-sm-12", label: @contract_template.public_send("question_#{n}_text") %>
-              </div>
-            <% end %>
-          <% end %>
-        <% end %>
-        <hr>
-      <% end %>
 
       <%= card_field_set_tag t(".personal_info.heading") do %>
         <div class="alert alert-warning font-weight-bold"><%= t ".personal_info.instructions" %></div>
@@ -49,7 +36,7 @@
       <% end %>
 
       <div class="mt-5">
-        <%= form.button t("shared.submit_release_short"), class: "btn btn-block btn-lg btn-success", data: { disable_with: t("shared.disable_with") } %>
+        <%= form.button t("shared.submit_release_long"), class: "btn btn-block btn-lg btn-success", data: { disable_with: t("shared.disable_with") } %>
       </div>
     <% end %>
   </div>

app/views/shared/_custom_fields.html.erb

@@ -1,5 +0,0 @@
-<% (1..10).each do |n| %>
-  <div class="form-row">
-    <%= form.text_area "question_#{n}_text", wrapper_class: "col-sm-12" %>
-  </div>
-<% end%>

config/locales/en.yml

@@ -212,14 +212,12 @@ en:
       archived_failure: Failed to archive the release template
       archived_notice: The release template has been archived
     form:
-      custom_fields:
-        heading: Custom Fields
       exploitable_rights:
-        heading: Exploitable Rights
+        heading: 2 of 3 Exploitable Rights
       legal:
-        heading: Legal
+        heading: 3 of 3 Legal
       release_info:
-        heading: Release Info
+        heading: 1 of 3 Release Info
     index:
       actions:
         import: Import Release Template
@@ -853,8 +851,6 @@ en:
           instructions: Now, enter your personal information.
         photo:
           heading: Photos
-        questionnaire:
-          heading: Questionnaire
         signature:
           heading: Signature
     talent_releases:
@@ -944,7 +940,6 @@ en:
     search: Search
     submit_release: Submit Release
     submit_release_long: I have read and agree to the above
-    submit_release_short: Submit
     suite: Suite
     tag_multiple_releases: Add Tag
     tag_multiple_releases_form:

db/migrate/20200610085411_add_question_fields_to_contract_templates.rb

@@ -1,14 +0,0 @@
-class AddQuestionFieldsToContractTemplates < ActiveRecord::Migration[6.0]
-  def change
-    add_column :contract_templates, :question_1_text, :text
-    add_column :contract_templates, :question_2_text, :text
-    add_column :contract_templates, :question_3_text, :text
-    add_column :contract_templates, :question_4_text, :text
-    add_column :contract_templates, :question_5_text, :text
-    add_column :contract_templates, :question_6_text, :text
-    add_column :contract_templates, :question_7_text, :text
-    add_column :contract_templates, :question_8_text, :text
-    add_column :contract_templates, :question_9_text, :text
-    add_column :contract_templates, :question_10_text, :text
-  end
-end

db/migrate/20200610140459_add_answer_fields_to_medical_releases.rb

@@ -1,14 +0,0 @@
-class AddAnswerFieldsToMedicalReleases < ActiveRecord::Migration[6.0]
-  def change
-    add_column :medical_releases, :question_1_answer, :text
-    add_column :medical_releases, :question_2_answer, :text
-    add_column :medical_releases, :question_3_answer, :text
-    add_column :medical_releases, :question_4_answer, :text
-    add_column :medical_releases, :question_5_answer, :text
-    add_column :medical_releases, :question_6_answer, :text
-    add_column :medical_releases, :question_7_answer, :text
-    add_column :medical_releases, :question_8_answer, :text
-    add_column :medical_releases, :question_9_answer, :text
-    add_column :medical_releases, :question_10_answer, :text
-  end
-end

db/migrate/20200612121539_add_guardian_email_to_appearance_releases.rb

@@ -0,0 +1,5 @@
+class AddGuardianEmailToAppearanceReleases < ActiveRecord::Migration[6.0]
+  def change
+    add_column :appearance_releases, :guardian_email, :string
+  end
+end

db/structure.sql

@@ -606,17 +606,7 @@ CREATE TABLE public.contract_templates (
     term_text character varying,
     restriction_id bigint,
     restriction_text character varying,
-    archived_at timestamp without time zone,
-    question_1_text text,
-    question_2_text text,
-    question_3_text text,
-    question_4_text text,
-    question_5_text text,
-    question_6_text text,
-    question_7_text text,
-    question_8_text text,
-    question_9_text text,
-    question_10_text text
+    archived_at timestamp without time zone
 );
 
 
@@ -965,17 +955,7 @@ CREATE TABLE public.medical_releases (
     notes text,
     signed_at timestamp without time zone,
     created_at timestamp(6) without time zone NOT NULL,
-    updated_at timestamp(6) without time zone NOT NULL,
-    question_1_answer text,
-    question_2_answer text,
-    question_3_answer text,
-    question_4_answer text,
-    question_5_answer text,
-    question_6_answer text,
-    question_7_answer text,
-    question_8_answer text,
-    question_9_answer text,
-    question_10_answer text
+    updated_at timestamp(6) without time zone NOT NULL
 );
 
 
@@ -3615,8 +3595,6 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20200512161738'),
 ('20200526113516'),
 ('20200603090419'),
-('20200606044747'),
-('20200610085411'),
-('20200610140459');
+('20200606044747');
 
 

spec/controllers/appearance_releases_controller_spec.rb

@@ -263,7 +263,10 @@ RSpec.describe AppearanceReleasesController, tye: :controller do
   end
 
   def minor_appearance_release_params
-    attributes_for(:appearance_release, :non_native, :minor_with_guardian_photo).except(:contract).merge(contract_param, exploitable_rights_params)
+    attributes_for(:appearance_release, :non_native, :minor_with_guardian_photo)
+      .except(:contract)
+      .except(:guardian_email)
+      .merge(contract_param, exploitable_rights_params)
   end
 
   def exploitable_rights_params

spec/factories/appearance_releases.rb

@@ -33,6 +33,7 @@ FactoryBot.define do
       guardian_last_name "Doe"
       guardian_address "100 Test Lane, New York, 10001"
       guardian_phone "123-555-1234"
+      guardian_email "guardian@galaxy.all"
     end
 
     trait :minor_with_guardian_photo do
@@ -41,6 +42,7 @@ FactoryBot.define do
       guardian_last_name "Doe"
       guardian_address "100 Test Lane, New York, 10001"
       guardian_phone "123-555-1234"
+      guardian_email "guardian@galaxy.all"
       guardian_photo do
         path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
         Rack::Test::UploadedFile.new(path, "image/jpeg")

spec/features/user_managing_appearance_releases_spec.rb

@@ -25,7 +25,7 @@ feature 'User managing appearance releases' do
       fill_in person_date_of_birth, with: '01/01/1999'
       attach_file person_photo_field, file_fixture('person_photo.png'), visible: :all
       draw_signature file_fixture('signature.png'), 'appearance_release_signature_base64'
-      click_button 'I have read and agree to the above'
+      click_button submit_release_button
 
       expect(page).to have_content(successful_submission_message)
     end
@@ -45,6 +45,7 @@ feature 'User managing appearance releases' do
       page.check person_is_minor_checkbox
       expect(page).to have_content('GUARDIAN INFORMATION')
       expect(page).to have_content('GUARDIAN PHOTO')
+      expect(page).to have_content 'Guardian Email'
 
       fill_in guardian_first_name_field, with: 'Guardian'
       fill_in guardian_last_name_field, with: 'Name'
@@ -58,7 +59,14 @@ feature 'User managing appearance releases' do
       attach_file person_photo_field, file_fixture('person_photo.png'), visible: :all
       attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all
       draw_signature file_fixture('signature.png'), 'appearance_release_signature_base64'
-      click_button 'I have read and agree to the above'
+
+      fill_in guardian_email_field, with: 'invalid@email'
+      click_button submit_release_button
+      expect(page).to have_content('Guardian email is not an email')
+
+      fill_in guardian_email_field, with: 'valid@email.com'
+      draw_signature file_fixture('signature.png'), 'appearance_release_signature_base64'
+      click_button submit_release_button
 
       expect(page).to have_content(successful_submission_message)
     end
@@ -249,6 +257,7 @@ feature 'User managing appearance releases' do
       expect(pdf_body).to have_content('TAGS')
       expect(pdf_body).to have_content('Woman')
       expect(pdf_body).to have_content('Brunette')
+      expect(pdf_body).not_to have_content('Guardian Email')
     end
 
     scenario 'viewing contract PDF for a minor without guardian photo' do
@@ -262,8 +271,10 @@ feature 'User managing appearance releases' do
       expect(pdf_filename).to include(appearance_release.filename_suffix.parameterize)
       expect(pdf_body).to have_content(appearance_release.name)
       expect(pdf_body).to have_content(appearance_release.guardian_name)
+      expect(pdf_body).to have_content(appearance_release.guardian_email)
       expect(pdf_body).to have_content photos_heading.upcase
       expect(pdf_body).to have_content(appearance_release.photo.filename.to_s)
+      expect(pdf_body).to have_content('Guardian Email')
     end
 
     scenario 'viewing contract PDF for a minor with guardian photo' do
@@ -277,9 +288,11 @@ feature 'User managing appearance releases' do
       expect(pdf_filename).to include(appearance_release.filename_suffix.parameterize)
       expect(pdf_body).to have_content(appearance_release.name)
       expect(pdf_body).to have_content(appearance_release.guardian_name)
+      expect(pdf_body).to have_content(appearance_release.guardian_email)
       expect(pdf_body).to have_content photos_heading(2).upcase
       expect(pdf_body).to have_content(appearance_release.photo.filename.to_s)
       expect(pdf_body).to have_content(appearance_release.guardian_photo.filename.to_s)
+      expect(pdf_body).to have_content('Guardian Email')
     end
 
     scenario 'deleting a release', js: true do
@@ -470,6 +483,10 @@ feature 'User managing appearance releases' do
     'Guardian phone'
   end
 
+  def guardian_email_field
+    'Guardian email'
+  end
+
   def guardian_photo_field
     'appearance_release[guardian_photo]'
   end
@@ -518,6 +535,10 @@ feature 'User managing appearance releases' do
     'Import Release'
   end
 
+  def submit_release_button
+    'I have read and agree to the above'
+  end
+
   def submit_update_button
     'Save Changes'
   end