add second guardian fields to the public signing form for talent releases

2020-06-25 18:31:20 +02:00
parent fe131491cd
commit 181be3fc1d
8 changed files with 269 additions and 31 deletions
--- a/app/controllers/public/talent_releases_controller.rb
+++ b/app/controllers/public/talent_releases_controller.rb
@@ -45,42 +45,59 @@ class Public::TalentReleasesController < Public::BaseController
      .permit(
        person_params,
        guardian_params,
+        second_guardian_params,
        :signature_base64,
        :locale,
        :contract_template,
-        photos: [],
+        photos: []
      )
  end

  def person_params
-    [
-      :person_first_name,
-      :person_last_name,
-      :person_phone,
-      :person_email,
-      :person_address_street1,
-      :person_address_street2,
-      :person_address_city,
-      :person_address_state,
-      :person_address_zip,
-      :person_address_country,
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_email
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
    ]
  end

  def guardian_params
-    [
-      :guardian_first_name,
-      :guardian_last_name,
-      :guardian_phone,
-      :guardian_email,
-      :minor,
-      :guardian_address_street1,
-      :guardian_address_street2,
-      :guardian_address_city,
-      :guardian_address_state,
-      :guardian_address_zip,
-      :guardian_address_country,
-      :guardian_photo,
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      minor
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+      guardian_photo
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+      guardian_2_photo
    ]
  end

--- a/app/models/talent_release.rb
+++ b/app/models/talent_release.rb
@@ -11,7 +11,9 @@ class TalentRelease < ApplicationRecord
  include Taggable
  include PersonName
  include GuardianPhotoable
+  include SecondGuardianPhotoable
  include GuardianName
+  include SecondGuardianName

  composed_of :person_address, 
              class_name: "Address",
@@ -35,6 +37,17 @@ class TalentRelease < ApplicationRecord
                %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)
+              ]
+
  def self.face_photo_acceptable_content_types
    ["image/png", "image/jpeg"]
  end
@@ -58,6 +71,7 @@ class TalentRelease < 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, :guardian_2_email, email: true, allow_blank: true
    validates :guardian_phone, presence: true
  end

@@ -84,6 +98,10 @@ class TalentRelease < ApplicationRecord
    false
  end

+  def second_guardian_present?
+    guardian_2_first_name.present?
+  end
+
  def contract_file_name
    "#{project.name.parameterize}_#{contract_template.release_type}_#{(signed_at || created_at).strftime("%Y.%m.%d")}_#{release_number}_#{filename_suffix.parameterize}"
  end
--- a/app/views/public/talent_releases/new.html.erb
+++ b/app/views/public/talent_releases/new.html.erb
@@ -31,8 +31,6 @@
          <%= form.text_field :person_first_name, required: true, wrapper_class: "col-sm-6" %>
          <%= form.text_field :person_last_name, required: true, wrapper_class: "col-sm-6" %>
          <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
-        </div>
-        <div class="form-row">
          <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
        </div>
        <%= render "shared/address_fields", form: form, subject: "person" %>
@@ -51,8 +49,6 @@
              <%= form.text_field :guardian_first_name, required: @talent_release.minor?, wrapper_class: "col-sm-3" %>
              <%= form.text_field :guardian_last_name, required: @talent_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>
            <%= render "shared/address_fields", form: form, subject: "guardian" %>
@@ -87,6 +83,48 @@
            </div>
          <% end %>

+          <hr>
+
+          <%= card_field_set_tag t(".guardian_2_info.heading") do %>
+            <div class="form-row">
+              <%= 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" %>
+            </div>
+            <%= render "shared/address_fields", form: form, subject: "guardian_2" %>
+          <% end %>
+
+          <hr>
+
+          <%= card_field_set_tag t(".guardian_2_photo.heading") do %>
+            <div class="alert alert-warning font-weight-bold"><%= t ".guardian_2_photo.instructions" %></div>
+            <div class="text-center">
+              <div class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-2-photo-input]">
+                <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+                  <span><%= t ".guardian_2_photo.no_photo" %></span>
+                </div>
+              </div>
+              <div class="d-inline-block text-left">
+                <% if @talent_release.guardian_2_photo.attached? %>
+                  <%= javascript_tag nonce: true do %>
+                    App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@talent_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>");
+                  <% end %>
+                <% end %>
+                <div class="hidden-file-input">
+                  <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if @talent_release.guardian_2_photo.attached? %>
+                  <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, accept: @talent_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
+                </div>
+                <%= button_tag t(".guardian_2_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]" } %>
+              </div>
+              <p class="p-2 font-weight-bold">
+                <%= fa_icon "arrow-up", text: t(".guardian_2_photo.camera_instructions_html") %><br>
+                <small class="text-muted"><%= t ".guardian_2_photo.warning" %></small>
+              </p>
+            </div>
+          <% end %>
+
+          <hr>

        </div>
        <hr>