add second guardian fields to the non native signing form for talent releases

README.md

@@ -95,14 +95,28 @@ rake i18n:sort
 ```
 
 ## Zoom.us integration
-DirectMe app offers live broadcasting. Users are offered to paralelly connect to the Zoom meeting to have a video conference while the streaming happens. In order to use the Zoom functionality, the app needs to have the API keys provided. You need Zoom PRO account for this feature.
+DirectMe app offers live broadcasting feature. Users are offered to paralelly connect to the Zoom meeting to have a video conference while the streaming happens. In order to use the Zoom functionality, the app needs to have the API and verification token keys provided along with the account number that is available after login into the Zoom account. You need to have Zoom PRO subscription in order to use this feature.
 
 #### Zoom.us api keys
 1. Log in to you zoom.us account
 2. Go to https://marketplace.zoom.us/develop/create
 3. Choose JWT application
 4. Copy API Key and API Secret
+5. Set up ZOOM_API_KEY and ZOOM_API_SECRET environment variables
 
+#### Setup
+There is some configuration that has to be done through the API on the Zoom account so that you can use the feature. Run `rails zoom:setup` rake task to do it.
+
+#### Zoom.us webhooks
+To ensure integrity in between different Zoom environments, the app uses Zoom webhooks. To set them up, go to https://marketplace.czoom.us -> Develop -> JWT app -> Feature -> Event Subscriptions and enable following hooks:
+* Start Meeting
+* End Meeting
+* All Recordings have completed
+* User has been created
+* User had been deleted
+
+#### Syncing app with Zoom account configuration
+If you are setting up the app to use Zoom account that has been previously used with DirectME, it is a good idea to make sure that the db state reflects the account situation. To do that, run `rails zoom:sync` rake task.
 
 ## Working Locally
 

app/assets/javascripts/channels/broadcasts.coffee

@@ -8,11 +8,16 @@ $(document).on "turbolinks:load", ->
       # Called when the subscription has been terminated by the server
 
     received: (data) ->
-      return unless document.querySelector("meta[name=broadcast-token][content='#{broadcastToken}']")
       switch data.event
-        when "broadcast_stream_update" then @refreshBroadcastVideo(data)
-        when "stream_recording_ready" then @showBroadcastRecordings(data)
-        when "file_upload_update" then @refreshBroadcastFilesTab(data)
+        when "broadcast_stream_update"
+          return unless document.querySelector("meta[name=broadcast-token][current=true][content='#{broadcastToken}']")
+          @refreshBroadcastVideo(data)
+        when "stream_recording_ready"
+          return unless document.querySelector("meta[name=broadcast-token][current=true][content='#{broadcastToken}']")
+          @showBroadcastRecordings(data)
+        when "file_upload_update"
+          return unless document.querySelector("meta[name=broadcast-token][content='#{broadcastToken}']")
+          @refreshBroadcastFilesTab(data)
 
     refreshBroadcastVideo: (data) ->
       $("#broadcast_updates").html data.status_content

app/assets/javascripts/photo_preview.js

@@ -51,10 +51,8 @@ $(document).on("turbolinks:load", function() {
   $("[data-behavior=guardian-photo-preview]").each(function(index, element) {
     App.PhotoPreview.init(element);
   });
-  $("[data-behavior=take-person-photo]").click(function(e) {
-    $("[data-ujs-target=person-photo-input]").trigger("click");
-  });
-  $("[data-behavior=take-guardian-photo]").click(function(e) {
-    $("[data-ujs-target=guardian-photo-input]").trigger("click");
+  $("[data-behavior=trigger-click]").click(function(e) {
+      const target = $(this).data("target");
+      $(target).trigger("click");
   });
 });

app/assets/stylesheets/contract_pdf.scss

@@ -31,7 +31,7 @@ u {
 }
 
 .page { 
-  page-break-before: always; 
+  page-break-before: always;
 }
 
 .logo {
@@ -44,6 +44,14 @@ u {
   text-align: right;
 }
 
+.qr-code {
+  margin-right: -30px;
+}
+
+.do-not-copy-warning {
+  padding-right: 15px;
+}
+
 .heading-table td {
   width: 50%;
 }

app/controllers/api/broadcasts_controller.rb

@@ -24,8 +24,12 @@ class Api::BroadcastsController < Api::ApiController
 
   def update
     file_params.each do |file|
-      file[:io] = StringIO.new(Base64.decode64(file[:io]))
-      @broadcast.files.attach(io: file[:io], filename: file[:filename])
+      if file.is_a?(String)
+        @broadcast.files.attach(file)
+      else
+        file[:io] = StringIO.new(Base64.decode64(file[:io]))
+        @broadcast.files.attach(file.to_h.symbolize_keys)
+      end
     end
     @broadcast.save!
 

app/controllers/api/direct_uploads_controller.rb

@@ -0,0 +1,50 @@
+# Duplicated from ActiveStorage::DirectUploadsController
+# https://github.com/rails/rails/blob/v6.0.0/activestorage/app/controllers/active_storage/direct_uploads_controller.rb
+class Api::DirectUploadsController < Api::ApiController
+  include ActiveStorage::SetCurrent
+
+  deserializable_resource :direct_upload, only: [:create]
+
+  def create
+    blob = ActiveStorage::Blob.create_before_direct_upload!(blob_params)
+    render jsonapi: DirectUpload.new(blob)
+  end
+
+  private
+
+  def blob_params
+    params.
+      require(:direct_upload).
+      permit(:type, :filename, :byte_size, :checksum, :content_type, :metadata).
+      except(:type).
+      to_h.symbolize_keys
+  end
+
+  class DeserializableDirectUpload < JSONAPI::Deserializable::Resource
+    attributes :filename, :byte_size, :checksum, :content_type, :metadata
+  end
+
+  class SerializableDirectUpload < JSONAPI::Serializable::Resource
+    type 'direct_upload'
+
+    attributes :id, :key, :signed_id, :url, :headers
+  end
+
+  class DirectUpload
+    delegate :id, :key, :signed_id, to: :blob
+
+    attr_reader :blob
+
+    def initialize(blob)
+      @blob = blob
+    end
+
+    def url
+      blob.service_url_for_direct_upload 
+    end
+
+    def headers
+      blob.service_headers_for_direct_upload
+    end
+  end
+end

app/controllers/appearance_release_imports_controller.rb

@@ -3,7 +3,6 @@
 class AppearanceReleaseImportsController < ApplicationController
   include AppearanceReleaseContext
   include ProjectContext
-  include CreateReleasableJobs
 
   before_action :set_project, only: [:create]
 
@@ -11,24 +10,16 @@ class AppearanceReleaseImportsController < ApplicationController
 
   def create
     authorize AppearanceRelease
-    @failed_files = []
     attachments = appearance_release_params
+
     if attachments.nil?
       alert_message = t 'appearance_releases.create.no_attachments'
+      redirect_to [@project, :appearance_releases], alert: alert_message
     else
-      attachments.each do |attachment|
-        create_imported_appearance_release attachment
-      end
+      MatchAppearanceReleasesJob.perform_later(@project, attachments)
+      notice_message = t 'appearance_releases.create.matching_started'
+      redirect_to [@project, :appearance_releases], notice: notice_message
     end
-
-    unless @failed_files.empty?
-      alert_message = t 'appearance_releases.create.failed_import'
-      alert_message += '<br><ul>'
-      @failed_files.each { |file_name| alert_message += "<li>#{file_name}</li>" }
-      alert_message += '</ul>'
-    end
-
-    redirect_to [@project, :appearance_releases], alert: alert_message
   end
 
   private
@@ -45,45 +36,7 @@ class AppearanceReleaseImportsController < ApplicationController
     params.require(:attachments)
   end
 
-  def build_appearance_release(params = {})
-    authorize appearance_releases.build(params)
-  end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: AppearanceRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
-
-  def create_imported_appearance_release(attachment)
-    blob = ActiveStorage::Blob.find_signed(attachment)
-    return if blob.nil?
-
-    extension = blob.filename.extension_with_delimiter
-    unless AppearanceRelease.acceptable_import_file_extensions.include? extension
-      blob.purge
-      @failed_files << blob.filename
-      return
-    end
-
-    random_contract_no = AppearanceRelease.random_contract_number.to_s
-    appearance_release_params = {
-      person_last_name: random_contract_no
-    }
-
-    if blob.image?
-      appearance_release_params[:person_photo] = attachment
-      appearance_release_params[:person_first_name] = I18n.t('appearance_releases.shared.imported_appearance_release_headshot_name')
-    elsif extension == '.pdf'
-      appearance_release_params[:contract] = attachment
-      appearance_release_params[:person_first_name] = I18n.t('appearance_releases.shared.imported_appearance_release_contract_name')
-    end
-
-    appearance_release = build_appearance_release(appearance_release_params)
-
-    if appearance_release.save(context: :non_native)
-      log_create_analytics
-      after_create appearance_release
-    else
-      @failed_files << blob.filename
-    end
+  def acceptable_extensions
+    AppearanceRelease.acceptable_import_file_extensions
   end
 end

app/controllers/appearance_releases_controller.rb

@@ -77,9 +77,43 @@ class AppearanceReleasesController < ApplicationController
     results
   end
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_email
+      person_photo
+      person_address_street1
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+    ]
+  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
+    ]
+  end
+
   def appearance_release_params
-    params.require(:appearance_release).permit(:contract, :guardian_address, :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_photo, :minor,
-                                               :person_address, :person_first_name, :person_last_name, :person_phone, :person_email, :person_photo,
+    params.require(:appearance_release).permit(person_params,
+                                               guardian_params, second_guardian_params,
+                                               :contract, :minor,
                                                :applicable_medium_id, :applicable_medium_text,
                                                :territory_id, :territory_text,
                                                :term_id, :term_text, :person_date_of_birth,

app/controllers/concerns/misc_release_context.rb

@@ -0,0 +1,13 @@
+module MiscReleaseContext
+  extend ActiveSupport::Concern
+
+  def misc_releases
+    policy_scope(MiscRelease)
+  end
+
+  def set_misc_release
+    misc_release_id = params[:misc_release_id] || params[:id]
+
+    @misc_release = authorize misc_releases.find(misc_release_id)
+  end
+end

app/controllers/contract_templates_controller.rb

@@ -66,7 +66,10 @@ class ContractTemplatesController < ApplicationController
               :question_3_text, :question_4_text, 
               :question_5_text, :question_6_text, 
               :question_7_text, :question_8_text, 
-              :question_9_text, :question_10_text)
+              :question_9_text, :question_10_text,
+              :question_11_text, :question_12_text, 
+              :question_13_text, :question_14_text, 
+              :question_15_text)
   end
 
   def download_attributes

app/controllers/contracts_controller.rb

@@ -48,8 +48,10 @@ class ContractsController < ApplicationController
     # Native release contracts must be generated on-the-fly; non-native releases have a contract attachment
     if releasable.native?
       send_file contract.to_pdf, download_attributes
-    else
+    elsif policy(contract).show?
       redirect_to releasable.contract.service_url
+    else
+      raise Pundit::NotAuthorizedError
     end
   end
 end

app/controllers/misc_releases_controller.rb

@@ -0,0 +1,40 @@
+class MiscReleasesController < ApplicationController
+  include ProjectContext, MiscReleaseContext
+
+  before_action :set_project, only: [:index]
+  before_action :set_misc_release, only: [:destroy]
+
+  include ProjectLayout
+
+  def index
+    @misc_releases = filtered_misc_releases.order_by_recent.paginate(page: params[:page])
+  end
+
+  def destroy
+    @project = @misc_release.project
+
+    if @misc_release.destroy
+      redirect_to [@project, :misc_releases], alert: t(".alert")
+    end
+  end
+
+  private
+
+  def misc_releases
+    if @project
+      policy_scope(@project.misc_releases)
+    else
+      policy_scope(MiscRelease)
+    end
+  end
+
+  def filtered_misc_releases
+    results = misc_releases
+
+    if params[:query].present?
+      results = results.search(params[:query])
+    end
+
+    results
+  end
+end

app/controllers/projects_controller.rb

@@ -60,7 +60,7 @@ class ProjectsController < ApplicationController
   end
 
   def features_settings_params
-    %i(appearance_release location_release material_release acquired_media_release music_release talent_release medical_release video_analysis)
+    %i(appearance_release location_release material_release acquired_media_release music_release talent_release medical_release misc_release video_analysis)
   end
 
   def project_params_with_current_account

app/controllers/public/appearance_releases_controller.rb

@@ -39,11 +39,60 @@ class Public::AppearanceReleasesController < Public::BaseController
     authorize appearance_releases.build(params)
   end
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_email
+      person_photo
+      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 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,
-                                               :signature_base64, :person_date_of_birth,
-                                               :locale, :contract_template,)
+    params.require(:appearance_release).permit(person_params, guardian_params,
+                                               second_guardian_params,
+                                               :minor, :signature_base64,
+                                               :person_date_of_birth,
+                                               :locale, :contract_template)
   end
 
   def appearance_release_params_with_locale

app/controllers/public/broadcasts_controller.rb

@@ -37,6 +37,10 @@ class Public::BroadcastsController < Public::BaseController
 
   def set_broadcast
     @broadcast = Broadcast.find_by_token(params[:token])
+    
+    unless @broadcast.present?
+      redirect_to [:new, :session], alert: t(".alert")
+    end
   end
 
   class MultiViewBroadcast

app/controllers/public/medical_releases_controller.rb

@@ -45,6 +45,9 @@ class Public::MedicalReleasesController < Public::BaseController
       .require(:medical_release)
       .permit(
         person_params,
+        guardian_params,
+        second_guardian_params,
+        :minor,
         :signature_base64,
         :locale,
         :contract_template,
@@ -53,22 +56,56 @@ class Public::MedicalReleasesController < Public::BaseController
         :question_5_answer, :question_6_answer,
         :question_7_answer, :question_8_answer,
         :question_9_answer, :question_10_answer,
-        photos: [],
+        :question_11_answer, :question_12_answer,
+        :question_13_answer, :question_14_answer,
+        :question_15_answer, 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
+    %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
 

app/controllers/public/misc_releases_controller.rb

@@ -0,0 +1,99 @@
+class Public::MiscReleasesController < Public::BaseController
+  before_action :set_account, :set_project, :set_contract_template
+
+  def new
+    @misc_release = build_misc_release
+  end
+
+  def create
+    @misc_release = build_misc_release(misc_release_params_with_locale_and_contract_template)
+
+    if @misc_release.save(context: :native)
+      if @misc_release.contract_template.present?
+        AttachContractToReleasableJob.perform_later(@misc_release)
+      end
+      log_create_analytics
+    else
+      render :new
+    end
+  end
+
+  private
+
+  def set_project
+    @project = @account.projects.find(params[:project_id])
+  end
+
+  def set_account
+    @account = Account.find_by(slug: params[:account_id])
+  end
+
+  def set_contract_template
+    @contract_template = @project.contract_templates.find(params[:contract_template_id])
+  end
+
+  def misc_releases
+    policy_scope(@project.misc_releases)
+  end
+
+  def build_misc_release(params = {})
+    authorize misc_releases.build(params)
+  end
+
+  def misc_release_params
+    params
+      .require(:misc_release)
+      .permit(
+        person_params,
+        guardian_params,
+        :signature_base64,
+        :locale,
+        :contract_template,
+        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,
+    ]
+  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
+    ]
+  end
+
+  def misc_release_params_with_locale
+    misc_release_params.merge(locale: I18n.locale)
+  end
+
+  def misc_release_params_with_locale_and_contract_template
+    misc_release_params_with_locale.merge(contract_template: @contract_template)
+  end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: MiscRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
+end

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
 

app/controllers/release_template_imports_controller.rb

@@ -11,7 +11,9 @@ class ReleaseTemplateImportsController < ApplicationController
 
     templates = []
     filtered_contract_templates.each do |contract_template|
-      next if contract_template.duplicated? || contract_template.project == @project
+      next if contract_template.duplicated? ||
+              contract_template.archived? ||
+              contract_template.project == @project
 
       already_imported = contract_template.duplicates.non_archived.pluck(:project_id).include?(@project.id)
       templates << OpenStruct.new(template: contract_template, already_imported?: already_imported)

app/controllers/talent_releases_controller.rb

@@ -61,15 +61,67 @@ class TalentReleasesController < ApplicationController
     end
   end
 
+  def person_params
+    %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
+    %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
+
   def talent_release_params
-    params.require(:talent_release).permit(
-      :person_first_name, :person_last_name, :person_phone, :guardian_photo, :person_email,
-      :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country,
-      :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,
-      :contract, { photos: [] },
-      :applicable_medium_id, :applicable_medium_text, :territory_id, :territory_text, :term_id, :term_text, :restriction_id, :restriction_text
-    )
+    params.require(:talent_release).permit(person_params,
+                                           guardian_params,
+                                           second_guardian_params,
+                                           :contract, { photos: [] },
+                                           :applicable_medium_id,
+                                           :applicable_medium_text,
+                                           :territory_id,
+                                           :territory_text,
+                                           :term_id,
+                                           :term_text,
+                                           :restriction_id,
+                                           :restriction_text)
   end
 
   def build_talent_release(attrs = {})

app/helpers/dropzone_helper.rb

@@ -2,7 +2,7 @@ module DropzoneHelper
   def dropzone_placeholder_message_for(releasable)
     case releasable.model_name.param_key
     when "acquired_media_release"
-      "To Add Photos & Videos to the release:<br>Drag & Drop Files<br>or<br>Click or Tap here to browse photos and connect to Camera"
+      '(Optional) To add the licensed photos or videos ("Property") to this release:<br>Drag & Drop Files<br>or<br>Click or Tap here to browse photos and connect to Camera'
     when "material_release"
       t 'material_releases.form.photos.dropzone_label'
     when "music_release"

app/jobs/match_appearance_releases_job.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+class MatchAppearanceReleasesJob < ApplicationJob
+  queue_as :default
+
+  def perform(project, attachments)
+    filtered_attachments_object = filter_attachments attachments
+
+    return if filtered_attachments_object[:keys].blank?
+
+    matching_request = MatchingRequest.create project: project, attachments: filtered_attachments_object[:signed_ids]
+
+    payload = { request_id: matching_request.id, bucket: aws_bucket_name, files: filtered_attachments_object[:keys]}
+    response = BrayniacAI::QrMatching.create! payload
+    matches = response.matches || []
+    key_signed_id_hash = Hash[filtered_attachments_object[:keys].zip(filtered_attachments_object[:signed_ids])]
+    handle_matches matches, project, key_signed_id_hash
+    matching_request.destroy
+  end
+
+  private
+
+  def handle_matches(matches, project, key_signed_id_hash)
+    matches.each do |match|
+      contract_key = Array.wrap(match.contracts).first
+      headshot_key = Array.wrap(match.headshots).first
+      identifier = match.identifier
+
+      contract = key_signed_id_hash[contract_key]
+      headshot = key_signed_id_hash[headshot_key]
+
+      next if contract.nil? && headshot.nil?
+
+      identified_release = identifier.blank? ? nil : AppearanceRelease.find_by(identifier: identifier)
+      if identified_release.nil?
+        create_release project, contract, headshot, identifier
+      else
+        update_release identified_release, contract, headshot
+      end
+    end
+  end
+
+  def create_release(project, contract, headshot, identifier)
+    random_contract_no = AppearanceRelease.random_contract_number.to_s
+    is_incomplete = contract.nil? || headshot.nil?
+    params = {
+      project: project,
+      person_first_name: appearance_first_name(is_incomplete),
+      person_last_name: random_contract_no
+    }
+
+    params[:person_photo] = headshot unless headshot.nil?
+    params[:contract] = contract unless contract.nil?
+    params[:identifier] = identifier unless blank?
+
+    return if AppearanceRelease.create(params)
+
+    logger.error "Failed to create AppearanceRelease with params : \r\n#{params}"
+  end
+
+  def update_release(release, contract, headshot)
+    release.contract = contract unless contract.nil?
+    release.person_photo = headshot unless headshot.nil?
+
+    release.save
+  end
+
+  def appearance_first_name(incomplete)
+    if incomplete
+      I18n.t('appearance_releases.shared.incomplete_match')
+    else
+      I18n.t('appearance_releases.shared.matched_import')
+    end
+  end
+
+  def aws_bucket_name
+    ENV.fetch 'AWS_BUCKET'
+  end
+
+  def filter_attachments(attachments)
+    filtered_attachments_keys = []
+    filtered_attachments_signed_ids = []
+
+    attachments.each do |attachment|
+      blob = ActiveStorage::Blob.find_signed attachment
+      next if blob.nil?
+
+      extension = blob.filename.extension
+      next unless blob.image? || extension == 'pdf'
+
+      filtered_attachments_keys << blob.key
+      filtered_attachments_signed_ids << attachment
+    end
+
+    {
+      keys: filtered_attachments_keys,
+      signed_ids: filtered_attachments_signed_ids
+    }
+  end
+end

app/models/account.rb

@@ -56,6 +56,8 @@ class Account < ApplicationRecord
         Broadcast.where(project: projects),
         ZoomMeeting.where(project: projects),
         MedicalRelease.where(project: projects),
+        MiscRelease.where(project: projects),
+        MatchingRequest.where(project: projects),
         self
       ])).sum(:byte_size).to_f
   end

app/models/appearance_release.rb

@@ -12,10 +12,46 @@ class AppearanceRelease < ApplicationRecord
   include Taggable
   include PersonName
   include GuardianPhotoable
+  include SecondGuardianPhotoable
   include GuardianName
+  include SecondGuardianName
 
   has_one_attached :person_photo
 
+  composed_of :person_address,
+              class_name: 'Address',
+              mapping: [
+                %w[person_address_street1 street1],
+                %w[person_address_street2 street2],
+                %w[person_address_city city],
+                %w[person_address_state state],
+                %w[person_address_zip zip],
+                %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]
+              ]
+
+
   # These validations apply to all releases
   validates :person_email, email: true, allow_blank: true
   validates :person_first_name, :person_last_name, presence: true
@@ -39,6 +75,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
@@ -70,7 +107,18 @@ class AppearanceRelease < ApplicationRecord
   scope :having_no_person_photo,            -> { left_joins(:person_photo_attachment).group(:id).having('COUNT(active_storage_attachments) = 0') }
   scope :with_person_name,                  ->(name) { where('person_first_name ILIKE ? OR person_last_name ILIKE ?', "%#{name}%") }
 
-  searchable_on %i[person_first_name person_last_name person_address person_email person_phone]
+  searchable_on %i[
+    person_first_name
+    person_last_name
+    person_address_street1
+    person_address_street2
+    person_address_city
+    person_address_state
+    person_address_zip
+    person_address_country
+    person_email
+    person_phone
+  ]
 
   # All releases must respond to the following messages
   def name
@@ -97,6 +145,10 @@ class AppearanceRelease < ApplicationRecord
     true
   end
 
+  def second_guardian_present?
+    self.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

app/models/blank_contract.rb

@@ -8,7 +8,7 @@ class BlankContract
   end
 
   def to_pdf
-    kit = PDFKit.new(as_html)
+    kit = PDFKit.new(as_html, margin_right: 1, margin_left: 1, margin_top: 10, margin_bottom: 1)
     kit.to_file("tmp/#{filename}")
   end
 

app/models/concerns/attachable.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Attachable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many_attached :attachments
+  end
+end

app/models/concerns/second_guardian_name.rb

@@ -0,0 +1,20 @@
+module SecondGuardianName
+  extend ActiveSupport::Concern
+  
+  included do
+    def guardian_2_name
+      "#{guardian_2_first_name} #{guardian_2_last_name}".titleize
+    end
+
+    def guardian_2_name=(value)
+      if value.include?(' ')
+        split = value.split(" ", 2)
+        self.guardian_2_first_name = split.first
+        self.guardian_2_last_name = split.last
+      else
+        self.guardian_2_first_name = value
+        self.guardian_2_last_name = "(Not Given)"
+      end
+    end
+  end
+end

app/models/concerns/second_guardian_photoable.rb

@@ -0,0 +1,9 @@
+module SecondGuardianPhotoable
+  extend ActiveSupport::Concern
+
+  included do
+    has_one_attached :guardian_2_photo
+
+    validates :guardian_2_photo, content_type: ["image/png", "image/jpeg"]
+  end
+end

app/models/contract.rb

@@ -29,6 +29,10 @@ class Contract
     }
   end
 
+  def medical_release?
+    @releasable.instance_of?(MedicalRelease)
+  end
+
   private
 
   def contract_template

app/models/contract_template.rb

@@ -14,6 +14,7 @@ class ContractTemplate < ApplicationRecord
   has_many :location_releases, dependent: :restrict_with_error
   has_many :material_releases, dependent: :restrict_with_error
   has_many :medical_releases, dependent: :restrict_with_error
+  has_many :misc_releases, dependent: :restrict_with_error
 
   monetize :fee_cents
   has_rich_text :body
@@ -51,6 +52,10 @@ class ContractTemplate < ApplicationRecord
     parent.present?
   end
 
+  def archived?
+    archived_at.present?
+  end
+
   def archive
     update(archived_at: Time.zone.now)
   end

app/models/headshot_collection.rb

@@ -23,7 +23,7 @@ class HeadshotCollection
       collection_uid: collection_uid.to_s,
       bucket_name: aws_bucket_name,
       ids_to_images: map_ids_to_images,
-    }.reject { |_, v| v.blank? }
+    }.reject { |k, v| v.blank? && k != :ids_to_images }
   end
 
   private

app/models/matching_request.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MatchingRequest < ApplicationRecord
+  include Attachable
+
+  belongs_to :project
+end

app/models/medical_release.rb

@@ -7,6 +7,12 @@ class MedicalRelease < ApplicationRecord
   include Signable
   include Syncable
   include PersonName
+  include GuardianPhotoable
+  include SecondGuardianPhotoable
+  include GuardianName
+  include SecondGuardianName
+
+  NUMBER_OF_CUSTOM_FIELDS = 15
 
   composed_of :person_address, 
               class_name: "Address",
@@ -29,6 +35,12 @@ class MedicalRelease < ApplicationRecord
 
   acts_as_taggable_on :internal_tags, :tags
 
+  # These validations apply to releases being signed by a minor
+  with_options if: :minor? do
+    validates :guardian_email, email: true, allow_blank: true
+    validates :guardian_2_email, email: true, allow_blank: true
+  end
+
   # These validations apply to releases created natively by the system (i.e. not imported from elsewhere)
   with_options on: :native do
     validates :signature, attached: true
@@ -61,10 +73,6 @@ class MedicalRelease < ApplicationRecord
     false
   end
 
-  def minor?
-    false
-  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

app/models/misc_release.rb

@@ -0,0 +1,86 @@
+class MiscRelease < ApplicationRecord
+  include Contractable
+  include Notable
+  include Photoable
+  include Releasable
+  include Searchable
+  include Signable
+  include Syncable
+  include PersonName
+  include GuardianName
+  include GuardianPhotoable
+
+  composed_of :person_address, 
+              class_name: "Address",
+              mapping: [ 
+                %w(person_address_street1 street1), 
+                %w(person_address_street2 street2), 
+                %w(person_address_city city), 
+                %w(person_address_state state), 
+                %w(person_address_zip zip), 
+                %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) 
+              ]
+
+  def self.face_photo_acceptable_content_types
+    ["image/png", "image/jpeg"]
+  end
+
+  # These validations apply to all releases
+  validates :person_first_name, :person_last_name, presence: true
+  validates :person_email, email: true, allow_blank: true
+
+  acts_as_taggable_on :internal_tags, :tags
+
+  # These validations apply to releases created natively by the system (i.e. not imported from elsewhere)
+  with_options on: :native do
+    validates :signature, attached: true
+  end
+
+  # These validations apply to releases imported to the system from an outside source
+  with_options on: :non_native do
+    validates :contract, attached: true
+  end
+
+  with_options if: :minor? do
+    validates :guardian_first_name, :guardian_last_name, presence: true
+    validates :guardian_phone, presence: true
+  end
+
+  searchable_on %i[ 
+    person_first_name person_last_name person_email person_phone
+    person_address_street1 person_address_street2 person_address_city person_address_state person_address_zip person_address_country
+    guardian_address_street1 guardian_address_street2 guardian_address_city guardian_address_state guardian_address_zip guardian_address_country 
+  ]
+
+  # All releases must respond to the following messages
+  def name
+    person_name
+  end
+
+  def filename_suffix
+    "#{person_last_name} #{person_first_name}"
+  end
+
+  def contact_person
+    @contact_person ||= Contact.new(person_name, person_address, person_email, person_phone)
+  end
+
+  def uses_edl?
+    false
+  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
+end

app/models/project.rb

@@ -3,8 +3,8 @@ class Project < ApplicationRecord
   include Filterable
   include Syncable
 
-  SIGNABLE_RELEASE_TYPES = %w(talent appearance acquired_media location material medical)
-  AVAILABLE_RELEASE_TYPES = %w(appearance location material acquired_media talent music medical)
+  SIGNABLE_RELEASE_TYPES = %w(talent appearance acquired_media location material medical misc)
+  AVAILABLE_RELEASE_TYPES = %w(appearance location material acquired_media talent music medical misc)
 
   belongs_to :account
   has_many :acquired_media_releases, dependent: :destroy
@@ -14,6 +14,7 @@ class Project < ApplicationRecord
   has_many :music_releases, dependent: :destroy
   has_many :talent_releases, dependent: :destroy
   has_many :medical_releases, dependent: :destroy
+  has_many :misc_releases, dependent: :destroy
   has_many :videos, dependent: :destroy
   has_many :imports, dependent: :destroy
   has_many :contract_templates, dependent: :destroy
@@ -35,6 +36,7 @@ class Project < ApplicationRecord
       music_release: false,
       talent_release: false,
       medical_release: false,
+      misc_release: false,
       video_analysis: false,
     }
   end
@@ -68,6 +70,7 @@ class Project < ApplicationRecord
         music_release: true,
         talent_release: true,
         medical_release: true,
+        misc_release: true,
         video_analysis: true,
       }
     when "nat_geo"
@@ -80,6 +83,7 @@ class Project < ApplicationRecord
         music_release: true,
         talent_release: true,
         medical_release: true,
+        misc_release: true,
         video_analysis: true,
       }
     else

app/models/qr_code.rb

@@ -24,7 +24,7 @@ class QrCode
     end
   end
 
-  def to_base64_png(width = 100, height = 100)
+  def to_base64_png(width = 200, height = 200)
     _qr_code.as_png.resize(width, height).to_data_url
   end
 

app/models/releasable_param.rb

@@ -1,5 +1,5 @@
 class ReleasableParam
-  TYPES = %w(talent appearance location material acquired_media music medical)
+  TYPES = %w(talent appearance location material acquired_media music medical misc)
 
   def initialize(params)
     @params = params

app/models/sample_appearance_release.rb

@@ -8,7 +8,12 @@ class SampleAppearanceRelease < AppearanceRelease
 
   def default_attrs
     {
-      person_address: "Street Address, City, State Zipcode",
+      person_address_street1: "Street Address",
+      person_address_street2: "St2",
+      person_address_city: "City",
+      person_address_state: "State",
+      person_address_zip: "ZIP",
+      person_address_country: "Country",
       person_first_name:    "Some",
       person_last_name:     "Person",
       person_phone:   "555-555-5555",

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

app/policies/contract_policy.rb

@@ -1,5 +1,9 @@
 class ContractPolicy < ApplicationPolicy
   def show?
-    user.manager? || user.account_manager?
+    if record.respond_to?(:medical_release?) && record.medical_release?
+      user.account_manager?
+    else
+      user.manager? || user.account_manager?
+    end
   end
 end

app/policies/medical_release_policy.rb

@@ -31,7 +31,11 @@ class MedicalReleasePolicy < ReleasePolicy
     true
   end
 
+  def download_single?
+    user.account_manager?
+  end
+
   def download_multiple?
-    true
+    download_single?
   end
 end

app/policies/misc_release_policy.rb

@@ -0,0 +1,41 @@
+class MiscReleasePolicy < ReleasePolicy
+  def create?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def update?
+    !record.native?
+  end
+
+  def destroy?
+    true
+  end
+
+  def edit_photos?
+    true
+  end
+  
+  def index?
+    true
+  end
+
+  def update_photos?
+    edit_photos?
+  end
+
+  def tag_multiple?
+    true
+  end
+
+  def download_single?
+    true
+  end
+
+  def download_multiple?
+    download_single?
+  end
+end

app/views/appearance_releases/_form.html.erb

@@ -13,18 +13,29 @@
     <div class="form-row">
       <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
       <%= form.date_field :person_date_of_birth, wrapper_class: "col-sm-6", placeholder: Date.current %>
-      <%= form.text_field :person_address, wrapper_class: "col-sm-6" %>
+      <%= form.text_field :person_address_street1, wrapper_class: "col-sm-6" %>
     </div>
 
     <div class="<%= class_string("collapse" => !appearance_release.minor?) %>" data-ujs-target="guardian-fields">
-      <div class="form-row">
-        <%= form.text_field :guardian_first_name, required: appearance_release.minor?, wrapper_class: "col-sm-3" %>
-        <%= 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_address, wrapper_class: "col-sm-6" %>
-      </div>
+      <%= card_field_set_tag t(".guardian_info.heading") do %>
+        <div class="form-row">
+          <%= form.text_field :guardian_first_name, required: appearance_release.minor?, wrapper_class: "col-sm-3" %>
+          <%= 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" %>
+          <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :guardian_address_street1, wrapper_class: "col-sm-6" %>
+        </div>
+      <% end %>
+
+      <%= 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" %>
+          <%= form.text_field :guardian_2_address_street1, wrapper_class: "col-sm-6" %>
+        </div>
+      <% end %>
     </div>
   <% end %>
 
@@ -59,20 +70,36 @@
     <div class="<%= class_string("collapse" => !appearance_release.minor?) %>" data-ujs-target="guardian-fields">
       <div class="text-left">
         <p><%= t(".photos.guardian_photo.heading") %></p>
-        <div class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-photo-input]">
+        <div id='guardian-photo-preview' class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-photo-input]">
           <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
             <span>No photo yet</span>
           </div>
         </div>
         <% if appearance_release.guardian_photo.attached? %>
           <%= javascript_tag nonce: true do %>
-            App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(appearance_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
+            App.PhotoPreview.set("#guardian-photo-preview", "<%= url_for(appearance_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
           <% end %>
         <% end %>
         <div class="d-inline-block">
           <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if appearance_release.guardian_photo.attached?%>
           <%= form.file_field :guardian_photo, hide_label: true, data: { ujs_target: "guardian-photo-input" }, help: "PNG or JPG only", accept: appearance_release.class.face_photo_acceptable_content_types.join(",") %>
         </div>
+
+        <p><%= t(".photos.guardian_2_photo.heading") %></p>
+        <div id='guardian-2-photo-preview' 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>No photo yet</span>
+          </div>
+        </div>
+        <% if appearance_release.guardian_2_photo.attached? %>
+          <%= javascript_tag nonce: true do %>
+            App.PhotoPreview.set("#guardian-2-photo-preview", "<%= url_for(appearance_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>");
+          <% end %>
+        <% end %>
+        <div class="d-inline-block">
+          <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if appearance_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: appearance_release.class.face_photo_acceptable_content_types.join(",") %>
+        </div>
       </div>
     </div>
   <% end %>

app/views/blank_contracts/pdf.html.erb

@@ -2,6 +2,10 @@
   <div class="page">
     <% has_logo = local_assigns[:logo] %>
     <table class="heading-table">
+      <tr>
+        <td>&nbsp;</td>
+        <td class="do-not-copy-warning"><strong><%= t '.do_not_copy_warning' %></strong></td>
+      </tr>
       <tr>
         <td>
           <% if has_logo %>
@@ -11,17 +15,9 @@
           <% end %>
         </td>
         <td>
-          <img src="<%= qr_codes[copy_index] %>" />
+          <img class="qr-code" src="<%= qr_codes[copy_index] %>" />
         </td>
       </tr>
-      <tr>
-        <td>&nbsp;</td>
-        <td class="serial-number"><%= serial_numbers[copy_index] %></td>
-      </tr>
-      <tr>
-        <td>&nbsp;</td>
-        <td><strong><%= t '.do_not_copy_warning' %></strong></td>
-      </tr>
     </table>
     <hr>
     <% if contract_template.body.present? %>

app/views/broadcasts/_file_form.html.erb

@@ -1,4 +1,4 @@
 <%= bootstrap_form_for model, layout: :inline, remote: true do |form| %>
-  <%= form.file_field :files, direct_upload: true, multiple: true, accept: "*", hide_label: true, wrapper_class: "w-65 mr-2", id: "broadcast_files_#{token}" %>
+  <%= form.file_field :files, direct_upload: true, multiple: true, accept: "*", hide_label: true, required: true, wrapper_class: "w-65 mr-2", id: "broadcast_files_#{token}" %>
   <%= form.button fa_icon("upload", text: "Add File"), class: "btn btn-primary", type: :submit, data: { disable_with: fa_icon("spinner", text: "Adding File") } %>
 <% end %>

app/views/broadcasts/show.html.erb

@@ -3,12 +3,12 @@
     <meta name="project-id" content="<%= @project.id %>">
   <% end %>
   <% if @broadcast %>
-    <meta name="broadcast-token" content="<%= @broadcast.token %>">
+    <meta name="broadcast-token" current="true" content="<%= @broadcast.token %>">
   <% end %>
   <% # Subscribe to Action Cable for every broadcast including those in multi-view %>
   <% @multi_view_broadcasts.each do |multi_view_broadcast| %>
     <% if multi_view_broadcast.token != @broadcast.token %>
-      <meta name="broadcast-token" content="<%= multi_view_broadcast.token %>">
+      <meta name="broadcast-token" current="false" content="<%= multi_view_broadcast.token %>">
     <% end %>
   <% end %>
 <% end %>

app/views/contract_templates/_form.html.erb

@@ -2,10 +2,10 @@
   <%= 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_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) } }, class: "form-control custom-select" %>
     </div>
     <div class="form-row" id="fee_field">
-      <%= 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" %>
+      <%= form.number_field :fee, min:"0", max:"99999999", step: "0.01", prepend: "$", wrapper_class: "col-sm-6" %>
     </div>
   <% end %>
 
@@ -15,11 +15,6 @@
     <%= 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 %>
 
   <%= field_set_tag content_tag(:span, t(".legal.heading"), class: "h6 text-muted text-uppercase") do %>
     <%= form.form_group do %>
@@ -32,6 +27,12 @@
     </div>
   <% end %>
 
+  <%= field_set_tag content_tag(:span, t(".custom_fields.heading"), class: "h6 text-muted text-uppercase"), id: "custom_fields", style: "display: none;" do %>
+    <p class="alert alert-info"><%= fa_icon("info-circle", text: t(".custom_fields.instructions")) %></p>
+    <%= render "shared/custom_fields", form: form %>
+    <hr>
+  <% end %>
+
   <div class="row align-items-center text-center mt-4">
     <%= link_to t("shared.cancel"), [project, :contract_templates], class: "col-3 text-reset" %>
     <div class="col-3">

app/views/contracts/_medical_questionnaire.html.erb

@@ -0,0 +1,8 @@
+<p class="heading"><strong><u><%= t ".heading" %></u></strong></p>
+  
+<% (1..MedicalRelease::NUMBER_OF_CUSTOM_FIELDS).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 %>

app/views/contracts/_photos.html.erb

@@ -5,6 +5,9 @@
 <% if release.respond_to? :guardian_photo %>
   <% @total_photos_count += release.guardian_photo.attached? ? 1 : 0 %>
 <% end %>
+<% if release.respond_to? :guardian_2_photo %>
+  <% @total_photos_count += release.guardian_2_photo.attached? ? 1 : 0 %>
+<% end %>
 <p class="heading"><strong><u><%= t '.heading', count: @total_photos_count %></u></strong></p>
 
 <ul>
@@ -29,6 +32,14 @@
         <%= release.guardian_photo.filename.to_s %>
       </li>
     <% end %>
+    <% if release.respond_to?(:guardian_2_photo) && release.guardian_2_photo.attached? %>
+      <br>
+      <p class="heading"><strong><%= t '.guardian_2_photo_heading' %></strong></p>
+      <li>
+        <%= image_tag release.guardian_2_photo.variant(auto_orient: true, resize: "200x200") %><br />
+        <%= release.guardian_2_photo.filename.to_s %>
+      </li>
+    <% end %>
   <% end %>
 </ul>
 

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,7 +56,23 @@
     <%= 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>
 
+  <% if releasable.respond_to?(:second_guardian_present?) && releasable.second_guardian_present? %>
+
+    <br/>
+    <p class="text-left"><strong>Second guardian Information</strong></p>
+
+    <% # Second guardian information %>
+    <dl>
+      <%= description_list_pair_for releasable, :guardian_2_name, append: ":" %>
+      <%= description_list_pair_for releasable, :guardian_2_address, append: ":" %>
+      <%= description_list_pair_for releasable, :guardian_2_phone, append: ":" %>
+      <%= description_list_pair_for releasable, :guardian_2_email, append: ":" %>
+    </dl>
+
+  <% end %>
+
 <% end %>

app/views/contracts/pdf.html.erb

@@ -15,6 +15,13 @@
   <p class="text-left"><strong>Guardian Clause</strong></p>
   <%= contract_template.guardian_clause %>
 <% end %>
+
+<% if releasable.model_name == "MedicalRelease" %>
+  <div class="page">
+    <%= render "contracts/medical_questionnaire", releasable: releasable, contract_template: contract_template, preview: preview %>
+  </div>  
+<% end %>
+
 <div class="page">
   <%= render "contracts/signature_page", releasable: releasable, contract_template: contract_template, preview: preview %>
 </div>

app/views/medical_releases/_medical_release.html.erb

@@ -37,7 +37,7 @@
         <% if policy(medical_release.tags).new? %>
           <%= link_to fa_icon("tags fw", text: "Tags"), [:new, medical_release, :acts_as_taggable_on_tag], class: "dropdown-item", remote: true %>
         <% end %>
-        <% if policy(Contract).show? && (medical_release.contract.attached? || medical_release.contract_template.present?) %>
+        <% if policy(MedicalRelease).download_single? && policy(Contract).show? && (medical_release.contract.attached? || medical_release.contract_template.present?) %>
           <%= link_to fa_icon("download fw", text: "Download"), [medical_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
         <% end %>
         <% if policy(medical_release).destroy? %>

app/views/misc_releases/_misc_release.html.erb

@@ -0,0 +1,48 @@
+<tr id="<%= dom_id(misc_release) %>">
+  <td data-behavior="select"><%= check_box_tag "misc_release_ids[]", misc_release.id, false %></td>
+  <td>
+    <% if misc_release.photo.attached? %>
+      <%= image_tag medium_variant(misc_release.photo), class: "img-fluid" %>
+    <% end %>
+  </td>
+  <td>
+    <%= misc_release.name %>
+  </td>
+  <td>
+    <%= contact_info( 
+      address: misc_release.person_address, 
+      phone: misc_release.person_phone, 
+      email: misc_release.person_email
+    ) %>
+  </td>
+  <td>
+    <%= notes_preview misc_release.notes.order_by_recent %>
+  </td>
+  <td id="<%= dom_id misc_release, "tags_preview" %>">
+    <%= tags_preview misc_release, misc_release.tags %>
+  </td>
+
+   <td>
+    <%= misc_release.signed_on %>
+  </td>
+
+  <td class="text-right">
+    <div class="btn-group">
+      <%= button_tag t(".actions.manage"), class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %>
+      <div class="dropdown-menu dropdown-menu-right">
+        <% if policy(Note).new? %>
+          <%= link_to fa_icon("sticky-note fw", text: "Notes"), [:new, misc_release, :note], class: "dropdown-item", remote: true %>
+        <% end %>
+        <% if policy(misc_release.tags).new? %>
+          <%= link_to fa_icon("tags fw", text: "Tags"), [:new, misc_release, :acts_as_taggable_on_tag], class: "dropdown-item", remote: true %>
+        <% end %>
+        <% if policy(MedicalRelease).download_single? && policy(Contract).show? && (misc_release.contract.attached? || misc_release.contract_template.present?) %>
+          <%= link_to fa_icon("download fw", text: "Download"), [misc_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
+        <% end %>
+        <% if policy(misc_release).destroy? %>
+          <%= link_to fa_icon("trash fw", text: "Delete"), misc_release, class: "dropdown-item", method: :delete, data: { confirm: "Are you sure?" } %>
+        <% end %>
+      </div>
+    </div>
+  </td>
+</tr>

app/views/misc_releases/index.html.erb

@@ -0,0 +1,48 @@
+<div class="row">
+  <div class="col-md-12">
+    <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
+      <% if @misc_releases.any? && policy(MiscRelease).tag_multiple? %>
+        <%= button_to_bulk_tagging(@project) %>
+      <% end %>
+
+      <% if @misc_releases.any? && policy(MiscRelease).download_multiple? %>
+        <%= link_to "Download All", [@project, :contract_downloads, release_type: @misc_releases.name], method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
+            disable_with: "Please wait..." } %>
+      <% end %>
+
+      <%= bootstrap_form_with url: [@project, :misc_releases], method: :get, remote: true, layout: :inline, id: "search" do |form| %>
+        <%= form.search_field :query, hide_label: true, placeholder: t(".actions.search"), class: "rounded-pill-right", value: params[:query], prepend: form.button(fa_icon("search"), class: "btn btn-light border mb-2 rounded-pill-left") %>
+      <% end %>
+    </div>
+  </div>
+</div>
+
+<div class="border bg-white rounded shadow-sm pb-3 table-responsive">
+  <table class="table table-striped tr-px-4 align-all-middle">
+    <thead class="thead-light">
+      <tr>
+        <th data-behavior="all-selectable"><%= check_box_tag "misc_release_ids[]", false, false %></th>
+        <th></th>
+        <th><%= MiscRelease.human_attribute_name(:person_name) %></th>
+        <th><%= MiscRelease.human_attribute_name(:contact_info) %></th>
+        <th><%= t(".table_headers.notes") %></th>
+        <th><%= t(".table_headers.tags") %></th>
+        <th><%= t(".table_headers.signed_at") %></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody id="misc_releases">
+      <% if @misc_releases.any? %>
+        <%= render @misc_releases %>
+      <% else %>
+        <tr>
+          <td colspan="12" class="py-4 text-center text-muted"><%= t(".empty") %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div id="misc_releases_pagination" class="mt-3">
+  <%= will_paginate @misc_releases %>
+</div>

app/views/misc_releases/index.js.erb

@@ -0,0 +1,3 @@
+$("#misc_releases").html("<%= j render(@misc_releases) %>");
+$("form input[type='search']").val("<%= params[:query] %>");
+$("#misc_releases_pagination").html("<%= j will_paginate(@misc_releases) %>");

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

@@ -18,7 +18,7 @@
           <%= form.text_field :name, required: true, wrapper_class: "col-12" %>
         </div>
         <div class="form-row">
-          <%= form.text_area :description, wrapper_class: "col-12" %>
+          <%= form.text_area :description, required: true, wrapper_class: "col-12" %>
         </div>
         <%= form.form_group :categories, label: { text: "Licensed property type" } do %>
           <% AcquiredMediaRelease::CATEGORIES.each do |category| %>
@@ -31,23 +31,19 @@
 
       <%= card_field_set_tag t(".personal_info.heading") do %>
         <div class="form-row">
-          <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
-          <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
-          <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
-          <%= form.phone_field :person_phone, wrapper_class: "col-sm-6", label: 'Phone' %>
-          <%= form.email_field :person_email, wrapper_class: "col-sm-6", label: 'Email' %>
-          <%= form.text_field :person_fax, wrapper_class: "col-sm-6", label: 'Fax' %>
+          <%= 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.text_field :person_title, required: true, wrapper_class: "col-sm-6" %>
+          <%= form.phone_field :person_phone, required: true, wrapper_class: "col-sm-6", label: 'Phone' %>
+          <%= form.email_field :person_email, required: true, wrapper_class: "col-sm-6", label: 'Email' %>
+          <%= form.text_field :person_fax, required: true, wrapper_class: "col-sm-6", label: 'Fax' %>
         </div>
-        <%= render "shared/address_fields", form: form, subject: "person" %>
+        <%= render "shared/address_fields", form: form, required: true, subject: "person" %>
       <% end %>
 
       <hr>
 
       <%= card_field_set_tag t(".files.heading") do %>
-        <div class="alert alert-warning text-center text-md-left">
-          <%= fa_icon "warning" %>
-          <strong>For optimal accuracy, please ensure video file names and photo file names match the source file name in the editing sequence.</strong>
-        </div>
         <%= render "shared/file_infos_dropzone", form: form, releasable: @acquired_media_release %>
       <% end %>
 

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

@@ -30,13 +30,13 @@
         <div class="form-row">
           <%= 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" %>
+          <%= form.phone_field :person_phone, required: true, wrapper_class: "col-sm-6" %>
         </div>
         <div class="form-row">
-          <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
-          <%= form.date_field :person_date_of_birth, wrapper_class: "col-sm-6", placeholder: Date.current %>
-          <%= form.text_field :person_address, wrapper_class: "col-sm-6" %>
+          <%= form.email_field :person_email, required: true, wrapper_class: "col-sm-6" %>
+          <%= form.date_field :person_date_of_birth, required: true, wrapper_class: "col-sm-6", placeholder: Date.current %>
         </div>
+        <%= render "shared/address_fields", form: form, subject: "person", required: true %>
       <% end %>
 
       <%= card_field_set_tag t(".photo.heading") do %>
@@ -57,7 +57,7 @@
               <%= form.hidden_field :person_photo, value: form.object.person_photo.signed_id if @appearance_release.person_photo.attached? %>
               <%= form.file_field :person_photo, hide_label: true, data: { ujs_target: "person-photo-input" }, accept: @appearance_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
             </div>
-            <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "take-person-photo" } %>
+            <%= 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=person-photo-input]" } %>
           </div>
           <p class="p-2 font-weight-bold">
             <%= fa_icon "arrow-up", text: t(".photo.camera_instructions_html") %><br>
@@ -74,11 +74,10 @@
             <div class="form-row">
               <%= form.text_field :guardian_first_name, required: @appearance_release.minor?, wrapper_class: "col-sm-3" %>
               <%= 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_address, wrapper_class: "col-sm-6" %>
+              <%= form.phone_field :guardian_phone, required: @appearance_release.minor?, wrapper_class: "col-sm-6" %>
+              <%= form.text_field :guardian_email, required: @appearance_release.minor?, wrapper_class: "col-sm-6" %>
             </div>
+            <%= render "shared/address_fields", form: form, subject: "guardian", required: @appearance_release.minor? %>
           <% end %>
 
           <hr>
@@ -99,9 +98,50 @@
                 <% end %>
                 <div class="hidden-file-input">
                   <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if @appearance_release.guardian_photo.attached? %>
-                  <%= form.file_field :guardian_photo, hide_label: true, data: { ujs_target: "guardian-photo-input" }, accept: @appearance_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
+                  <%= form.file_field :guardian_photo, required: @appearance_release.minor?, hide_label: true, data: { ujs_target: "guardian-photo-input" }, accept: @appearance_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
                 </div>
-                <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "take-guardian-photo" } %>
+                <%= 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]" } %>
+              </div>
+              <p class="p-2 font-weight-bold">
+                <%= fa_icon "arrow-up", text: t(".photo.camera_instructions_html") %><br>
+                <small class="text-muted"><%= t ".photo.warning" %></small>
+              </p>
+            </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 ".photo.no_photo" %></span>
+                </div>
+              </div>
+              <div class="d-inline-block text-left">
+                <% if @appearance_release.guardian_2_photo.attached? %>
+                  <%= javascript_tag nonce: true do %>
+                    App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@appearance_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 @appearance_release.guardian_2_photo.attached? %>
+                  <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, accept: @appearance_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
+                </div>
+                <%= 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]" } %>
               </div>
               <p class="p-2 font-weight-bold">
                 <%= fa_icon "arrow-up", text: t(".photo.camera_instructions_html") %><br>

app/views/public/broadcasts/_file_form.html.erb

@@ -1,4 +1,4 @@
 <%= bootstrap_form_for model, url: broadcast_url(token: token), layout: :inline, remote: true do |form| %>
-  <%= form.file_field :files, direct_upload: true, multiple: true, accept: "*", hide_label: true, wrapper_class: "w-65 mr-2", id: "broadcast_files_#{token}" %>
+  <%= form.file_field :files, direct_upload: true, multiple: true, accept: "*", hide_label: true, required: true, wrapper_class: "w-65 mr-2", id: "broadcast_files_#{token}" %>
   <%= form.button fa_icon("upload", text: "Add File"), class: "btn btn-primary", type: :submit, data: { disable_with: fa_icon("spinner", text: "Adding File") } %>
 <% end %>

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

@@ -17,21 +17,21 @@
         <div class="form-row">
           <%= form.text_field :name, required: true, wrapper_class: "col-12" %>
         </div>
-        <%= render "shared/address_fields", form: form, subject: "" %>
+        <%= render "shared/address_fields", form: form, required: true, subject: "" %>
       <% end %>
 
       <hr>
 
       <%= card_field_set_tag t(".contact_info.heading") do %>
         <div class="form-row">
-          <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
-          <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
-          <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
-          <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
-          <%= form.text_field :person_company, wrapper_class: "col-sm-6" %>
-          <%= form.text_field :person_title, wrapper_class: "col-sm-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, required: true, wrapper_class: "col-sm-6" %>
+          <%= form.email_field :person_email, required: true, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :person_company, required: true, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :person_title, required: true, wrapper_class: "col-sm-6" %>
         </div>
-        <%= render "shared/address_fields", form: form, subject: "person" %>
+        <%= render "shared/address_fields", form: form, required: true, subject: "person" %>
       <% end %>
 
       <hr>
@@ -39,9 +39,9 @@
 
       <%= card_field_set_tag t(".filming_info.heading") do %>
         <div class="form-row">
-          <%= 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_hours, wrapper_class: "col-sm-12" %>
+          <%= form.text_field :filming_started_on, required: true, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %>
+          <%= form.text_field :filming_ended_on, required: true, wrapper_class: "col-sm-6", class: "datepicker-control", readonly: true %>
+          <%= form.text_field :filming_hours, required: true, wrapper_class: "col-sm-12" %>
         </div>
       <% end %>
 

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

@@ -18,20 +18,20 @@
           <%= form.text_field :name, required: true, wrapper_class: "col-12" %>
         </div>
         <div class="form-row">
-          <%= form.text_area :description, placeholder: true, wrapper_class: "col-sm-12", rows: 6 %>
+          <%= form.text_area :description, required: true, placeholder: true, wrapper_class: "col-sm-12", rows: 6 %>
         </div>
       <% end %>
 
       <%= card_field_set_tag t(".contact_info.heading") do %>
         <div class="form-row">
-          <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
-          <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
-          <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
-          <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
-          <%= form.text_field :person_company, wrapper_class: "col-sm-6" %>
-          <%= form.text_field :person_title, wrapper_class: "col-sm-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, required: true, wrapper_class: "col-sm-6" %>
+          <%= form.email_field :person_email, required: true, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :person_company, required: true, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :person_title, required: true, wrapper_class: "col-sm-6" %>
         </div>
-        <%= render "shared/address_fields", form: form, subject: "person" %>
+        <%= render "shared/address_fields", form: form, subject: "person", required: true %>
       <% end %>
 
       <%= card_field_set_tag t(".photo.heading") do %>

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

@@ -13,10 +13,21 @@
       <% end %>
 
       <hr>
+
+      <% unless @contract_template.guardian_clause.blank? %>
+        <%= form.form_group :minor do %>
+          <%= form.check_box :minor, label: t("helpers.label.medical_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+        <% end %>
+
+        <%= card_field_set_tag t(".guardian_clause.heading") do %>
+          <p><%= @contract_template.guardian_clause %></p>
+        <% end %>
+        <hr>
+      <% end %>
       
-      <% if (1..10).map {|n| @contract_template.public_send("question_#{n}_text").presence }.compact.any? %>
+      <% if (1..MedicalRelease::NUMBER_OF_CUSTOM_FIELDS).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| %>
+          <% (1..MedicalRelease::NUMBER_OF_CUSTOM_FIELDS).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") %>
@@ -44,12 +55,103 @@
         <%= render "shared/photos_dropzone_fields", form: form, release: @medical_release %>
       <% end %>
 
+      <% unless @contract_template.guardian_clause.blank? %>
+        <div class="<%= class_string("collapse" => !@medical_release.minor?) %>" data-ujs-target="guardian-fields">
+          <%= card_field_set_tag t(".guardian_info.heading") do %>
+            <div class="form-row">
+              <%= form.text_field :guardian_first_name, required: @medical_release.minor?, wrapper_class: "col-sm-3" %>
+              <%= form.text_field :guardian_last_name, required: @medical_release.minor?, wrapper_class: "col-sm-3" %>
+              <%= form.phone_field :guardian_phone, required: @medical_release.minor?, wrapper_class: "col-sm-6" %>
+            </div>
+            <div class="form-row">
+              <%= form.text_field :guardian_email, required: @medical_release.minor?, wrapper_class: "col-sm-6" %>
+            </div>
+            <%= render "shared/address_fields", form: form, subject: "guardian", required: @medical_release.minor? %>
+          <% end %>
+
+          <hr>
+
+          <%= card_field_set_tag t(".guardian_photo.heading") do %>
+            <div class="alert alert-warning font-weight-bold"><%= t ".guardian_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-photo-input]">
+                <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+                  <span><%= t ".photo.no_photo" %></span>
+                </div>
+              </div>
+              <div class="d-inline-block text-left">
+                <% if @medical_release.guardian_photo.attached? %>
+                  <%= javascript_tag nonce: true do %>
+                    App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@medical_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
+                  <% end %>
+                <% end %>
+                <div class="hidden-file-input">
+                  <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if @medical_release.guardian_photo.attached? %>
+                  <%= form.file_field :guardian_photo, required: @medical_release.minor?, hide_label: true, data: { ujs_target: "guardian-photo-input" }, accept: @medical_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
+                </div>
+                <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "take-guardian-photo" } %>
+              </div>
+              <p class="p-2 font-weight-bold">
+                <%= fa_icon "arrow-up", text: t(".photo.camera_instructions_html") %><br>
+                <small class="text-muted"><%= t ".photo.warning" %></small>
+              </p>
+            </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" %>
+            </div>
+            <div class="form-row">
+              <%= 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 ".photo.no_photo" %></span>
+                </div>
+              </div>
+              <div class="d-inline-block text-left">
+                <% if @medical_release.guardian_2_photo.attached? %>
+                  <%= javascript_tag nonce: true do %>
+                    App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@medical_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 @medical_release.guardian_2_photo.attached? %>
+                  <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, accept: @medical_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
+                </div>
+                <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "take-guardian-2-photo" } %>
+              </div>
+              <p class="p-2 font-weight-bold">
+                <%= fa_icon "arrow-up", text: t(".photo.camera_instructions_html") %><br>
+                <small class="text-muted"><%= t ".photo.warning" %></small>
+              </p>
+            </div>
+          <% end %>
+
+          <hr>
+
+        </div>
+      <% end %>
+
       <%= card_field_set_tag t(".signature.heading") do %>
         <%= render "shared/signature_fields", form: form %>
       <% end %>
 
       <div class="mt-5">
-        <%= form.button t("shared.submit_release_long"), class: "btn btn-block btn-lg btn-success", data: { disable_with: t("shared.disable_with") } %>
+        <%= form.button t("shared.submit_release_short"), class: "btn btn-block btn-lg btn-success", data: { disable_with: t("shared.disable_with") } %>
       </div>
     <% end %>
   </div>

app/views/public/misc_releases/create.html.erb

@@ -0,0 +1 @@
+<p class="alert alert-success p-3 lead text-center">Your release was successfully submitted. Thank you.</p>

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

@@ -0,0 +1,97 @@
+<div class="card shadow-sm">
+  <div class="card-body">
+    <%= errors_summary_for @misc_release %>
+    <%= bootstrap_form_with model: [@account, @project, @contract_template, @misc_release], local: true, validation_context: :native do |form| %>
+      <div class="alert alert-warning font-weight-bold"><%= t ".instructions_html", name: @project.name %></div>
+      <%= card_field_set_tag t(".legal.heading") do %>
+        <p><%= @contract_template.body %></p>
+      <% end %>
+
+      <hr>
+
+      <% unless @contract_template.guardian_clause.blank? %>
+        <%= form.form_group :minor do %>
+          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+        <% end %>
+
+        <%= card_field_set_tag t(".guardian_clause.heading") do %>
+          <p><%= @contract_template.guardian_clause %></p>
+        <% 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>
+        <div class="form-row">
+          <%= 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" %>
+      <% end %>
+
+      <hr>
+
+      <%= card_field_set_tag t(".photo.heading") do %>
+        <%= render "shared/photos_dropzone_fields", form: form, release: @misc_release %>
+      <% end %>
+
+      <% unless @contract_template.guardian_clause.blank? %>
+        <div class="<%= class_string("collapse" => !@misc_release.minor?) %>" data-ujs-target="guardian-fields">
+          <%= card_field_set_tag t(".guardian_info.heading") do %>
+            <div class="form-row">
+              <%= form.text_field :guardian_first_name, required: @misc_release.minor?, wrapper_class: "col-sm-3" %>
+              <%= form.text_field :guardian_last_name, required: @misc_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" %>
+          <% end %>
+
+          <hr>
+
+          <%= card_field_set_tag t(".guardian_photo.heading") do %>
+            <div class="alert alert-warning font-weight-bold"><%= t ".guardian_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-photo-input]">
+                <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+                  <span><%= t ".guardian_photo.no_photo" %></span>
+                </div>
+              </div>
+              <div class="d-inline-block text-left">
+                <% if @misc_release.guardian_photo.attached? %>
+                  <%= javascript_tag nonce: true do %>
+                    App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@misc_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
+                  <% end %>
+                <% end %>
+                <div class="hidden-file-input">
+                  <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if @misc_release.guardian_photo.attached? %>
+                  <%= form.file_field :guardian_photo, hide_label: true, data: { ujs_target: "guardian-photo-input" }, accept: @misc_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
+                </div>
+                <%= button_tag t(".guardian_photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "take-guardian-photo" } %>
+              </div>
+              <p class="p-2 font-weight-bold">
+                <%= fa_icon "arrow-up", text: t(".guardian_photo.camera_instructions_html") %><br>
+                <small class="text-muted"><%= t ".guardian_photo.warning" %></small>
+              </p>
+            </div>
+          <% end %>
+        </div>
+        <hr>
+      <% end %>
+
+      <%= card_field_set_tag t(".signature.heading") do %>
+        <%= render "shared/signature_fields", form: form %>
+      <% end %>
+
+      <div class="mt-5">
+        <%= 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>
+</div>

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" %>
@@ -78,7 +74,7 @@
                   <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if @talent_release.guardian_photo.attached? %>
                   <%= form.file_field :guardian_photo, hide_label: true, data: { ujs_target: "guardian-photo-input" }, accept: @talent_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
                 </div>
-                <%= button_tag t(".guardian_photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "take-guardian-photo" } %>
+                <%= button_tag t(".guardian_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]" } %>
               </div>
               <p class="p-2 font-weight-bold">
                 <%= fa_icon "arrow-up", text: t(".guardian_photo.camera_instructions_html") %><br>
@@ -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>

app/views/shared/_address_fields.html.erb

@@ -1,13 +1,14 @@
 <% field_name_prefix = subject.present? ? "#{subject}_" : "" %>
+<% required = required || false %>
 
 <div class="form-row">
-  <%= form.text_field "#{field_name_prefix}address_street1", wrapper_class: "col-sm-6" %>
+  <%= form.text_field "#{field_name_prefix}address_street1", required: required, wrapper_class: "col-sm-6" %>
   <%= form.text_field "#{field_name_prefix}address_street2", wrapper_class: "col-sm-6" %>
 </div>
 <div class="form-row">
-  <%= form.text_field "#{field_name_prefix}address_city", wrapper_class: "col-sm-6" %>
-  <%= form.text_field "#{field_name_prefix}address_state", wrapper_class: "col-sm-3" %>
-  <%= form.text_field "#{field_name_prefix}address_zip", wrapper_class: "col-sm-3" %>
+  <%= form.text_field "#{field_name_prefix}address_city", required: required, wrapper_class: "col-sm-6" %>
+  <%= form.text_field "#{field_name_prefix}address_state", required: required, wrapper_class: "col-sm-3" %>
+  <%= form.text_field "#{field_name_prefix}address_zip", required: required, wrapper_class: "col-sm-3" %>
 </div>
 <%= form.form_group "#{field_name_prefix}address_country" do %>
   <%= form.label "#{field_name_prefix}address_country" %>

app/views/shared/_custom_fields.html.erb

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

app/views/talent_releases/_form.html.erb

@@ -9,22 +9,30 @@
       <%= form.text_field :person_first_name, required: true, wrapper_class: "col-sm-3" %>
       <%= form.text_field :person_last_name, required: true, wrapper_class: "col-sm-3" %>
       <%= 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" %>
 
     <div class="<%= class_string("collapse" => !talent_release.minor?) %>" data-ujs-target="guardian-fields">
-      <div class="form-row">
-        <%= 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" %>
+      <%= card_field_set_tag t(".guardian_info.heading") do %>
+        <div class="form-row">
+          <%= 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" %>
+          <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
+        </div>
+        <%= render "shared/address_fields", form: form, subject: "guardian" %>
+      <% end %>
+
+      <%= card_field_set_tag t(".guardian_2_info.heading") do %>
+        <div class="form-row">
+          <%= form.text_field :guardian_2_first_name, required: talent_release.minor?, wrapper_class: "col-sm-3" %>
+          <%= form.text_field :guardian_2_last_name, required: talent_release.minor?, 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 %>
     </div>
   <% end %>
 
@@ -44,20 +52,36 @@
       <br>
       <div class="text-left">
         <p><%= t(".photos.guardian_photo.heading") %></p>
-        <div class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-photo-input]">
+        <div id="guardian-photo-preview" class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-photo-input]">
           <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
             <span>No photo yet</span>
           </div>
         </div>
         <% if talent_release.guardian_photo.attached? %>
           <%= javascript_tag nonce: true do %>
-            App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(talent_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
+            App.PhotoPreview.set("#guardian-photo-preview", "<%= url_for(talent_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
           <% end %>
         <% end %>
         <div class="d-inline-block">
           <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if talent_release.guardian_photo.attached?%>
           <%= form.file_field :guardian_photo, hide_label: true, data: { ujs_target: "guardian-photo-input" }, help: "PNG or JPG only", accept: talent_release.class.face_photo_acceptable_content_types.join(",") %>
         </div>
+
+        <p><%= t(".photos.guardian_2_photo.heading") %></p>
+        <div id="guardian-2-photo-preview" 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>No photo yet</span>
+          </div>
+        </div>
+        <% if talent_release.guardian_2_photo.attached? %>
+          <%= javascript_tag nonce: true do %>
+            App.PhotoPreview.set("#guardian-2-photo-preview", "<%= url_for(talent_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>");
+          <% end %>
+        <% end %>
+        <div class="d-inline-block">
+          <%= 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" }, help: "PNG or JPG only", accept: talent_release.class.face_photo_acceptable_content_types.join(",") %>
+        </div>
       </div>
       <hr>
     </div>

config/locales/en.yml

@@ -60,6 +60,10 @@ en:
   activerecord:
     attributes:
       appearance_release:
+        guardian_2_address: Guardian 2 address
+        guardian_2_email: Guardian 2 email
+        guardian_2_name: Guardian 2 name
+        guardian_2_phone: Guardian 2 phone
         person_address: Address
         person_email: Email
         person_name: Name
@@ -112,15 +116,22 @@ en:
       no_photos: Needs Photo
     create:
       failed_import: Failed to create appearance release for files listed below
+      matching_started: Matching started
       no_attachments: Failed to import - no attachments
     edit:
       heading: Edit Appearance Release
     form:
       contract_and_rights:
         heading: 2 of 3 Contract & Exploitable Rights
+      guardian_2_info:
+        heading: Second Guardian Information (if company requires)
+      guardian_info:
+        heading: Guardian Information
       person_details:
         heading: 1 of 3 Person Details
       photos:
+        guardian_2_photo:
+          heading: Second Guardian Photo
         guardian_photo:
           heading: Guardian Photo
         heading: 3 of 3 Photo
@@ -141,6 +152,8 @@ en:
     shared:
       imported_appearance_release_contract_name: Imported Contract
       imported_appearance_release_headshot_name: Imported Headshot
+      incomplete_match: Incomplete Match
+      matched_import: Complete Match
     type_filter_actions:
       all_releases: All Releases
       complete_releases: Complete Releases
@@ -213,7 +226,8 @@ en:
       archived_notice: The release template has been archived
     form:
       custom_fields:
-        heading: Custom Fields
+        heading: Medical Questionnaire
+        instructions: Please list the questions you wish the signer to answer. Any unused question fields will be hidden.
       exploitable_rights:
         heading: Exploitable Rights
       legal:
@@ -232,7 +246,10 @@ en:
     new:
       heading: New Release Template
   contracts:
+    medical_questionnaire:
+      heading: Medical Questionnaire
     photos:
+      guardian_2_photo_heading: Second guardian photo
       guardian_photo_heading: Guardian photo
       heading:
         one: Photo
@@ -300,6 +317,9 @@ en:
       notice: The release has been updated
   helpers:
     help:
+      contract_template:
+        fee: Leave at $0.00 for no-fee
+        guardian_clause: Leave blank if not required for this contract
       video:
         audio_only_edl_file: If you do not upload an Audio Only EDL, the software will not generate a BiG Music Cue Sheet.
         edl_file: Please follow our directions on exporting the All Tracks EDL. Failure to do so could result in inaccurate and incomplete reporting.
@@ -307,8 +327,8 @@ en:
         graphics_only_edl_file: If you do not upload a Graphics Only EDL, the software will not generate a Graphics Cue List.
     label:
       acquired_media_release:
-        description: Description of licensed property
-        name: Name of licensed property 
+        description: Description of property
+        name: Name of property
         person_address: Address
         person_address_city: City
         person_address_country: Country
@@ -324,9 +344,33 @@ en:
         person_phone: Phone number
         person_title: Title
       appearance_release:
+        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?
-        person_address: Address
+        person_address_city: City
+        person_address_country: Country
+        person_address_state: State
+        person_address_street1: Address
+        person_address_street2: Address (Line 2)
+        person_address_zip: Zip code
+        person_date_of_birth: Date of birth
         person_email: Email address
+        person_first_name: First name
+        person_last_name: Last name
         person_name: Name
         person_phone: Phone number
       location_release:
@@ -364,6 +408,40 @@ en:
         person_name: Name
         person_phone: Phone number
         person_title: Title
+      medical_release:
+        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
+        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?
+        person_address_city: City
+        person_address_country: Country
+        person_address_state: State
+        person_address_street1: Address
+        person_address_street2: Address (Line 2)
+        person_address_zip: Zip code
+        person_date_of_birth: Date of birth
+        person_email: Email address
+        person_first_name: First name
+        person_last_name: Last name
+        person_name: Name
+        person_phone: Phone number
       music_release:
         person_address: Address
         person_address_city: City
@@ -380,6 +458,16 @@ en:
       project:
         predefined_client_name: Client
       talent_release:
+        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: City
         guardian_address_country: Guardian country
         guardian_address_state: State
@@ -627,6 +715,20 @@ en:
     medical_release:
       actions:
         manage: Manage
+  misc_releases:
+    destroy:
+      alert: The misc release has been deleted
+    index:
+      actions:
+        search: Search
+      empty: Misc Releases will appear here
+      table_headers:
+        notes: Notes
+        signed_at: Date Signed
+        tags: Tags
+    misc_release:
+      actions:
+        manage: Manage
   music_releases:
     create:
       notice: The music release has been created
@@ -733,6 +835,7 @@ en:
         location_release: Location Releases
         material_release: Material Releases (Products / Logos)
         medical_release: Medical Releases
+        misc_release: Misc Releases
         music_release: Music Releases (Original Music)
         talent_release: Talent Releases
     index:
@@ -760,6 +863,7 @@ en:
       location_release: Location Releases (%{count})
       material_release: Material Releases (%{count})
       medical_release: Medical Releases (%{count})
+      misc_release: Misc Releases (%{count})
       music_release: Music Releases (%{count})
       report: Reports
       talent_release: Talent Releases (%{count})
@@ -782,6 +886,12 @@ en:
         notice: Your release has been signed. Thank you!
       new:
         cancel: Cancel
+        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:
@@ -791,22 +901,25 @@ en:
           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!
         instructions_html: >
-          Congrats in appearing on <em>%{name}</em>. Below is the appearance release form. After scrolling down and reading the appearance release form, please enter your personal information, take a selfie photo, and press the "Submit Release" button.
+          Congrats on appearing in <em>%{name}</em>. After scrolling down and reading the appearance release form, please enter your personal information, take a selfie photo and press the "Submit Release" button. If the person appearing on camera is a minor, you will enter their personal information first, select the button noting this person is a minor, and then enter your own personal info under "Guardian Information" at the bottom.
         legal:
           heading: Legal
         personal_info:
           heading: Personal Information
-          instructions: Now, enter your personal information.
+          instructions: Enter the personal information for the person appearing on camera.
         photo:
           camera_instructions_html: Click <em>Take Photo</em> to Turn ON Camera
-          heading: Take a Photo
+          heading: Photo of Person Appearing on Camera
           instructions: >
-            Lastly, it's time for you 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!
+            'Before you take your selfie photo, remove your hat and sunglasses (regular eyewear is okay). Make sure you are the only person in the frame, look straight at the camera and snap the photo. NOTE: If you are a Guardian, you must take the photo of the minor. Minor photo is required only for record keeping purposes to maintain proof of parental consent and to identify minor within the Program.'
           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: Sign Below
+    broadcasts:
+      show:
+        alert: That broadcast is no longer available
     location_releases:
       create: 
         notice: Your release has been signed. Thank you!
@@ -844,6 +957,20 @@ en:
         notice: Your release has been signed. Thank you!
       new:
         cancel: Cancel
+        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!
         instructions_html: >
           Below is the medical release form. After scrolling down and reading the medical release form, please enter your personal information, take a photo, and press the "Submit Release" button.
         legal:
@@ -852,16 +979,58 @@ en:
           heading: Personal Information
           instructions: Now, enter your personal information.
         photo:
+          camera_instructions_html: Click <em>Take Photo</em> to Turn ON Camera
           heading: Photos
+          no_photo: No photo yet
+          take_photo: Take Photo
+          warning: If your photo appears sideways, it will be autocorrected when you submit your release.
         questionnaire:
           heading: Questionnaire
         signature:
           heading: Signature
+    misc_releases:
+      create:
+        notice: Your release has been signed. Thank you!
+      new:
+        cancel: Cancel
+        guardian_clause:
+          heading: Guardian Clause
+        guardian_info:
+          heading: Guardian Information
+        guardian_photo:
+          camera_instructions_html: Click <em>Take Photo</em> to Turn ON Camera
+          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!
+          no_photo: No photo yet
+          take_photo: Take Photo
+          warning: If your photo appears sideways, it will be autocorrected when you submit your release.
+        instructions_html: >
+          Below is the misc release form. After scrolling down and reading the misc release form, please enter your personal information, take a photo, and press the "Submit Release" button.
+        legal:
+          heading: Legal
+        personal_info:
+          heading: Personal Information
+          instructions: Now, enter your personal information.
+        photo:
+          heading: Photos
+        signature:
+          heading: Signature
     talent_releases:
       create: 
         notice: Your release has been signed. Thank you!
       new:
         cancel: Cancel
+        guardian_2_info:
+          heading: Second Guardian Information (if company requires)
+        guardian_2_photo:
+          camera_instructions_html: Click <em>Take Photo</em> to Turn ON Camera
+          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!
+          no_photo: No photo yet
+          take_photo: Take Photo
+          warning: If your photo appears sideways, it will be autocorrected when you submit your release.
         guardian_clause:
           heading: Guardian Clause
         guardian_info:
@@ -944,6 +1113,7 @@ 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:
@@ -961,7 +1131,13 @@ en:
     form:
       contract_and_rights:
         heading: 2 of 3 Contract & Exploitable Rights
+      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
         heading: 3 of 3 Photos

config/locales/es.yml

@@ -25,9 +25,16 @@ es:
   appearance_releases:
     create:
       failed_import: Failed to create appearance release for files listed below (ES)
+      matching_started: Matching started (ES)
       no_attachments: Failed to import - no attachments (ES)
     form:
+      guardian_2_info:
+        heading: Second Guardian Information (if company requires) (ES)
+      guardian_info:
+        heading: Guardian Information (ES)
       photos:
+        guardian_2_photo:
+          heading: Second Guardian Photo (ES)
         guardian_photo:
           heading: Guardian Photo (ES)
         person_photo:
@@ -37,6 +44,8 @@ es:
     shared:
       imported_appearance_release_contract_name: Contrato Importado
       imported_appearance_release_headshot_name: Retrato Importado
+      incomplete_match: Incomplete Match (ES)
+      matched_import: Complete Match (ES)
     type_filter_actions:
       all_releases: All Releases (ES)
       complete_releases: Complete Releases (ES)
@@ -52,8 +61,18 @@ es:
     blank_contracts:
       create:
         number_of_copies_invalid_notice: Please enter valid number greater than 0 (ES)
+    form:
+      custom_fields:
+        heading: Medical Questionnaire (ES)
+      exploitable_rights:
+        heading: Exploitable Rights (ES)
+      legal:
+        heading: Legal (ES)
+      release_info:
+        heading: Release Info (ES)
   contracts:
     photos:
+      guardian_2_photo_heading: Second guardian photo (ES)
       guardian_photo_heading: Guardian photo (ES)
       heading:
         one: Photo (ES)
@@ -101,16 +120,73 @@ es:
   errors_helper:
     failure_message: "Los siguientes errores han impedido que se presente este %{model_name}:"
   helpers:
+    help:
+      contract_template:
+        fee: Leave at $0.00 for no-fee (ES)
+        guardian_clause: Leave blank if not required for this contract (ES)
     label:
       appearance_release:
-        guardian_address: Dirección del tutor legal
+        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
-        person_address: Dirección
+        person_address_city: City (ES)
+        person_address_country: Country (ES)
+        person_address_state: State (ES)
+        person_address_street1: Address (ES)
+        person_address_street2: Address (Line 2) (ES)
         person_email: Dirección de correo electrónico
         person_name: Nómbre
         person_phone: Número de teléfono
+      medical_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_last_name: ""
+        guardian_2_phone: ""
+        guardian_address_city: Guardian City (ES)
+        guardian_address_country: Guardian country (ES)
+        guardian_address_state: Guardian State (ES)
+        guardian_address_street1: Guardian address (ES)
+        guardian_address_street2: Guardian address (line 2) (ES)
+        guardian_address_zip: Guardian ZIP (ES)
+        guardian_email: Guardian email (ES)
+        guardian_first_name: Guardian First name (ES)
+        guardian_last_name: Guardian Last name (ES)
+        guardian_phone: Guardian Phone (ES)
+        minor: El firmante es un menor
+        person_address_city: Person City (ES)
+        person_address_country: Country (ES)
+        person_address_state: Person State (ES)
+        person_address_street1: Person Address (ES)
+        person_address_street2: Person Address (line 2) (ES)
+        person_address_zip: Person ZIP (ES)
+        person_date_of_birth: Date of birth (ES)
+        person_email: Email address (ES)
+        person_first_name: First name (ES)
+        person_last_name: Last name (ES)
+        person_name: Name (ES)
+        person_phone: Phone number (ES)
       project:
         client_name: Nómbre del cliente del proyecto
         description: Descripción del proyecto
@@ -118,6 +194,36 @@ es:
         name: Nómbre del proyecto de vídeo
         producer_address: Dirección del productor
         producer_name: Nómbre del productor
+      talen_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: City (ES)
+        guardian_address_country: Guardian country (ES)
+        guardian_address_state: State (ES)
+        guardian_address_street1: Guardian address (ES)
+        guardian_address_street2: Guardian address (Line 2) (ES)
+        guardian_address_zip: Zip code (ES)
+        guardian_email: Guardian email address (ES)
+        guardian_name: Guardian name (ES)
+        guardian_phone: Guardian phone number (ES)
+        minor: Is the person a minor? (ES)
+        person_address_city: City (ES)
+        person_address_country: Country (ES)
+        person_address_state: State (ES)
+        person_address_street1: Address (ES)
+        person_address_street2: Address (Line 2) (ES)
+        person_address_zip: Zip code (ES)
+        person_email: Email address (ES)
+        person_name: Name (ES)
+        person_phone: Phone number (ES)
     placeholder:
       appearance_release:
         person_address: Calle, Número de apartamento, Ciudad, Estado, Código Postal
@@ -146,6 +252,12 @@ es:
         notice: La autorización está firmada. ¡Gracias!
       new:
         cancel: Cancelar
+        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_photo:
@@ -176,10 +288,42 @@ es:
       new:
         photo:
           heading: Photos (ES)
-    talent_releases:
+    medical_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: Gurdian 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:
+          camera_instructions_html: Haga clic en <em>Take Photo</em> para encender la cámara
+          no_photo: No hay foto todavía
+          take_photo: Take Photo (ES)
+          warning: Si su foto aparece de lado, se corregirá automáticamente cuando actualizar la autorización
+    talent_releases:
+      new:
+        guardian_2_info:
+          heading: Second Guardian Information (if company requires) (ES)
+        guardian_2_photo:
+          camera_instructions_html: ""
+          heading: Second Guardian Photo (ES)
+          instructions: ""
+          no_photo: ""
+          take_photo: ""
+          warning: ""
+        guardian_clause:
+          heading: Guardian Clause (ES)
+        guardian_info:
+          heading: ""
         guardian_photo:
           camera_instructions_html: (ES) Click <em>Take Photo</em> to Turn ON Camera (ES)
           heading: Guardian Photo (ES)
@@ -187,6 +331,8 @@ es:
           no_photo: No hay foto todavía
           take_photo: Take Photo (ES)
           warning: (ES) If your photo appears sideways, it will be autocorrected when you submit your release. (ES)
+        photo:
+          heading: Photos (ES)
     teams:
       show:
         choose_project: ¿Qué proyecto de la lista de abajo asistirá?
@@ -195,6 +341,12 @@ es:
     print: Print (ES)
   talent_releases:
     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 (ES)
         guardian_photo:
           heading: Guardian Photo (ES)

config/routes.rb

@@ -54,6 +54,7 @@ Rails.application.routes.draw do
       resources :music_releases, except: [:show], concerns: [:contractable, :notable]
       resources :talent_releases, except: [:show], concerns: [:contractable, :notable, :photoable]
       resources :medical_releases, except: [:show], concerns: [:contractable, :notable, :photoable]
+      resources :misc_releases, except: [:show], concerns: [:contractable, :notable, :photoable]
       resources :contract_templates, only: [:index, :new, :create, :destroy] do
         resource :qr_codes, only: [:show], controller: "contract_templates/qr_codes"
         resource :blank_contracts, only: [:show, :new, :create], controller: "contract_templates/blank_contracts"
@@ -119,6 +120,7 @@ Rails.application.routes.draw do
             resources :location_releases, only: [:new, :create]
             resources :material_releases, only: [:new, :create]
             resources :medical_releases, only: [:new, :create]
+            resources :misc_releases, only: [:new, :create]
           end
         end
       end
@@ -128,7 +130,7 @@ Rails.application.routes.draw do
     end
 
     RELEASES = [:acquired_media_releases, :appearance_releases, :talent_releases, :material_releases, :location_releases]
-    ALL_RELEASES = RELEASES + [:music_releases, :medical_releases]
+    ALL_RELEASES = RELEASES + [:music_releases, :medical_releases, :misc_releases]
 
     ALL_RELEASES.each do |release|
       resources release, only: [], concerns: :taggable
@@ -163,6 +165,7 @@ Rails.application.routes.draw do
         resources :appearance_releases, only: [:show] do
           resources :notes, controller: "notes", only: [:create, :index]
         end
+        resources :direct_uploads, only: [:create]
       end
     end
 

db/data_migrations/20200623111803_change_existing_zoom_user_settings.rb

@@ -0,0 +1,9 @@
+class ChangeExistingZoomUserSettings < ActiveRecord::DataMigration
+  def up
+    gateway = ZoomGateway.new
+
+    ZoomUser.find_each do |zu|
+      gateway.update_user_settings zu.api_id
+    end
+  end
+end

db/migrate/20200430151828_create_matching_requests.rb

@@ -0,0 +1,9 @@
+class CreateMatchingRequests < ActiveRecord::Migration[6.0]
+  def change
+    create_table :matching_requests do |t|
+      t.belongs_to :project, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20200430190412_add_identifier_to_appearance_releases.rb

@@ -0,0 +1,5 @@
+class AddIdentifierToAppearanceReleases < ActiveRecord::Migration[6.0]
+  def change
+    add_column :appearance_releases, :identifier, :string, default: nil
+  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/migrate/20200615131722_remove_broadcast_id_from_zoom_meetings.rb

@@ -0,0 +1,5 @@
+class RemoveBroadcastIdFromZoomMeetings < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :zoom_meetings, :broadcast_id
+  end
+end

db/migrate/20200615133602_destructure_person_address_column_in_appearance_releases.rb

@@ -0,0 +1,10 @@
+class DestructurePersonAddressColumnInAppearanceReleases < ActiveRecord::Migration[6.0]
+  def change
+    rename_column :appearance_releases, :person_address, :person_address_street1
+    add_column :appearance_releases, :person_address_street2, :string
+    add_column :appearance_releases, :person_address_city, :string
+    add_column :appearance_releases, :person_address_state, :string
+    add_column :appearance_releases, :person_address_zip, :string
+    add_column :appearance_releases, :person_address_country, :string
+  end
+end

db/migrate/20200616124214_destructure_guardian_address_column_in_appearance_releases.rb

@@ -0,0 +1,10 @@
+class DestructureGuardianAddressColumnInAppearanceReleases < ActiveRecord::Migration[6.0]
+  def change
+    rename_column :appearance_releases, :guardian_address, :guardian_address_street1
+    add_column :appearance_releases, :guardian_address_street2, :string
+    add_column :appearance_releases, :guardian_address_city, :string
+    add_column :appearance_releases, :guardian_address_state, :string
+    add_column :appearance_releases, :guardian_address_zip, :string
+    add_column :appearance_releases, :guardian_address_country, :string
+  end
+end

db/migrate/20200619081446_add_more_questions_and_answers_to_medical_releases.rb

@@ -0,0 +1,15 @@
+class AddMoreQuestionsAndAnswersToMedicalReleases < ActiveRecord::Migration[6.0]
+  def change
+    add_column :contract_templates, :question_11_text, :text
+    add_column :contract_templates, :question_12_text, :text
+    add_column :contract_templates, :question_13_text, :text
+    add_column :contract_templates, :question_14_text, :text
+    add_column :contract_templates, :question_15_text, :text
+
+    add_column :medical_releases, :question_11_answer, :text
+    add_column :medical_releases, :question_12_answer, :text
+    add_column :medical_releases, :question_13_answer, :text
+    add_column :medical_releases, :question_14_answer, :text
+    add_column :medical_releases, :question_15_answer, :text
+  end
+end

db/migrate/20200619085823_create_misc_releases.rb

@@ -0,0 +1,34 @@
+class CreateMiscReleases < ActiveRecord::Migration[6.0]
+  def change
+    create_table :misc_releases do |t|
+      t.belongs_to :project, foreign_key: true
+      t.belongs_to :contract_template, foreign_key: true
+      t.string :person_first_name
+      t.string :person_last_name
+      t.string :person_address_street1
+      t.string :person_address_street2
+      t.string :person_address_city
+      t.string :person_address_state
+      t.string :person_address_zip
+      t.string :person_address_country
+      t.string :person_phone
+      t.string :person_email
+      t.string :guardian_first_name
+      t.string :guardian_last_name
+      t.string :guardian_address_street1
+      t.string :guardian_address_street2
+      t.string :guardian_address_city
+      t.string :guardian_address_state
+      t.string :guardian_address_zip
+      t.string :guardian_address_country
+      t.string :guardian_phone
+      t.string :guardian_email
+      t.string :locale
+      t.text :notes
+      t.datetime :signed_at
+      t.boolean :minor, default: false
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20200619134853_add_second_guardian_fields_to_appearance_releases.rb

@@ -0,0 +1,14 @@
+class AddSecondGuardianFieldsToAppearanceReleases < ActiveRecord::Migration[6.0]
+  def change
+    add_column :appearance_releases, :guardian_2_first_name, :string
+    add_column :appearance_releases, :guardian_2_last_name, :string
+    add_column :appearance_releases, :guardian_2_email, :string
+    add_column :appearance_releases, :guardian_2_phone, :string
+    add_column :appearance_releases, :guardian_2_address_street1, :string
+    add_column :appearance_releases, :guardian_2_address_street2, :string
+    add_column :appearance_releases, :guardian_2_address_city, :string
+    add_column :appearance_releases, :guardian_2_address_state, :string
+    add_column :appearance_releases, :guardian_2_address_zip, :string
+    add_column :appearance_releases, :guardian_2_address_country, :string
+  end
+end

db/migrate/20200622180507_add_guardians_fields_to_medical_releases.rb

@@ -0,0 +1,25 @@
+class AddGuardiansFieldsToMedicalReleases < ActiveRecord::Migration[6.0]
+  def change
+    add_column :medical_releases, :minor, :boolean, default: false
+    add_column :medical_releases, :guardian_first_name, :string
+    add_column :medical_releases, :guardian_last_name, :string
+    add_column :medical_releases, :guardian_email, :string
+    add_column :medical_releases, :guardian_phone, :string
+    add_column :medical_releases, :guardian_address_street1, :string
+    add_column :medical_releases, :guardian_address_street2, :string
+    add_column :medical_releases, :guardian_address_city, :string
+    add_column :medical_releases, :guardian_address_state, :string
+    add_column :medical_releases, :guardian_address_zip, :string
+    add_column :medical_releases, :guardian_address_country, :string
+    add_column :medical_releases, :guardian_2_first_name, :string
+    add_column :medical_releases, :guardian_2_last_name, :string
+    add_column :medical_releases, :guardian_2_email, :string
+    add_column :medical_releases, :guardian_2_phone, :string
+    add_column :medical_releases, :guardian_2_address_street1, :string
+    add_column :medical_releases, :guardian_2_address_street2, :string
+    add_column :medical_releases, :guardian_2_address_city, :string
+    add_column :medical_releases, :guardian_2_address_state, :string
+    add_column :medical_releases, :guardian_2_address_zip, :string
+    add_column :medical_releases, :guardian_2_address_country, :string
+  end
+end

db/migrate/20200625144713_add_second_guardian_fields_to_talent_releases.rb

@@ -0,0 +1,14 @@
+class AddSecondGuardianFieldsToTalentReleases < ActiveRecord::Migration[6.0]
+  def change
+    add_column :talent_releases, :guardian_2_first_name, :string
+    add_column :talent_releases, :guardian_2_last_name, :string
+    add_column :talent_releases, :guardian_2_email, :string
+    add_column :talent_releases, :guardian_2_phone, :string
+    add_column :talent_releases, :guardian_2_address_street1, :string
+    add_column :talent_releases, :guardian_2_address_street2, :string
+    add_column :talent_releases, :guardian_2_address_city, :string
+    add_column :talent_releases, :guardian_2_address_state, :string
+    add_column :talent_releases, :guardian_2_address_zip, :string
+    add_column :talent_releases, :guardian_2_address_country, :string
+  end
+end

db/structure.sql

@@ -9,20 +9,6 @@ SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
---
--- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
---
-
-CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
-
-
---
--- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
---
-
-COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
-
-
 --
 -- Name: fuzzystrmatch; Type: EXTENSION; Schema: -; Owner: -
 --
@@ -304,13 +290,13 @@ ALTER SEQUENCE public.active_storage_blobs_id_seq OWNED BY public.active_storage
 CREATE TABLE public.appearance_releases (
     id bigint NOT NULL,
     person_name_old character varying,
-    person_address character varying,
+    person_address_street1 character varying,
     person_phone character varying,
     project_id bigint,
     created_at timestamp without time zone NOT NULL,
     updated_at timestamp without time zone NOT NULL,
     minor boolean DEFAULT false,
-    guardian_address character varying,
+    guardian_address_street1 character varying,
     guardian_name_old character varying,
     guardian_phone character varying,
     person_email character varying,
@@ -330,7 +316,29 @@ CREATE TABLE public.appearance_releases (
     person_first_name character varying,
     person_last_name character varying,
     guardian_first_name character varying,
-    guardian_last_name character varying
+    guardian_last_name character varying,
+    identifier character varying,
+    guardian_email character varying,
+    person_address_street2 character varying,
+    person_address_city character varying,
+    person_address_state character varying,
+    person_address_zip character varying,
+    person_address_country 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
 );
 
 
@@ -616,7 +624,12 @@ CREATE TABLE public.contract_templates (
     question_7_text text,
     question_8_text text,
     question_9_text text,
-    question_10_text text
+    question_10_text text,
+    question_11_text text,
+    question_12_text text,
+    question_13_text text,
+    question_14_text text,
+    question_15_text text
 );
 
 
@@ -885,6 +898,37 @@ CREATE SEQUENCE public.location_releases_id_seq
 ALTER SEQUENCE public.location_releases_id_seq OWNED BY public.location_releases.id;
 
 
+--
+-- Name: matching_requests; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.matching_requests (
+    id bigint NOT NULL,
+    project_id bigint,
+    created_at timestamp(6) without time zone NOT NULL,
+    updated_at timestamp(6) without time zone NOT NULL
+);
+
+
+--
+-- Name: matching_requests_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.matching_requests_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: matching_requests_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.matching_requests_id_seq OWNED BY public.matching_requests.id;
+
+
 --
 -- Name: material_releases; Type: TABLE; Schema: public; Owner: -
 --
@@ -975,7 +1019,33 @@ CREATE TABLE public.medical_releases (
     question_7_answer text,
     question_8_answer text,
     question_9_answer text,
-    question_10_answer text
+    question_10_answer text,
+    question_11_answer text,
+    question_12_answer text,
+    question_13_answer text,
+    question_14_answer text,
+    question_15_answer text,
+    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
 );
 
 
@@ -998,6 +1068,62 @@ CREATE SEQUENCE public.medical_releases_id_seq
 ALTER SEQUENCE public.medical_releases_id_seq OWNED BY public.medical_releases.id;
 
 
+--
+-- Name: misc_releases; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.misc_releases (
+    id bigint NOT NULL,
+    project_id bigint,
+    contract_template_id bigint,
+    person_first_name character varying,
+    person_last_name character varying,
+    person_address_street1 character varying,
+    person_address_street2 character varying,
+    person_address_city character varying,
+    person_address_state character varying,
+    person_address_zip character varying,
+    person_address_country character varying,
+    person_phone character varying,
+    person_email character varying,
+    guardian_first_name character varying,
+    guardian_last_name 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_phone character varying,
+    guardian_email character varying,
+    locale character varying,
+    notes text,
+    signed_at timestamp without time zone,
+    minor boolean DEFAULT false,
+    created_at timestamp(6) without time zone NOT NULL,
+    updated_at timestamp(6) without time zone NOT NULL
+);
+
+
+--
+-- Name: misc_releases_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.misc_releases_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: misc_releases_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.misc_releases_id_seq OWNED BY public.misc_releases.id;
+
+
 --
 -- Name: music_releases; Type: TABLE; Schema: public; Owner: -
 --
@@ -1377,7 +1503,17 @@ CREATE TABLE public.talent_releases (
     person_first_name character varying,
     person_last_name character varying,
     guardian_first_name character varying,
-    guardian_last_name character varying
+    guardian_last_name 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
 );
 
 
@@ -1632,7 +1768,6 @@ CREATE TABLE public.zoom_meetings (
     api_meeting_id character varying,
     created_at timestamp(6) without time zone NOT NULL,
     updated_at timestamp(6) without time zone NOT NULL,
-    broadcast_id bigint,
     zoom_user_id bigint,
     project_id bigint,
     status integer DEFAULT 0
@@ -1831,6 +1966,13 @@ ALTER TABLE ONLY public.imports ALTER COLUMN id SET DEFAULT nextval('public.impo
 ALTER TABLE ONLY public.location_releases ALTER COLUMN id SET DEFAULT nextval('public.location_releases_id_seq'::regclass);
 
 
+--
+-- Name: matching_requests id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.matching_requests ALTER COLUMN id SET DEFAULT nextval('public.matching_requests_id_seq'::regclass);
+
+
 --
 -- Name: material_releases id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -1845,6 +1987,13 @@ ALTER TABLE ONLY public.material_releases ALTER COLUMN id SET DEFAULT nextval('p
 ALTER TABLE ONLY public.medical_releases ALTER COLUMN id SET DEFAULT nextval('public.medical_releases_id_seq'::regclass);
 
 
+--
+-- Name: misc_releases id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.misc_releases ALTER COLUMN id SET DEFAULT nextval('public.misc_releases_id_seq'::regclass);
+
+
 --
 -- Name: music_releases id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -2139,6 +2288,14 @@ ALTER TABLE ONLY public.location_releases
     ADD CONSTRAINT location_releases_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: matching_requests matching_requests_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.matching_requests
+    ADD CONSTRAINT matching_requests_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: material_releases material_releases_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -2155,6 +2312,14 @@ ALTER TABLE ONLY public.medical_releases
     ADD CONSTRAINT medical_releases_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: misc_releases misc_releases_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.misc_releases
+    ADD CONSTRAINT misc_releases_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: music_releases music_releases_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -2608,6 +2773,13 @@ CREATE INDEX index_location_releases_on_term_id ON public.location_releases USIN
 CREATE INDEX index_location_releases_on_territory_id ON public.location_releases USING btree (territory_id);
 
 
+--
+-- Name: index_matching_requests_on_project_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_matching_requests_on_project_id ON public.matching_requests USING btree (project_id);
+
+
 --
 -- Name: index_material_releases_on_applicable_medium_id; Type: INDEX; Schema: public; Owner: -
 --
@@ -2664,6 +2836,20 @@ CREATE INDEX index_medical_releases_on_contract_template_id ON public.medical_re
 CREATE INDEX index_medical_releases_on_project_id ON public.medical_releases USING btree (project_id);
 
 
+--
+-- Name: index_misc_releases_on_contract_template_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_misc_releases_on_contract_template_id ON public.misc_releases USING btree (contract_template_id);
+
+
+--
+-- Name: index_misc_releases_on_project_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_misc_releases_on_project_id ON public.misc_releases USING btree (project_id);
+
+
 --
 -- Name: index_music_releases_on_applicable_medium_id; Type: INDEX; Schema: public; Owner: -
 --
@@ -2937,13 +3123,6 @@ CREATE INDEX index_videos_on_audio_analysis_uid ON public.videos USING btree (au
 CREATE INDEX index_videos_on_project_id ON public.videos USING btree (project_id);
 
 
---
--- Name: index_zoom_meetings_on_broadcast_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_zoom_meetings_on_broadcast_id ON public.zoom_meetings USING btree (broadcast_id);
-
-
 --
 -- Name: index_zoom_meetings_on_project_id; Type: INDEX; Schema: public; Owner: -
 --
@@ -2972,6 +3151,14 @@ CREATE UNIQUE INDEX taggings_idx ON public.taggings USING btree (tag_id, taggabl
 CREATE INDEX taggings_idy ON public.taggings USING btree (taggable_id, taggable_type, tagger_id, context);
 
 
+--
+-- Name: misc_releases fk_rails_0222652fcd; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.misc_releases
+    ADD CONSTRAINT fk_rails_0222652fcd FOREIGN KEY (project_id) REFERENCES public.projects(id);
+
+
 --
 -- Name: unreleased_appearances fk_rails_0393a349dd; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -3252,6 +3439,14 @@ ALTER TABLE ONLY public.material_releases
     ADD CONSTRAINT fk_rails_6b945b36b9 FOREIGN KEY (contract_template_id) REFERENCES public.contract_templates(id);
 
 
+--
+-- Name: matching_requests fk_rails_71d16e64c8; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.matching_requests
+    ADD CONSTRAINT fk_rails_71d16e64c8 FOREIGN KEY (project_id) REFERENCES public.projects(id);
+
+
 --
 -- Name: appearance_releases fk_rails_7a58302526; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -3284,14 +3479,6 @@ ALTER TABLE ONLY public.music_releases
     ADD CONSTRAINT fk_rails_890d967673 FOREIGN KEY (territory_id) REFERENCES public.territories(id);
 
 
---
--- Name: zoom_meetings fk_rails_8d814ea729; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.zoom_meetings
-    ADD CONSTRAINT fk_rails_8d814ea729 FOREIGN KEY (broadcast_id) REFERENCES public.broadcasts(id);
-
-
 --
 -- Name: medical_releases fk_rails_98aa92daa9; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -3380,6 +3567,14 @@ ALTER TABLE ONLY public.active_storage_attachments
     ADD CONSTRAINT fk_rails_c3b3935057 FOREIGN KEY (blob_id) REFERENCES public.active_storage_blobs(id);
 
 
+--
+-- Name: misc_releases fk_rails_c664291b9b; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.misc_releases
+    ADD CONSTRAINT fk_rails_c664291b9b FOREIGN KEY (contract_template_id) REFERENCES public.contract_templates(id);
+
+
 --
 -- Name: location_releases fk_rails_c7458d662e; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -3611,12 +3806,23 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20200424161117'),
 ('20200427073429'),
 ('20200428091105'),
+('20200430151828'),
+('20200430190412'),
 ('20200507110804'),
 ('20200512161738'),
 ('20200526113516'),
 ('20200603090419'),
 ('20200606044747'),
 ('20200610085411'),
-('20200610140459');
+('20200610140459'),
+('20200612121539'),
+('20200615131722'),
+('20200615133602'),
+('20200616124214'),
+('20200619081446'),
+('20200619085823'),
+('20200619134853'),
+('20200622180507'),
+('20200625144713');
 
 

lib/brayniac_ai.rb

@@ -10,5 +10,6 @@ require_relative "./brayniac_ai/edl_parse"
 require_relative "./brayniac_ai/edl_parse_result"
 require_relative "./brayniac_ai/facial_recognition"
 require_relative "./brayniac_ai/facial_recognition_result"
+require_relative "./brayniac_ai/qr_matching"
 require_relative "./brayniac_ai/tag"
 require_relative "./brayniac_ai/validation"

lib/brayniac_ai/qr_matching.rb

@@ -0,0 +1,4 @@
+module BrayniacAI
+  class QrMatching < Base
+  end
+end

lib/tasks/dev.rake

@@ -33,6 +33,8 @@ if Rails.env.development? || Rails.env.test? || Rails.env.review?
         material_release: true,
         music_release: true,
         talent_release: true,
+        medical_release: true,
+        misc_release: true,
         video_analysis: true,
       })
 

lib/zoom_gateway.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require './lib/zoom_wrapper_monkeypatch'
+
 class ZoomGateway
   class AuthenticationError < StandardError; end
   class MeetingExpired < StandardError; end
@@ -65,6 +69,23 @@ class ZoomGateway
     parse_zoom_error(e)
   end
 
+  # Update user with custom settings
+  def update_user_settings(user_id)
+    custom_defaults = {
+      id: user_id,
+      in_meeting: {
+        auto_saving_chat: true,
+        co_host: true,
+        non_verbal_feedback: true,
+        breakout_room: true,
+        group_hd: true,
+        far_end_camera_control: true,
+        allow_live_streaming: true
+      }
+    }
+    @client.user_settings_update custom_defaults
+  end
+
   def create_host(host_email)
     # Find role
     host_role = @client.roles_list["roles"].try(:select) { |r| r["name"] == self.class.HOST_ROLE }.try(:first)
@@ -82,6 +103,8 @@ class ZoomGateway
       type: self.class.USER_TYPE
     })
 
+    update_user_settings(host_user["id"])
+
     # Assign role to user
     @client.roles_assign role_id: host_role["id"], members: [{id: host_user["id"]}]
 

lib/zoom_wrapper_monkeypatch.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Zoom
+  module Actions
+    module User
+      def user_settings_update(*args)
+        params = Zoom::Params.new(Utils.extract_options!(args))
+        permitted_in_meeting_params = %i[
+          auto_saving_chat
+          co_host
+          non_verbal_feedback
+          breakout_room
+          group_hd
+          far_end_camera_control
+          allow_live_streaming
+        ]
+        permitted_params = { in_meeting: permitted_in_meeting_params }
+        params.require(:id).permit permitted_params
+        request_body = params.except(:id).to_json
+        resp = self.class.patch("/users/#{params[:id]}/settings", body: request_body, headers: request_headers)
+        Utils.parse_response resp
+      end
+    end
+  end
+end

spec/controllers/api/broadcasts_controller_spec.rb

@@ -128,6 +128,26 @@ RSpec.describe Api::BroadcastsController, type: :controller do
       expect(included.first.dig("id")).to eq broadcast.files.first.id.to_s
       expect(included.first.dig("type")).to eq 'active_storage_attachment'
     end
+
+    context "when files param contains a signed_id string" do
+      it "adds that file to the broadcast" do
+        project = create(:project, name: 'first', account_id: current_user.primary_account.id)
+        broadcast = create(:broadcast, :with_stream, skip_create_callback: true, project: project, status: 'created')
+        blob = ActiveStorage::Blob.create_after_upload!(io: StringIO.new("Hello"), filename: "hello.txt", content_type: "text/plain")
+
+        sign_in_to_api(current_user)
+        patch :update, params: { project_id: project, id: broadcast, broadcast: { files: [blob.signed_id] } }
+
+        relationships = JSON.parse(response.body).dig('data', 'relationships')
+        included = JSON.parse(response.body).dig('included')
+
+        expect(relationships.keys).to include('files')
+        expect(included.size).to eq 1
+        expect(included.first.dig("id")).to eq broadcast.files.first.id.to_s
+        expect(included.first.dig("type")).to eq 'active_storage_attachment'
+        expect(included.first.dig("attributes", "filename")).to eq 'hello.txt'
+      end
+    end
   end
 
   after do

spec/controllers/api/direct_uploads_controller_spec.rb

@@ -0,0 +1,36 @@
+require 'rails_helper'
+
+RSpec.describe Api::DirectUploadsController, type: :controller do
+  let(:current_user) { create(:user) }
+  let(:project) { create(:project, account: current_user.primary_account) }
+
+  before do
+    sign_in_to_api(current_user)
+  end
+
+  describe '#create' do
+    it 'returns data for a direct upload' do
+      post :create, params: { direct_upload: direct_upload_params }
+
+      expect(response).to be_successful
+      expect(response_body_data_attributes).to include('id', 'key', 'signed_id', 'url', 'headers')
+    end
+  end
+
+  private
+
+  def direct_upload_params
+    file = file_fixture("video_file.mp4")
+    checksum = Digest::MD5.base64digest(StringIO.new(file.read).to_s)
+
+    { filename: file.basename.to_s, content_type: "video/mp4", byte_size: file.size, checksum: checksum }
+  end
+
+  def response_body_data
+    JSON.parse(response.body).dig('data')
+  end
+
+  def response_body_data_attributes
+    response_body_data.dig('attributes')
+  end
+end

spec/controllers/appearance_releases_controller_spec.rb

@@ -263,7 +263,12 @@ 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_address_street2).except(:guardian_address_city)
+      .except(:guardian_address_state).except(:guardian_address_zip)
+      .except(:guardian_address_country)
+      .merge(contract_param, exploitable_rights_params)
   end
 
   def exploitable_rights_params

spec/controllers/contracts_controller_spec.rb

@@ -63,4 +63,55 @@ RSpec.describe ContractsController, type: :controller do
 
     it_behaves_like "a contracts controller"
   end
+
+  context "for medical releases" do
+    let(:native_releasable) { create(:medical_release_with_contract_template, :native) }
+    let(:non_native_releasable) { create(:medical_release_with_contract_template, :non_native) }
+
+    describe "#show when user is account manager" do
+      it_behaves_like "a contracts controller"
+    end
+
+    shared_examples "a medical contracts controller for non-authorized users" do
+      describe "#show" do
+        context "for a native release" do
+          it "responds with not authorized error" do
+            pdf_body = Tempfile.new
+            allow_any_instance_of(Contract).to receive(:to_pdf).and_return(pdf_body)
+
+            expect {
+              get :show, params: { format: :pdf, "#{native_releasable.model_name.singular}_id" => native_releasable }
+            }.to raise_exception(Pundit::NotAuthorizedError)
+          end
+        end
+
+        context "for a non-native release" do
+          it "responds with the attached contract" do
+            contract = double(:contract, service_url: "http://example.org/contract.pdf")
+            allow_any_instance_of(non_native_releasable.class).to receive(:contract).and_return(contract)
+
+            expect {
+              get :show, params: { format: :pdf, "#{non_native_releasable.model_name.singular}_id" => non_native_releasable }
+            }.to raise_exception(Pundit::NotAuthorizedError)
+          end
+        end
+      end
+    end
+
+    describe "#show when user is project manager" do
+      let(:manager_user) { create(:user, :manager) }
+      before do
+        sign_in manager_user
+      end
+      it_behaves_like "a medical contracts controller for non-authorized users"
+    end
+
+    describe "#show when user is associate" do
+      let(:associate_user) { create(:user, :associate) }
+      before do
+        sign_in associate_user
+      end
+      it_behaves_like "a medical contracts controller for non-authorized users"
+    end
+  end
 end

spec/controllers/misc_releases_controller_spec.rb

@@ -0,0 +1,116 @@
+require "rails_helper"
+
+RSpec.describe MiscReleasesController, type: :controller do
+  render_views
+
+  let(:user) { create(:user) }
+  let(:account) { user.primary_account } 
+  let(:project) { create(:project, account: user.primary_account) }
+
+  before do
+    sign_in user
+  end
+
+  describe "#index" do
+    it "responds successfully" do
+      get :index, params: { project_id: project }
+
+      expect(response).to be_successful
+    end
+
+    it "renders content" do
+      release = create(:misc_release, project: project,
+                                        person_first_name: "My",
+                                        person_last_name: "Release", 
+                                        person_phone: "5551234567", 
+                                        person_email: "jane.doe@test.com")
+      create(:note, notable: release, content: "Some notes here")
+
+      get :index, params: { project_id: project }
+
+      expect(response.body).to have_content "My Release"
+      expect(response.body).to have_content "P: 5551234567"
+      expect(response.body).to have_content "jane.doe@test.com"
+      expect(response.body).to have_content "Some notes here"
+      expect(response.body).to have_content "Manage"
+    end
+
+    context "when there are no misc releases" do
+      it "renders an empty message" do
+        get :index, params: { project_id: project }
+
+        expect(response.body).to have_content("Misc Releases will appear here")
+      end
+    end
+
+    context "when there are many records" do
+      it "paginates the table" do
+        create_list(:misc_release, 20, project: project)
+
+        get :index, params: { project_id: project }
+
+        expect(response.body).to have_link("2", href: project_misc_releases_path(project, page: 2))
+      end
+    end
+
+    context "for xhr request" do
+      it "filters the releases by a query param" do
+        misc_releases = [
+          create(:misc_release, person_name: "Adam Sandler", project: project),
+          create(:misc_release, person_name: "Zoe Perry", project: project),
+        ]
+
+        get :index, params: { project_id: project, query: "Zoe" }, xhr: true
+
+        expect(response.body).not_to have_content("Adam Sandler")
+        expect(response.body).to have_content("Zoe Perry")
+      end
+    end
+  end
+
+  describe "#destroy" do
+    let!(:misc_release) { create(:misc_release, project: project) }
+
+    it "responds with redirect" do
+      delete :destroy, params: { project_id: project, id: misc_release }
+
+      expect(response).to be_redirect
+      expect(response).to redirect_to [project, :misc_releases]
+    end
+
+    it "sets the flash" do
+      delete :destroy, params: { project_id: project, id: misc_release }
+
+      expect(flash.alert).not_to be_nil
+    end
+
+    it "destroys the record" do
+      expect {
+        delete :destroy, params: { project_id: project, id: misc_release }
+      }.to change(MiscRelease, :count).by(-1)
+    end
+  end
+
+  private
+
+  def misc_release_params
+    attributes_for(:misc_release).merge(exploitable_rights_params)
+  end
+
+  def minor_misc_release_params
+    attributes_for(:misc_release, :minor_with_guardian_photo).merge(exploitable_rights_params)
+  end
+
+  def exploitable_rights_params
+    {
+      applicable_medium_id: ApplicableMedium.last.id,
+      applicable_medium_text: "applicable_media",
+      territory_id: Territory.last.id,
+      territory_text: "territory",
+      term_id: Term.last.id,
+      term_text: "term",
+      restriction_id: Restriction.last.id,
+      restriction_text: "restrictions",
+    }
+  end
+end

spec/controllers/public/appearance_releases_controller_spec.rb

@@ -31,7 +31,7 @@ describe Public::AppearanceReleasesController do
       contract_template = create(:contract_template, project: project)
       sign_in(user)
 
-      post :create, params: { account_id: user.primary_account.to_param, project_id: project, contract_template_id: contract_template, appearance_release: { person_address: "Albuquerque" } }
+      post :create, params: { account_id: user.primary_account.to_param, project_id: project, contract_template_id: contract_template, appearance_release: { person_email: "email@email.com" } }
       body = CGI.unescape_html(response.body)
       expect(body).to match /Person first name can't be blank/
       expect(body).to match /Person last name can't be blank/
@@ -120,7 +120,19 @@ describe Public::AppearanceReleasesController do
 
   def minor_appearance_release_params(with_guardian_photo = true)
     minor_type = with_guardian_photo ? :minor_with_guardian_photo : :minor
-    attributes_for(:appearance_release, minor_type).merge(signature_param)
+    attributes_for(:appearance_release, minor_type)
+        .merge(signature_param, guardian_address_params)
+  end
+
+  def guardian_address_params
+    {
+      guardian_address_street1: "St1",
+      guardian_address_street2: "St2",
+      guardian_address_city: "City",
+      guardian_address_state: "State",
+      guardian_address_zip: "ZIP",
+      guardian_address_country: "Country"
+    }
   end
 
   def signature_param

spec/factories/appearance_releases.rb

@@ -11,7 +11,12 @@ FactoryBot.define do
     end
 
     trait :native do
-      person_address "100 Test Lane, New York, NY 10001"
+      person_address_street1 "St1"
+      person_address_street2 "St2"
+      person_address_city "City"
+      person_address_state "State"
+      person_address_zip "ZIP"
+      person_address_country "Country"
       person_phone "123-555-6789"
 
       signature do
@@ -31,16 +36,28 @@ FactoryBot.define do
       minor true
       guardian_first_name "Jamie"
       guardian_last_name "Doe"
-      guardian_address "100 Test Lane, New York, 10001"
+      guardian_address_street1 "St1"
+      guardian_address_street2 "St2"
+      guardian_address_city "City"
+      guardian_address_state "State"
+      guardian_address_zip "ZIP"
+      guardian_address_country "Country"
       guardian_phone "123-555-1234"
+      guardian_email "guardian@galaxy.all"
     end
 
     trait :minor_with_guardian_photo do
       minor true
       guardian_first_name "Jamie"
       guardian_last_name "Doe"
-      guardian_address "100 Test Lane, New York, 10001"
       guardian_phone "123-555-1234"
+      guardian_email "guardian@galaxy.all"
+      guardian_address_street1 "St1"
+      guardian_address_street2 "St2"
+      guardian_address_city "City"
+      guardian_address_state "State"
+      guardian_address_zip "ZIP"
+      guardian_address_country "Country"
       guardian_photo do
         path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
         Rack::Test::UploadedFile.new(path, "image/jpeg")
@@ -65,5 +82,24 @@ FactoryBot.define do
         appearance_release.contract_template = build(:appearance_release_contract_template)
       end
     end
+
+    factory :appearance_release_import do
+      person_photo nil
+
+      trait :with_headshot do
+        person_photo do
+          path = Rails.root.join("spec", "fixtures", "files", "person_photo.png")
+          Rack::Test::UploadedFile.new(path, "image/png")
+        end
+      end
+
+      trait :with_contract do
+        contract do
+          path = Rails.root.join("spec", "fixtures", "files", "AppearanceRelease.pdf")
+          Rack::Test::UploadedFile.new(path, "application/pdf")
+        end
+      end
+    end
+
   end
 end

spec/factories/contract_templates.rb

@@ -8,6 +8,10 @@ FactoryBot.define do
     guardian_clause "Is the signer a minor?"
     fee "$0.00"
 
+    trait :archived do
+      archived_at Time.zone.now
+    end
+
     factory :appearance_release_contract_template do
       release_type "appearance" 
     end
@@ -24,6 +28,10 @@ FactoryBot.define do
       release_type "material" 
     end
 
+    factory :misc_release_contract_template do
+      release_type "misc" 
+    end
+
     factory :location_release_contract_template do
       release_type "location" 
     end

spec/factories/misc_releases.rb

@@ -0,0 +1,58 @@
+FactoryBot.define do
+  factory :misc_release do
+    association :project
+
+    person_first_name "Jane"
+    person_last_name "Doe"
+
+    photos [Rack::Test::UploadedFile.new(Rails.root.join("spec", "fixtures", "files", "person_photo.png"), "image/png")]
+
+    trait :native do
+      person_phone "123-555-6789"
+
+      signature do
+        path = Rails.root.join("spec", "fixtures", "files", "signature.png")
+        Rack::Test::UploadedFile.new(path, "image/png")
+      end
+    end
+
+    trait :minor do
+      minor true
+      guardian_first_name "Jamie"
+      guardian_last_name "Doe"
+      guardian_phone "123-555-1234"
+    end
+
+    trait :minor_with_guardian_photo do
+      minor true
+      guardian_first_name "Jamie"
+      guardian_last_name "Doe"
+      guardian_phone "123-555-1234"
+      guardian_photo do
+        path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
+        Rack::Test::UploadedFile.new(path, "image/jpeg")
+      end
+    end
+
+    factory :misc_release_with_contract_template do
+      after(:build) do |misc_release, _|
+        misc_release.contract_template = build(:misc_release_contract_template)
+      end
+    end
+
+    factory :misc_release_with_contract_template_and_photos do
+      after(:build) do |misc_release, _|
+        misc_release.contract_template = build(:misc_release_contract_template)
+        path = Rails.root.join("spec", "fixtures", "files", "person_photo.png")
+        misc_release.photos.attach Rack::Test::UploadedFile.new(path, "image/png")
+      end
+    end
+
+    factory :misc_release_with_photo do
+      after(:build) do |misc_release, _|
+        path = Rails.root.join("spec", "fixtures", "files", "person_photo.png")
+        misc_release.photos.attach Rack::Test::UploadedFile.new(path, "image/png")
+      end
+    end
+  end
+end

spec/factories/projects.rb

@@ -16,6 +16,7 @@ FactoryBot.define do
         appearance_release: true,
         location_release: true,
         material_release: true,
+        medical_release: true,
         music_release: true,
         talent_release: true,
         video_analysis: true,

spec/features/user_creates_note_spec.rb

@@ -109,4 +109,10 @@ feature "User creates notes" do
 
     it_behaves_like "a notable collection UI"
   end
+
+  context "for misc releases" do
+    subject! { create(:misc_release, project: project, notes: []) }
+
+    it_behaves_like "a notable collection UI"
+  end
 end

spec/features/user_creates_tags_spec.rb

@@ -92,4 +92,10 @@ feature "User creates tags" do
 
     it_behaves_like "a taggable collection UI"
   end
+
+  context "for misc releases" do
+    subject! { create(:misc_release, project: project, tags: []) }
+
+    it_behaves_like "a taggable collection UI"
+  end
 end