Taskme update

Task me sync
Task me upstream sync
2020-06-30 05:08:23 +02:00 · 2020-06-26 04:57:23 +02:00 · 2020-06-25 08:47:10 +02:00 · 2020-06-24 04:49:28 +02:00 · 2020-06-19 12:32:50 +02:00
228 changed files with 6683 additions and 825 deletions
--- a/2
+++ b/2
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby "2.6.3"

 # Bundle edge Rails instead: gem "rails", github: "rails/rails"
-gem "rails", "~> 6.0.0"
+gem "rails", "~> 6.0.3.1"
 # Use postgresql as the database for Active Record
 gem "pg", "~> 0.18"
 # Use Puma as the app server
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,71 +44,71 @@ GEM
  remote: https://rubygems.org/
  specs:
    Ascii85 (1.0.3)
-    actioncable (6.0.0)
-      actionpack (= 6.0.0)
+    actioncable (6.0.3.2)
+      actionpack (= 6.0.3.2)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.0)
-      actionpack (= 6.0.0)
-      activejob (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    actionmailbox (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
      mail (>= 2.7.1)
-    actionmailer (6.0.0)
-      actionpack (= 6.0.0)
-      actionview (= 6.0.0)
-      activejob (= 6.0.0)
+    actionmailer (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      actionview (= 6.0.3.2)
+      activejob (= 6.0.3.2)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (6.0.0)
-      actionview (= 6.0.0)
-      activesupport (= 6.0.0)
-      rack (~> 2.0)
+    actionpack (6.0.3.2)
+      actionview (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+      rack (~> 2.0, >= 2.0.8)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.0)
-      actionpack (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    actiontext (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
      nokogiri (>= 1.8.5)
-    actionview (6.0.0)
-      activesupport (= 6.0.0)
+    actionview (6.0.3.2)
+      activesupport (= 6.0.3.2)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
    active_storage_base64 (1.0.0)
      rails (~> 6.0)
-    activejob (6.0.0)
-      activesupport (= 6.0.0)
+    activejob (6.0.3.2)
+      activesupport (= 6.0.3.2)
      globalid (>= 0.3.6)
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
    activemodel-serializers-xml (1.0.2)
      activemodel (> 5.x)
      activesupport (> 5.x)
      builder (~> 3.1)
-    activerecord (6.0.0)
-      activemodel (= 6.0.0)
-      activesupport (= 6.0.0)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
    activeresource (5.1.0)
      activemodel (>= 5.0, < 7)
      activemodel-serializers-xml (~> 1.0)
      activesupport (>= 5.0, < 7)
-    activestorage (6.0.0)
-      actionpack (= 6.0.0)
-      activejob (= 6.0.0)
-      activerecord (= 6.0.0)
+    activestorage (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
      marcel (~> 0.3.1)
-    activesupport (6.0.0)
+    activesupport (6.0.3.2)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
+      zeitwerk (~> 2.2, >= 2.2.2)
    addressable (2.7.0)
      public_suffix (>= 2.0.2, < 5.0)
    afm (0.2.2)
@@ -181,7 +181,7 @@ GEM
      coffee-script-source
      execjs
    coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
    connection_pool (2.2.2)
    countries (2.1.4)
      i18n_data (~> 0.8.0)
@@ -230,7 +230,7 @@ GEM
    hubspot-ruby (0.9.0)
      activesupport (>= 3.0.0)
      httparty (>= 0.10.0)
-    i18n (1.8.2)
+    i18n (1.8.3)
      concurrent-ruby (~> 1.0)
    i18n_data (0.8.0)
    i18n_yaml_sorter (0.2.0)
@@ -270,22 +270,22 @@ GEM
      ruby_dep (~> 1.2)
    loaf (0.8.1)
      rails (>= 3.2)
-    loofah (2.4.0)
+    loofah (2.6.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    mail (2.7.1)
      mini_mime (>= 0.1.1)
    marcel (0.3.3)
      mimemagic (~> 0.3.2)
-    method_source (0.9.2)
+    method_source (1.0.0)
    mime-types (3.3)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2019.0904)
-    mimemagic (0.3.3)
+    mimemagic (0.3.5)
    mini_magick (4.9.5)
    mini_mime (1.0.2)
    mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
    monetize (1.9.2)
      money (~> 6.12)
    money (6.13.4)
@@ -298,8 +298,8 @@ GEM
    msgpack (1.3.1)
    multi_xml (0.6.0)
    multipart-post (2.1.1)
-    nio4r (2.5.1)
-    nokogiri (1.10.7)
+    nio4r (2.5.2)
+    nokogiri (1.10.9)
      mini_portile2 (~> 2.4.0)
    oath (1.1.0)
      bcrypt
@@ -337,20 +337,20 @@ GEM
      rack
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
-    rails (6.0.0)
-      actioncable (= 6.0.0)
-      actionmailbox (= 6.0.0)
-      actionmailer (= 6.0.0)
-      actionpack (= 6.0.0)
-      actiontext (= 6.0.0)
-      actionview (= 6.0.0)
-      activejob (= 6.0.0)
-      activemodel (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    rails (6.0.3.2)
+      actioncable (= 6.0.3.2)
+      actionmailbox (= 6.0.3.2)
+      actionmailer (= 6.0.3.2)
+      actionpack (= 6.0.3.2)
+      actiontext (= 6.0.3.2)
+      actionview (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
      bundler (>= 1.3.0)
-      railties (= 6.0.0)
+      railties (= 6.0.3.2)
      sprockets-rails (>= 2.0.0)
    rails-controller-testing (1.0.4)
      actionpack (>= 5.0.1.x)
@@ -363,9 +363,9 @@ GEM
      nokogiri (>= 1.6)
    rails-html-sanitizer (1.3.0)
      loofah (~> 2.3)
-    railties (6.0.0)
-      actionpack (= 6.0.0)
-      activesupport (= 6.0.0)
+    railties (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
      method_source
      rake (>= 0.8.7)
      thor (>= 0.20.3, < 2.0)
@@ -469,7 +469,7 @@ GEM
    turbolinks-source (5.2.0)
    typhoeus (1.3.1)
      ethon (>= 0.9.0)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
      thread_safe (~> 0.1)
    uglifier (4.1.20)
      execjs (>= 0.3.0, < 3)
@@ -494,9 +494,9 @@ GEM
      activesupport (>= 4.2)
      rack-proxy (>= 0.6.1)
      railties (>= 4.2)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.2)
      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
    will_paginate (3.2.1)
    will_paginate-bootstrap4 (0.2.2)
      will_paginate (~> 3.0, >= 3.0.0)
@@ -504,7 +504,7 @@ GEM
    wkhtmltopdf-heroku (2.12.5.0)
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.1)

 PLATFORMS
  ruby
@@ -561,7 +561,7 @@ DEPENDENCIES
  rack!
  rack-contrib (~> 2.0.1)
  rack-cors
-  rails (~> 6.0.0)
+  rails (~> 6.0.3.1)
  rails-controller-testing (~> 1.0.4)
  rails-data-migrations (~> 1.2.0)
  redcarpet (~> 3.4.0)
--- a/README.md
+++ b/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

--- a/app/assets/javascripts/channels/broadcasts.coffee
+++ b/app/assets/javascripts/channels/broadcasts.coffee
@@ -1,22 +1,23 @@
 $(document).on "turbolinks:load", ->
-  # Only connect if a broadcast-token meta tag is present
-  broadcast_meta = document.querySelector("meta[name=broadcast-token]")
-  return unless broadcast_meta
-
-  broadcastToken = broadcast_meta.getAttribute("content")
-
-  App.public = App.cable.subscriptions.create { channel: "BroadcastsChannel", token: broadcastToken },
+  subscribeToBroadcast = (broadcastToken) -> App.cable.subscriptions.create { channel: "BroadcastsChannel", token: broadcastToken },
    connected: ->
      # Called when the subscription is ready for use on the server
+      console.info "Subscribed to channel for broadcast:#{broadcastToken}"

    disconnected: ->
      # 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 "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
@@ -37,3 +38,12 @@ $(document).on "turbolinks:load", ->
      $(".flash-message").html data.flash_content
      $("#broadcast_recordings").html data.recordings_content
      $("#broadcast_recordings_nav").html data.recordings_nav_content
+
+    refreshBroadcastFilesTab: (data) ->
+      $("#broadcast_file_list_#{data.broadcast_token}").html data.files_content
+      $("#broadcast_files_pagination_#{data.broadcast_token}").html data.pagination_content
+
+  # Create a channel subscription for every broadcast included in the meta tags
+  get_token = (meta) -> meta.getAttribute("content")
+  broadcast_tokens = (get_token broadcast_meta for broadcast_meta in document.querySelectorAll("meta[name=broadcast-token]"))
+  subscribeToBroadcast token for token in broadcast_tokens
--- a/app/assets/javascripts/channels/projects.coffee
+++ b/app/assets/javascripts/channels/projects.coffee
@@ -16,6 +16,7 @@ $(document).on "turbolinks:load", ->
      switch data.event
        when "video_status_update" then @showVideoStatusUpdate(data.content)
        when "download_status_update" then @showDownloadStatusUpdate(data.content)
+        when "conference_recording_ready" then @showDownloadStatusUpdate(data.content)

    showVideoStatusUpdate: (content) ->
      $("[data-ujs-target='video-analysis-msg']").replaceWith content
--- a/app/assets/javascripts/collapse_select.js
+++ b/app/assets/javascripts/collapse_select.js
@@ -1,11 +1,16 @@
 $(document).on("change", "[data-toggle=collapse-select]", function(event) {
  const select = event.target;
-  const target = select.dataset.target;
-  const showValues = JSON.parse(select.dataset.showValues);
-
-  if (showValues.indexOf(select.value) > -1) {
-    $(target).show("fast");
-  } else {
-    $(target).hide("fast");
-  }
+  const mappings = JSON.parse(select.dataset.targetShowValuesMapping);
+  
+  $.each(mappings, function( key, value ) {
+    if (value.indexOf(select.value) > -1) {
+      $(key).show("fast");
+    } else {
+      $(key).hide("fast");
+    }
+  });
 });
+
+$(document).on("turbolinks:load", function() {
+  $("[data-toggle=collapse-select]").trigger("change");
+});
--- a/app/assets/javascripts/multi_view_broadcasts.js
+++ b/app/assets/javascripts/multi_view_broadcasts.js
@@ -39,7 +39,7 @@ function selectBroadcast(clicked_element, checkbox) {
  if (broadcast_ids.length >= 2) {
    multi_view_ids = $.param({multi_view_ids: broadcast_ids});
    broadcast_url = "/en/projects/" + project_id + "/broadcasts/" + broadcast_ids[0] + "?" + multi_view_ids
-    
+
    $("#multi_view_broadcasts").attr("href", broadcast_url);
    $("#multi_view_broadcasts").attr("target", "_blank");
    $("#multi_view_broadcasts").removeClass('disabled');
--- a/app/assets/javascripts/photo_preview.js
+++ b/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");
  });
 });
--- a/app/assets/javascripts/play_previous_recordings.js
+++ b/app/assets/javascripts/play_previous_recordings.js
@@ -1,24 +0,0 @@
-$(document).on("click", "[data-behavior=play_recording]", function() {
-  if ($(this).hasClass('active')){
-    return false;
-  }
-
-  var playback_url = $(this).attr("data-playback-url")
-  $("#broadcast_video").empty();
-
-  new Clappr.Player({
-    parentId: '#broadcast_video',
-    source: playback_url,
-    width: '100%',
-    height: '100%',
-    autoPlay: true
-  });
-
-  $(".dropdown-menu").children().removeClass('active');
-  $(".dropdown-menu").children().children('i').remove();
-  $(this).siblings().removeClass('active');
-  $(this).siblings().children("i").remove();
-  $(this).addClass('active');
-  $(this).prepend('<i class="fa fa-check">&nbsp;</i>');
-});
-
--- a/app/assets/javascripts/play_previous_recordings.js.erb
+++ b/app/assets/javascripts/play_previous_recordings.js.erb
@@ -0,0 +1,26 @@
+$(document).on("click", "[data-behavior=play_recording]", function() {
+    if ($(this).hasClass('active')){
+        return false;
+    }
+
+    console.warn('Play prev : ', playback_url);
+
+    var playback_url = $(this).attr("data-playback-url")
+    $("#broadcast_video").empty();
+
+    new Clappr.Player({
+        <%= "baseUrl: 'http://cdn.clappr.io/latest'," if Rails.env.test? %>
+        parentId: '#broadcast_video',
+        source: playback_url,
+        width: '100%',
+        height: '100%',
+        autoPlay: true
+    });
+
+    $(".dropdown-menu").children().removeClass('active');
+    $(".dropdown-menu").children().children('i').remove();
+    $(this).siblings().removeClass('active');
+    $(this).siblings().children("i").remove();
+    $(this).addClass('active');
+    $(this).prepend('<i class="fa fa-check">&nbsp;</i>');
+});
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -6,6 +6,11 @@
@import "dropzone/dist/dropzone";
@import 'bootstrap-datepicker';

+// Global styles
+label {
+  text-transform: capitalize;
+}
+
 // Wordmarks
 .suite-wordmark {
  font-weight: normal;
--- a/app/assets/stylesheets/contract_pdf.scss
+++ b/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%;
 }
--- a/app/channels/broadcasts_channel.rb
+++ b/app/channels/broadcasts_channel.rb
@@ -28,10 +28,21 @@ class BroadcastsChannel < ApplicationCable::Channel
    recordings_content = ApplicationController.render partial: "broadcasts/broadcast_recordings", locals: { recordings: recordings, broadcast: broadcast }
    recordings_nav_content = ApplicationController.render partial: "broadcasts/broadcast_recording_nav", collection: recordings, as: :broadcast_recording

-    broadcast_to broadcast, 
-      event: :stream_recording_ready, 
-      flash_content: flash_content, 
+    broadcast_to broadcast,
+      event: :stream_recording_ready,
+      flash_content: flash_content,
      recordings_content: recordings_content,
      recordings_nav_content: recordings_nav_content
  end
+
+  def self.broadcast_file_upload_updates(broadcast, files, pagination_content)
+    files_content = ApplicationController.render partial: "broadcasts/file", collection: files
+
+    broadcast_to broadcast, {
+      event: :file_upload_update,
+      broadcast_token: broadcast.token,
+      files_content: files_content,
+      pagination_content: pagination_content
+    }
+  end
 end
--- a/app/channels/projects_channel.rb
+++ b/app/channels/projects_channel.rb
@@ -1,5 +1,5 @@
 class ProjectsChannel < ApplicationCable::Channel
-  
+
  def subscribed
    # TODO: How can we get the current account in this context
    project = current_user.accessible_projects_for(current_user.primary_account).find(params[:id])
@@ -25,4 +25,12 @@ class ProjectsChannel < ApplicationCable::Channel
    content = ApplicationController.render partial: "application/flash", locals: { flash: flash }
    broadcast_to download.project, event: :download_status_update, content: content
  end
+
+  def self.conference_recording_ready(project, recording)
+    link = ApplicationController.helpers.link_to('Download here.', recording.service_url, target: '_blank', class: 'alert-link')
+    notification = "A recording of your video conference is now available. #{link}"
+    flash = OpenStruct.new(notice: notification)
+    content = ApplicationController.render partial: 'application/flash', locals: { flash: flash }
+    broadcast_to project, event: :conference_recording_ready, content: content
+  end
 end
--- a/app/controllers/acquired_media_releases_controller.rb
+++ b/app/controllers/acquired_media_releases_controller.rb
@@ -61,7 +61,8 @@ class AcquiredMediaReleasesController < ApplicationController
      :name,
      :territory,
      :term,
-      :person_name,
+      :person_first_name,
+      :person_last_name,
      :person_phone,
      :person_email,
      :person_company,
--- a/app/controllers/admin/task_requests_controller.rb
+++ b/app/controllers/admin/task_requests_controller.rb
@@ -8,6 +8,10 @@ class Admin::TaskRequestsController < Admin::ApplicationController
  def edit
  end

+  def show
+    @files = @task_request.files.paginate(page: params[:page])
+  end
+
  def update
    if @task_request.update(task_request_params)
      redirect_to [:admin, :task_requests], notice: t(".notice")
--- a/app/controllers/api/broadcasts_controller.rb
+++ b/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!

--- a/app/controllers/api/direct_uploads_controller.rb
+++ b/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
--- a/app/controllers/appearance_release_imports_controller.rb
+++ b/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
--- a/app/controllers/appearance_releases_controller.rb
+++ b/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,
--- a/app/controllers/broadcasts_controller.rb
+++ b/app/controllers/broadcasts_controller.rb
@@ -1,6 +1,6 @@
 class BroadcastsController < ApplicationController
  layout "project"
-  
+
  before_action :set_project
  before_action :build_broadcast, only: [:new, :create]
  before_action :set_broadcast, only: [:show, :destroy, :update]
@@ -24,18 +24,21 @@ class BroadcastsController < ApplicationController
    end
  end

-  def update
-    @broadcast.update(broadcast_params)
-    @files = @broadcast.files.order("created_at DESC").paginate(page: 1)
-  end
-
  def show
    @conference_url = url_for [@broadcast.project, @broadcast, :zoom_meeting]
    @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
-    @files = @broadcast.files.order("created_at DESC").paginate(page: params[:page])
+    @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page])
    render layout: 'application'
  end

+  def update
+    @broadcast.update(broadcast_params)
+    @files = @broadcast.files.order("created_at DESC").paginate(page: 1)
+
+    pagination_content = ApplicationController.render html: helpers.will_paginate(@files, params: { active_tab: params[:active_tab], page: params[:page], active_files_tab: params[:active_files_tab] })
+    BroadcastsChannel.broadcast_file_upload_updates(@broadcast, @files, pagination_content)
+  end
+
  def destroy
    if @broadcast.destroy
      redirect_to [@project, :broadcasts], alert: t(".alert")
@@ -68,7 +71,10 @@ class BroadcastsController < ApplicationController

  def set_multi_view_broadcasts
    authorized_broadcasts = authorize policy_scope(Broadcast).where(id: params[:multi_view_ids]).order_by_recent
-    @multi_view_broadcasts = authorized_broadcasts.map { |b| MultiViewBroadcast.new(b, params[:multi_view_ids]) }
+    @multi_view_broadcasts = authorized_broadcasts.map do |b|
+      files_page = params[:files_page] if params[:active_files_tab] == b.token
+      MultiViewBroadcast.new(b, params[:multi_view_ids], files_page)
+    end
  end

  def filtered_broadcasts
@@ -87,20 +93,29 @@ class BroadcastsController < ApplicationController

  class MultiViewBroadcast
    include Rails.application.routes.url_helpers
-  
+
    delegate_missing_to :@broadcast
-    
-    def initialize(broadcast, multi_view_ids)
+
+    def initialize(broadcast, multi_view_ids, paginate_page)
      @broadcast = broadcast
      @multi_view_ids = multi_view_ids
+      @paginate_page = paginate_page
    end

    def url
      project_broadcast_path(@broadcast.project, @broadcast, multi_view_ids: @multi_view_ids, locale: I18n.locale)
    end
-    
+
+    def files
+      @broadcast.files.order("created_at DESC").paginate(page: @paginate_page)
+    end
+
    def uid
      id
    end
+
+    def self.model_name
+      Broadcast.model_name
+    end
  end
 end
--- a/app/controllers/concerns/medical_release_context.rb
+++ b/app/controllers/concerns/medical_release_context.rb
@@ -0,0 +1,13 @@
+module MedicalReleaseContext
+  extend ActiveSupport::Concern
+
+  def medical_releases
+    policy_scope(MedicalRelease)
+  end
+
+  def set_medical_release
+    medical_release_id = params[:medical_release_id] || params[:id]
+
+    @medical_release = authorize medical_releases.find(medical_release_id)
+  end
+end
--- a/app/controllers/concerns/misc_release_context.rb
+++ b/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
--- a/app/controllers/contract_templates_controller.rb
+++ b/app/controllers/contract_templates_controller.rb
@@ -61,7 +61,15 @@ class ContractTemplatesController < ApplicationController
              :applicable_medium_id, :applicable_medium_text,
              :territory_id, :territory_text,
              :term_id, :term_text,
-              :restriction_id, :restriction_text)
+              :restriction_id, :restriction_text,
+              :question_1_text, :question_2_text, 
+              :question_3_text, :question_4_text, 
+              :question_5_text, :question_6_text, 
+              :question_7_text, :question_8_text, 
+              :question_9_text, :question_10_text,
+              :question_11_text, :question_12_text, 
+              :question_13_text, :question_14_text, 
+              :question_15_text)
  end

  def download_attributes
--- a/app/controllers/contracts_controller.rb
+++ b/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
--- a/app/controllers/location_releases_controller.rb
+++ b/app/controllers/location_releases_controller.rb
@@ -68,7 +68,8 @@ class LocationReleasesController < ApplicationController
      :territory_id, :territory_text,
      :term_id, :term_text,
      :restriction_id, :restriction_text,
-      :filming_started_on, :filming_ended_on
+      :filming_started_on, :filming_ended_on,
+      :filming_hours
    )
  end

--- a/app/controllers/medical_releases_controller.rb
+++ b/app/controllers/medical_releases_controller.rb
@@ -0,0 +1,40 @@
+class MedicalReleasesController < ApplicationController
+  include ProjectContext, MedicalReleaseContext
+
+  before_action :set_project, only: [:index]
+  before_action :set_medical_release, only: [:destroy]
+
+  include ProjectLayout
+
+  def index
+    @medical_releases = filtered_medical_releases.order_by_recent.paginate(page: params[:page])
+  end
+
+  def destroy
+    @project = @medical_release.project
+
+    if @medical_release.destroy
+      redirect_to [@project, :medical_releases], alert: t(".alert")
+    end
+  end
+
+  private
+
+  def medical_releases
+    if @project
+      policy_scope(@project.medical_releases)
+    else
+      policy_scope(MedicalRelease)
+    end
+  end
+
+  def filtered_medical_releases
+    results = medical_releases
+
+    if params[:query].present?
+      results = results.search(params[:query])
+    end
+
+    results
+  end
+end
--- a/app/controllers/misc_releases_controller.rb
+++ b/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
--- a/app/controllers/password_resets_controller.rb
+++ b/app/controllers/password_resets_controller.rb
@@ -18,6 +18,7 @@ class PasswordResetsController < ApplicationController
  end

  def edit
+    redirect_to new_session_path, notice: t(".notice") if @user.nil?
  end

  def update
--- a/app/controllers/projects_controller.rb
+++ b/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 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
--- a/app/controllers/public/acquired_media_releases_controller.rb
+++ b/app/controllers/public/acquired_media_releases_controller.rb
@@ -45,6 +45,9 @@ class Public::AcquiredMediaReleasesController < Public::BaseController
    params.require(:acquired_media_release).permit(
      :name, 
      :description,
+      :person_first_name,
+      :person_last_name,
+      :person_email,
      :person_title,
      :person_phone,
      :person_fax,
--- a/app/controllers/public/appearance_releases_controller.rb
+++ b/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
--- a/app/controllers/public/broadcasts_controller.rb
+++ b/app/controllers/public/broadcasts_controller.rb
@@ -6,14 +6,17 @@ class Public::BroadcastsController < Public::BaseController
    @conference_url = broadcast_zoom_meeting_url(@broadcast.token)
    @multi_view_broadcasts = multi_view_broadcasts
    @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
-    @files = @broadcast.files.order("created_at DESC").paginate(page: params[:page])
-    
+    @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page])
+
    render 'broadcasts/show'
  end

  def update
    @broadcast.update(broadcast_params)
    @files = @broadcast.files.order("created_at DESC").paginate(page: 1)
+
+    pagination_content = ApplicationController.render html: helpers.will_paginate(@files,params: { active_tab: params[:active_tab], page: params[:page], active_files_tab: params[:active_files_tab] })
+    BroadcastsChannel.broadcast_file_upload_updates(@broadcast, @files, pagination_content)
  end

  private
@@ -26,29 +29,45 @@ class Public::BroadcastsController < Public::BaseController
    Broadcast.
      where(token: params[:multi_view_tokens]).
      order_by_recent.
-      map { |b| MultiViewBroadcast.new(b, params[:multi_view_tokens]) }
+      map do |b|
+        files_page = params[:files_page] if params[:active_files_tab] == b.token
+        MultiViewBroadcast.new(b, params[:multi_view_tokens], files_page)
+      end
  end

  def set_broadcast
    @broadcast = Broadcast.find_by_token(params[:token])
+    
+    unless @broadcast.present?
+      redirect_to [:new, :session], alert: t(".alert")
+    end
  end

  class MultiViewBroadcast
    include Rails.application.routes.url_helpers
-  
+
    delegate_missing_to :@broadcast
-    
-    def initialize(broadcast, multi_view_tokens)
+
+    def initialize(broadcast, multi_view_tokens, paginate_page)
      @broadcast = broadcast
      @multi_view_tokens = multi_view_tokens
+      @paginate_page = paginate_page
    end

    def url
      broadcast_url(uid, multi_view_tokens: @multi_view_tokens, host: AppHost.new.domain_with_port, locale: I18n.locale)
    end
-    
+
+    def files
+      @broadcast.files.order("created_at DESC").paginate(page: @paginate_page)
+    end
+
    def uid
      token
    end
+
+    def self.model_name
+      Broadcast.model_name
+    end
  end
 end
--- a/app/controllers/public/location_releases_controller.rb
+++ b/app/controllers/public/location_releases_controller.rb
@@ -63,7 +63,9 @@ class Public::LocationReleasesController < Public::BaseController
      :person_address_zip, 
      :person_address_country,
      :signature_base64,
-      :locale, :contract_template, :filming_started_on, :filming_ended_on
+      :locale, :contract_template, :filming_started_on, :filming_ended_on,
+      :filming_hours,
+      photos: []
    )
  end

--- a/app/controllers/public/material_releases_controller.rb
+++ b/app/controllers/public/material_releases_controller.rb
@@ -45,7 +45,7 @@ class Public::MaterialReleasesController < Public::BaseController
      :person_first_name, :person_last_name, :person_title, :person_company, :person_phone, :person_email,
      :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country,
      :signature_base64,
-      :locale, :contract_template, :description
+      :locale, :contract_template, :description, photos: []
    )
  end

--- a/app/controllers/public/medical_releases_controller.rb
+++ b/app/controllers/public/medical_releases_controller.rb
@@ -0,0 +1,123 @@
+class Public::MedicalReleasesController < Public::BaseController
+  before_action :set_account, :set_project, :set_contract_template
+
+  def new
+    @medical_release = build_medical_release
+  end
+
+  def create
+    @medical_release = build_medical_release(medical_release_params_with_locale_and_contract_template)
+
+    if @medical_release.save(context: :native)
+      if @medical_release.contract_template.present?
+        AttachContractToReleasableJob.perform_later(@medical_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 medical_releases
+    policy_scope(@project.medical_releases)
+  end
+
+  def build_medical_release(params = {})
+    authorize medical_releases.build(params)
+  end
+
+  def medical_release_params
+    params
+      .require(:medical_release)
+      .permit(
+        person_params,
+        guardian_params,
+        second_guardian_params,
+        :minor,
+        :signature_base64,
+        :locale,
+        :contract_template,
+        :question_1_answer, :question_2_answer,
+        :question_3_answer, :question_4_answer,
+        :question_5_answer, :question_6_answer,
+        :question_7_answer, :question_8_answer,
+        :question_9_answer, :question_10_answer,
+        :question_11_answer, :question_12_answer,
+        :question_13_answer, :question_14_answer,
+        :question_15_answer, photos: [],
+      )
+  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
+      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 medical_release_params_with_locale
+    medical_release_params.merge(locale: I18n.locale)
+  end
+
+  def medical_release_params_with_locale_and_contract_template
+    medical_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: MedicalRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
+end
--- a/app/controllers/public/misc_releases_controller.rb
+++ b/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
--- a/app/controllers/public/talent_releases_controller.rb
+++ b/app/controllers/public/talent_releases_controller.rb
@@ -45,42 +45,59 @@ class Public::TalentReleasesController < Public::BaseController
      .permit(
        person_params,
        guardian_params,
+        second_guardian_params,
        :signature_base64,
        :locale,
        :contract_template,
-        photos: [],
+        photos: []
      )
  end

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

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

--- a/app/controllers/release_template_imports_controller.rb
+++ b/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)
--- a/app/controllers/talent_releases_controller.rb
+++ b/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 = {})
--- a/app/controllers/task_requests_controller.rb
+++ b/app/controllers/task_requests_controller.rb
@@ -17,13 +17,15 @@ class TaskRequestsController < ApplicationController

    if @task_request.save
      log_create_analytics
-      redirect_to [@project, :task_requests], notice: t(".notice")
+      taskme_url = url_for([:admin, @task_request])
+      SubmitHubspotTaskRequestFormJob.perform_later(@task_request.user_email, taskme_url)
    else
      render :new
    end
  end

  def show
+    @files = @task_request.files.paginate(page: params[:page])
  end
  
  def edit
--- a/app/controllers/zoom_notifications_controller.rb
+++ b/app/controllers/zoom_notifications_controller.rb
@@ -5,7 +5,7 @@ class ZoomNotificationsController < ApplicationController
  skip_before_action :verify_authenticity_token

  before_action :authorize_zoom
-  before_action :set_zoom_meeting, only: :create
+  before_action :set_zoom_meeting, only: [:create], if: :meeting_event?

  def create
    case notification_event
@@ -13,8 +13,17 @@ class ZoomNotificationsController < ApplicationController
      @zoom_meeting.started!
    when 'meeting.ended'
      @zoom_meeting.ended!
+    when 'recording.completed'
+      recording = notification.dig(:payload, :object, :recording_files).first
+      AttachRecordingToZoomMeetingJob.perform_later(@zoom_meeting, recording, notification['download_token'])
+    when 'user.deleted'
+      zoom_user = ZoomUser.find_by(api_id: notification.dig(:payload, :object, :id))
+      if zoom_user.present?
+        zoom_user.api_id = nil
+        zoom_user.destroy
+      end
    else
-      Rails.logger.info notification_type
+      Rails.logger.info notification_event
      Rails.logger.info notification
    end

@@ -23,16 +32,24 @@ class ZoomNotificationsController < ApplicationController

  private

+  def notification
+    params.to_unsafe_h
+  end
+
  def notification_event
-    params.dig(:event)
+    notification.dig(:event)
  end

  def notification_meeting_id
-    params.dig(:payload, :object, :id)
+    notification.dig(:payload, :object, :id)
  end

  def notification_host_id
-    params.dig(:payload, :object, :host_id)
+    notification.dig(:payload, :object, :host_id)
+  end
+
+  def meeting_event?
+    notification_event.split(".").first.to_s.in? %w(meeting recording)
  end

  def set_zoom_meeting
--- a/app/helpers/contact_info_helper.rb
+++ b/app/helpers/contact_info_helper.rb
@@ -41,7 +41,7 @@ module ContactInfoHelper
  end

  def email_abbr(email)
-    content_tag(:abbr, "E: ", title: "Email") + email
+    content_tag(:abbr, "E: ", title: "Email") + mail_to(email)
  end

  def phone_abbr(phone)
--- a/app/helpers/dropzone_helper.rb
+++ b/app/helpers/dropzone_helper.rb
@@ -2,9 +2,13 @@ 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"
      "To Add Audio Files to the release:<br>Drag & Drop Files<br>or<br>Click or Tap here to browse files"
+    when "location_release"
+      t 'location_releases.form.photos.dropzone_label'
    when "directory"
      "To Add Files to the Folder:<br>Drag & Drop Files<br>or<br>Click or Tap here to browse files"
    when "task_request"
--- a/app/jobs/attach_recording_to_zoom_meeting_job.rb
+++ b/app/jobs/attach_recording_to_zoom_meeting_job.rb
@@ -0,0 +1,25 @@
+class AttachRecordingToZoomMeetingJob < ApplicationJob
+  queue_as :default
+
+  def perform(zoom_meeting, recording_hash, download_token)
+    download_url = "#{recording_hash['download_url']}?access_token=#{download_token}"
+    file = URI.open(download_url)
+    if zoom_meeting.recording.attach(io: file, filename: file_name(zoom_meeting, recording_hash), content_type: 'video/mp4')
+      # Temorarily disabling notifications
+      # if zoom_meeting.project.present?
+      #   ProjectsChannel.conference_recording_ready(zoom_meeting.project, zoom_meeting.recording)
+      # end
+
+      gateway = ZoomGateway.new
+      gateway.delete_recording(zoom_meeting.api_meeting_id, recording_hash['id'])
+    end
+  end
+
+  private
+
+  def file_name(zoom_meeting, recording_hash)
+    start = recording_hash['recording_start'].to_datetime
+    prefix = zoom_meeting.project.present? ? "#{zoom_meeting.project.name}_" : ''
+    "#{prefix}video_conference_date#{start.strftime("%Y-%m-%d")}_Time_#{start.strftime("%T")}.mp4"
+  end
+end
--- a/app/jobs/match_appearance_releases_job.rb
+++ b/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
--- a/app/jobs/submit_hubspot_task_request_form_job.rb
+++ b/app/jobs/submit_hubspot_task_request_form_job.rb
@@ -0,0 +1,18 @@
+class SubmitHubspotTaskRequestFormJob < ApplicationJob
+  queue_as :default
+
+  def perform(user_email, taskme_url)
+    hubspot_task_request_form_guid = ENV["HUBSPOT_TASK_REQUEST_FORM_GUID"]
+    return unless hubspot_task_request_form_guid.present?
+
+    submission_params = {
+      email: user_email, 
+      taskme_url: taskme_url
+    }
+
+    form = Hubspot::Form.new("guid" => hubspot_task_request_form_guid)
+    is_form_sumitted = form.submit(submission_params)
+
+    raise StandardError.new "Failed to submit the task request hubspot form data: #{is_form_sumitted}" unless is_form_sumitted
+  end
+end
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -55,6 +55,10 @@ class Account < ApplicationRecord
        User.joins(:project_memberships).where(project_memberships: { project: projects }),
        Broadcast.where(project: projects),
        TaskRequest.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
--- a/app/models/acquired_media_release.rb
+++ b/app/models/acquired_media_release.rb
@@ -43,7 +43,8 @@ class AcquiredMediaRelease < ApplicationRecord
    person_address_street1 person_address_street2 person_address_city person_address_state person_address_zip person_address_country
  ]

-  CATEGORIES = ["Artwork", "Film Footage", "Video Footage", "Still Photograph"].freeze
+  # CATEGORIES = ["Artwork", "Film Footage", "Video Footage", "Still Photograph"].freeze
+  CATEGORIES = ["Film Footage", "Video Footage", "Still Photograph"].freeze

  def minor?
    false
--- a/app/models/appearance_release.rb
+++ b/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
--- a/app/models/blank_contract.rb
+++ b/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

--- a/app/models/broadcast.rb
+++ b/app/models/broadcast.rb
@@ -7,8 +7,6 @@ class Broadcast < ApplicationRecord

  has_secure_token

-  scope :order_by_recent, -> { order(created_at: :desc) }
-
  validates :name, presence: true

  enum status: [:created, :active, :idle]
--- a/app/models/broadcast_recording.rb
+++ b/app/models/broadcast_recording.rb
@@ -1,8 +1,6 @@
 class BroadcastRecording < ApplicationRecord
  belongs_to :broadcast

-  scope :order_by_recent, -> { order(created_at: :desc) }
-
  delegate :name, to: :broadcast, prefix: :broadcast

  validates :asset_uid, uniqueness: true
--- a/app/models/concerns/attachable.rb
+++ b/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
--- a/app/models/concerns/releasable.rb
+++ b/app/models/concerns/releasable.rb
@@ -6,8 +6,6 @@ module Releasable
  included do
    belongs_to :project, touch: true
    belongs_to :contract_template, optional: true
-
-    scope :order_by_recent, -> { order(created_at: :desc) }
  end

  def release_number
--- a/app/models/concerns/second_guardian_name.rb
+++ b/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
--- a/app/models/concerns/second_guardian_photoable.rb
+++ b/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
--- a/app/models/contract.rb
+++ b/app/models/contract.rb
@@ -29,6 +29,10 @@ class Contract
    }
  end

+  def medical_release?
+    @releasable.instance_of?(MedicalRelease)
+  end
+
  private

  def contract_template
--- a/app/models/contract_template.rb
+++ b/app/models/contract_template.rb
@@ -13,6 +13,8 @@ class ContractTemplate < ApplicationRecord
  has_many :acquired_media_releases, dependent: :restrict_with_error
  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
@@ -50,6 +52,10 @@ class ContractTemplate < ApplicationRecord
    parent.present?
  end

+  def archived?
+    archived_at.present?
+  end
+
  def archive
    update(archived_at: Time.zone.now)
  end
--- a/app/models/headshot_collection.rb
+++ b/app/models/headshot_collection.rb
@@ -5,7 +5,7 @@ class HeadshotCollection
  def self.for_project(project)
    appearance_releases_with_photo = project.appearance_releases.with_person_photo

-    new(project.id, appearance_releases_with_photo + project.talent_releases)
+    new(project.headshot_collection_uid, appearance_releases_with_photo + project.talent_releases)
  end

  def initialize(collection_uid, releasables)
@@ -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 { |k, v| v.blank? && k != :ids_to_images }
  end

  private
--- a/app/models/matching_request.rb
+++ b/app/models/matching_request.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MatchingRequest < ApplicationRecord
+  include Attachable
+
+  belongs_to :project
+end
--- a/app/models/medical_release.rb
+++ b/app/models/medical_release.rb
@@ -0,0 +1,79 @@
+class MedicalRelease < ApplicationRecord
+  include Contractable
+  include Notable
+  include Photoable
+  include Releasable
+  include Searchable
+  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",
+              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) 
+              ]
+
+  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 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
+  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
+
+  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 
+  ]
+
+  # 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
--- a/app/models/misc_release.rb
+++ b/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
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -4,6 +4,4 @@ class Note < ApplicationRecord
  belongs_to :notable, polymorphic: true

  validates :content, presence: true
-
-  scope :order_by_recent, -> { order(created_at: :desc) }
 end
--- a/app/models/project.rb
+++ b/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)
-  AVAILABLE_RELEASE_TYPES = %w(appearance location material acquired_media talent music)
+  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
@@ -13,6 +13,8 @@ class Project < ApplicationRecord
  has_many :material_releases, dependent: :destroy
  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
@@ -34,6 +36,8 @@ class Project < ApplicationRecord
      material_release: false,
      music_release: false,
      talent_release: false,
+      medical_release: false,
+      misc_release: false,
      video_analysis: false,
    }
  end
@@ -66,6 +70,8 @@ class Project < ApplicationRecord
        material_release: true,
        music_release: true,
        talent_release: true,
+        medical_release: true,
+        misc_release: true,
        video_analysis: true,
      }
    when "nat_geo"
@@ -77,6 +83,8 @@ class Project < ApplicationRecord
        material_release: true,
        music_release: true,
        talent_release: true,
+        medical_release: true,
+        misc_release: true,
        video_analysis: true,
      }
    else
@@ -118,7 +126,7 @@ class Project < ApplicationRecord
    current_zoom_meeting = zoom_meetings.active.first

    unless current_zoom_meeting.present?
-      zoom_user = ZoomUser.free.first || ZoomUser.create
+      zoom_user = ZoomUser.for_new_meeting
      current_zoom_meeting = ZoomMeeting.create(zoom_user: zoom_user, project: self)
    end

--- a/app/models/qr_code.rb
+++ b/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

--- a/app/models/releasable_param.rb
+++ b/app/models/releasable_param.rb
@@ -1,5 +1,5 @@
 class ReleasableParam
-  TYPES = %w(talent appearance location material acquired_media music)
+  TYPES = %w(talent appearance location material acquired_media music medical misc)

  def initialize(params)
    @params = params
--- a/app/models/sample_appearance_release.rb
+++ b/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",
--- a/app/models/talent_release.rb
+++ b/app/models/talent_release.rb
@@ -11,7 +11,9 @@ class TalentRelease < ApplicationRecord
  include Taggable
  include PersonName
  include GuardianPhotoable
+  include SecondGuardianPhotoable
  include GuardianName
+  include SecondGuardianName

  composed_of :person_address, 
              class_name: "Address",
@@ -35,6 +37,17 @@ class TalentRelease < ApplicationRecord
                %w(guardian_address_country country) 
              ]

+  composed_of :guardian_2_address,
+              class_name: "Address",
+              mapping: [
+                  %w(guardian_2_address_street1 street1),
+                  %w(guardian_2_address_street2 street2),
+                  %w(guardian_2_address_city city),
+                  %w(guardian_2_address_state state),
+                  %w(guardian_2_address_zip zip),
+                  %w(guardian_2_address_country country)
+              ]
+
  def self.face_photo_acceptable_content_types
    ["image/png", "image/jpeg"]
  end
@@ -58,6 +71,7 @@ class TalentRelease < ApplicationRecord
  # These validations apply to releases being signed by a minor
  with_options if: :minor? do
    validates :guardian_first_name, :guardian_last_name, presence: true
+    validates :guardian_email, :guardian_2_email, email: true, allow_blank: true
    validates :guardian_phone, presence: true
  end

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

+  def second_guardian_present?
+    guardian_2_first_name.present?
+  end
+
  def contract_file_name
    "#{project.name.parameterize}_#{contract_template.release_type}_#{(signed_at || created_at).strftime("%Y.%m.%d")}_#{release_number}_#{filename_suffix.parameterize}"
  end
--- a/app/models/task_request.rb
+++ b/app/models/task_request.rb
@@ -5,4 +5,6 @@ class TaskRequest < ApplicationRecord
  enum status: [:pending, :completed, :cancelled]

  scope :order_by_recent, -> { order(created_at: :desc) }
+
+  validates :time_allowed, numericality: { only_integer: true, greater_than_or_equal_to: 2 }
 end
--- a/app/models/zoom_meeting.rb
+++ b/app/models/zoom_meeting.rb
@@ -1,9 +1,10 @@
-require 'zoom_gateway'
-
 class ZoomMeeting < ApplicationRecord
  belongs_to :project, optional: true
  belongs_to :zoom_user

+  has_one_attached :recording
+  validates :recording, content_type: ['video/mp4']
+
  enum status: [:created, :started, :ended]

  after_create :create_api_meeting, if: -> { api_meeting_id.nil? }
--- a/app/models/zoom_user.rb
+++ b/app/models/zoom_user.rb
@@ -1,18 +1,27 @@
+require 'securerandom'
 class ZoomUser < ApplicationRecord
  has_many :zoom_meetings, dependent: :nullify

+  enum tier: [:basic, :pro]
+
  after_create :create_api_user, if: -> { api_id.nil? }
  before_destroy :abort_destroy

+  scope :current_account, -> { where(account_number: ZoomGateway.ACCOUNT_NUMBER) }
  scope :free, -> { where.not(id: ZoomMeeting.active.pluck(:zoom_user_id)) }

-  def api_email
-    self.class.api_email(self.id)
-  end
-
  def create_api_user
-    self.api_id = gateway.create_host(api_email)
+    retries ||= 0
+    self.api_id = gateway.create_host(self.class.generate_api_email)
+    self.account_number = ZoomGateway.ACCOUNT_NUMBER
    save
+  rescue ZoomGateway::UserAlreadyExists => e
+    retries += 1
+    if retries < 3
+      retry # new api email will be generated automatically
+    else
+      raise e
+    end
  end

  def delete_api_user
@@ -21,9 +30,22 @@ class ZoomUser < ApplicationRecord
    save
  end

+  def current_account?
+    account_number == ZoomGateway.ACCOUNT_NUMBER
+  end
+
+  # Static methods
  class << self
-    def api_email(id)
-      "host#{id}@directme"
+    def generate_api_email
+      "host#{SecureRandom.random_number(10000)}@directme"
+    end
+
+    def for_new_meeting
+      user = public_send(ZoomGateway.USER_TYPE_NAME).current_account.free.first
+      if user.nil?
+        user = public_send(ZoomGateway.USER_TYPE_NAME).current_account.create
+      end
+      user
    end
  end

--- a/app/policies/acquired_media_release_policy.rb
+++ b/app/policies/acquired_media_release_policy.rb
@@ -12,7 +12,7 @@ class AcquiredMediaReleasePolicy < ApplicationPolicy
  end

  def destroy?
-    true
+    user.manager? || user.account_manager?
  end

  def tag_multiple?
--- a/app/policies/appearance_release_policy.rb
+++ b/app/policies/appearance_release_policy.rb
@@ -16,7 +16,7 @@ class AppearanceReleasePolicy < ReleasePolicy
  end

  def destroy?
-    true
+    user.manager? || user.account_manager?
  end

  def tag_multiple?
--- a/app/policies/contract_policy.rb
+++ b/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
--- a/app/policies/contract_template_policy.rb
+++ b/app/policies/contract_template_policy.rb
@@ -3,10 +3,8 @@ class ContractTemplatePolicy < ApplicationPolicy
    def resolve
      if user.account_manager?
        scope.left_outer_joins(:project).where(projects: {account: user.account})
-      elsif user.manager?
-        scope.left_outer_joins(project: :project_memberships).where(project_memberships: { user_id: user.id })
      else
-        scope.none
+        scope.left_outer_joins(project: :project_memberships).where(project_memberships: { user_id: user.id })
      end
    end
  end
@@ -14,8 +12,9 @@ class ContractTemplatePolicy < ApplicationPolicy
  def create?
    user.manager? || user.account_manager?
  end
+
  def show?
-    create?
+    true
  end

  def destroy?
--- a/app/policies/location_release_policy.rb
+++ b/app/policies/location_release_policy.rb
@@ -16,7 +16,7 @@ class LocationReleasePolicy < ReleasePolicy
  end

  def destroy?
-    true
+    user.manager? || user.account_manager?
  end

  def edit_photos?
--- a/app/policies/material_release_policy.rb
+++ b/app/policies/material_release_policy.rb
@@ -16,7 +16,7 @@ class MaterialReleasePolicy < ReleasePolicy
  end

  def destroy?
-    true
+    user.manager? || user.account_manager?
  end

  def edit_photos?
--- a/app/policies/medical_release_policy.rb
+++ b/app/policies/medical_release_policy.rb
@@ -0,0 +1,41 @@
+class MedicalReleasePolicy < ReleasePolicy
+  def create?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def update?
+    !record.native?
+  end
+
+  def destroy?
+    user.manager? || user.account_manager?
+  end
+
+  def edit_photos?
+    true
+  end
+  
+  def index?
+    true
+  end
+
+  def update_photos?
+    edit_photos?
+  end
+
+  def tag_multiple?
+    true
+  end
+
+  def download_single?
+    user.account_manager?
+  end
+
+  def download_multiple?
+    download_single?
+  end
+end
--- a/app/policies/misc_release_policy.rb
+++ b/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?
+    user.manager? || user.account_manager?
+  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
--- a/app/policies/music_release_policy.rb
+++ b/app/policies/music_release_policy.rb
@@ -12,7 +12,7 @@ class MusicReleasePolicy < ReleasePolicy
  end

  def destroy?
-    true
+    user.manager? || user.account_manager?
  end

  def tag_multiple?
--- a/app/policies/talent_release_policy.rb
+++ b/app/policies/talent_release_policy.rb
@@ -12,7 +12,7 @@ class TalentReleasePolicy < ReleasePolicy
  end

  def destroy?
-    true
+    user.manager? || user.account_manager?
  end

  def edit_photos?
--- a/app/views/acquired_media_releases/_form.html.erb
+++ b/app/views/acquired_media_releases/_form.html.erb
@@ -4,7 +4,7 @@
    <div class="form-row">
      <%= form.text_field :name, required: true, wrapper_class: "col-12" %>
    </div>
-    <%= form.form_group :categories, label: { text: "Categories" } do %>
+    <%= form.form_group :categories, label: { text: "Licensed property type" } do %>
      <% AcquiredMediaRelease::CATEGORIES.each do |category| %>
        <%= form.check_box :categories, { multiple: true, label: category }, category, false %>
      <% end %>
--- a/app/views/admin/task_requests/show.html.erb
+++ b/app/views/admin/task_requests/show.html.erb
@@ -1,21 +1,49 @@
-<dl>
-  <%= description_list_pair_for @task_request.project.account, :name, custom_label: "Account Name", append: ":" %>
-  <%= description_list_pair_for @task_request.project, :name, custom_label: "Project Name", append: ":" %>
-  <%= description_list_pair_for @task_request, :description, append: ":" %>
-  <%= description_list_pair_for @task_request, :created_at, append: ":" %>
-  <%= description_list_pair_for @task_request, :user_email, append: ":" %>
-  <%= description_list_pair_for @task_request, :deadline, append: ":" %>
-  <%= description_list_pair_for @task_request, :time_allowed, append: ":" %>
-  <%= description_list_pair_for @task_request, :additional_notes, append: ":" %>
-  <%= description_list_pair_for @task_request, :status, append: ":" %>
-  <dt>Files:</dt>
-  <dd>
-    <% if @task_request.files.present? %>
-      <% @task_request.files.each do |file| %>
-        <%= link_to file.filename, rails_blob_path(file, disposition: 'attachment'), class: "btn btn-link" %><br/>
-      <% end %>
-    <% else %>
-      No files attached
-    <% end %>
-  </dd>
-</dl>
+<div class="card shadow-sm">
+  <%= card_header text: "Task Details", close_action_path: [:admin, :task_requests] %>
+  <div class="card-body">
+    <div class="row">
+      <div class="col-md-6 col-sm-12">
+        <dl>
+          <%= description_list_pair_for @task_request.project.account, :name, custom_label: "Account Name", append: ":" %>
+          <%= description_list_pair_for @task_request.project, :name, custom_label: "Project Name", append: ":" %>
+          <%= description_list_pair_for @task_request, :created_at, append: ":" %>
+          <%= description_list_pair_for @task_request, :user_email, append: ":" %>
+          <%= description_list_pair_for @task_request, :status, append: ":" %>
+        </dl>
+      </div>
+      <div class="col-md-6 col-sm-12">
+        <dl>
+          <%= description_list_pair_for @task_request, :deadline, append: ":" %>
+          <%= description_list_pair_for @task_request, :time_allowed, append: ":" %>
+          <%= description_list_pair_for @task_request, :description, append: ":" %>
+          <%= description_list_pair_for @task_request, :additional_notes, append: ":" %>
+        </dl>
+      </div>
+      <div class="col-md-12">
+        <h2 class="h6 mt-3">Files:</h2>
+        <div class="pt-2 mx-n3">
+          <table class="table table-striped tr-px-4 align-all-middle">
+            <thead class="thead-light">
+              <tr>
+                <th>Filename</th>
+                <th></th>
+              </tr>
+            </thead>
+            <tbody id="task_requests">
+              <% if @files.any? %>
+                <%= render partial: "task_requests/file", collection: @files %>
+              <% else %>
+                <tr>
+                  <td colspan="12" class="py-4 text-center text-muted"><%= t(".empty") %></td>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
+          <div class="mt-4" id="task_requests_pagiantion">
+            <%= will_paginate @files %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
--- a/app/views/appearance_releases/_appearance_release.html.erb
+++ b/app/views/appearance_releases/_appearance_release.html.erb
@@ -2,7 +2,7 @@
  <td data-behavior="select"><%= check_box_tag "appearance_release_ids[]", appearance_release.id, false %></td>
  <td>
    <% if appearance_release.photo.attached? %>
-      <%= image_tag medium_variant(appearance_release.photo), class: "img-fluid" %>
+      <%= image_tag medium_variant(appearance_release.photo) %>
    <% else %>
      <%= fa_icon("warning", text: t(".no_photos"), class: "text-danger") %>
    <% end %>
@@ -11,10 +11,11 @@
    <%= appearance_release.name %>
  </td>
  <td>
-    <%= number_to_phone appearance_release.person_phone %>
-  </td>
-  <td>
-    <%= mail_to appearance_release.person_email %>
+    <%= contact_info( 
+      address: appearance_release.person_address, 
+      phone: appearance_release.person_phone, 
+      email: appearance_release.person_email
+    ) %>
  </td>
  <td>
    <%= notes_preview appearance_release.notes.order_by_recent %>
--- a/app/views/appearance_releases/_form.html.erb
+++ b/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 %>

@@ -52,27 +63,43 @@
      <% end %>
      <div class="d-inline-block">
        <%= form.hidden_field :person_photo, value: form.object.person_photo.signed_id if appearance_release.person_photo.attached?%>
-        <%= form.file_field :person_photo, wrapper_class: "required", hide_label: true, required: !appearance_release.person_photo.attached?, data: { ujs_target: "person-photo-input" }, help: "PNG or JPG only", accept: appearance_release.class.face_photo_acceptable_content_types.join(",") %>
+        <%= form.file_field :person_photo, hide_label: true, data: { ujs_target: "person-photo-input" }, help: "PNG or JPG only", accept: appearance_release.class.face_photo_acceptable_content_types.join(",") %>
      </div>
    </div>

    <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 %>
--- a/app/views/appearance_releases/index.html.erb
+++ b/app/views/appearance_releases/index.html.erb
@@ -46,8 +46,7 @@
        <th data-behavior="all-selectable"><%= check_box_tag "appearance_release_ids[]", false, false %></th>
        <th></th>
        <th><%= AppearanceRelease.human_attribute_name(:person_name) %></th>
-        <th><%= AppearanceRelease.human_attribute_name(:person_phone) %></th>
-        <th><%= AppearanceRelease.human_attribute_name(:person_email) %></th>
+        <th><%= AppearanceRelease.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>
--- a/app/views/blank_contracts/pdf.html.erb
+++ b/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? %>
--- a/app/views/broadcasts/_file.html.erb
+++ b/app/views/broadcasts/_file.html.erb
@@ -1,4 +1,4 @@
-<li class="my-2">
+<li class="my-2" id="<%= dom_id(file) %>">
  <% if file.variable? %>
    <%= link_to image_tag(file.variant(resize_and_pad: [300, 300, background: "#F7F8F9"]), class: "bg-light img-thumbnail img-fluid"), file, target: "_blank" %>
  <% else %>
--- a/app/views/broadcasts/_file_form.html.erb
+++ b/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" %>
+  <%= 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 %>
--- a/app/views/broadcasts/_files_section.html.erb
+++ b/app/views/broadcasts/_files_section.html.erb
@@ -0,0 +1,21 @@
+<div class="text-center pb-2" id="broadcast_file_form_<%= broadcast.token %>">
+  <% if controller.class.module_parent.to_s == "Public" %>
+    <%= render partial: "public/broadcasts/file_form", locals: { model: [broadcast], token: broadcast.token } %>
+  <% else %>
+    <%= render partial: "broadcasts/file_form", locals: { model: [broadcast.project, broadcast], token: broadcast.token } %>
+  <% end %>
+</div>
+<div class="overflow-auto mh-30">
+  <ul class="list-unstyled d-flex flex-column align-items-center text-center" id="broadcast_file_list_<%= broadcast.token %>">
+    <% if files.present? %>
+      <%= render partial: "broadcasts/file", collection: files %>
+    <% else %>
+      <li class="my-3">
+        Files will appear here.
+      </li>
+    <% end %>
+  </ul>
+  <div class="d-flex mt-2 justify-content-center" id="broadcast_files_pagination_<%= broadcast.token %>">
+    <%= will_paginate(files, param_name: 'files_page', params: { active_files_tab: broadcast.token }) if files.present? %>
+  </div>
+</div>
--- a/app/views/broadcasts/show.html.erb
+++ b/app/views/broadcasts/show.html.erb
@@ -3,7 +3,13 @@
    <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" current="false" content="<%= multi_view_broadcast.token %>">
+    <% end %>
  <% end %>
 <% end %>

@@ -24,12 +30,10 @@
        <div class="d-flex justify-content-between align-items-center">
          <h1 class="h3 m-0"><%= @broadcast.name %></h1>
          <div class="dropdown">
-            <a class="btn btn-light border dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              Switch View
-            </a>
+            <%= link_to "Switch View", "#", class: "btn btn-light border dropdown-toggle", role: "button", id: "dropdownMenuLink", data: { toggle: "dropdown" }, aria: { haspopup: "true", expanded: "false" } %>
            <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
              <h5 class="dropdown-header">Live Streams</h5>
-              <span class="dropdown-item active"><%= fa_icon("check", text: @broadcast.name.titleize) %></span>
+              <%= link_to fa_icon("check", text: @broadcast.name.titleize), "#", class: "dropdown-item active" %>
              <% @multi_view_broadcasts.each do |broadcast| %>
                <% if broadcast.id != @broadcast.id %>
                  <%= link_to broadcast.name.titleize, broadcast.url, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
@@ -72,13 +76,10 @@
      <div class="card-header">
        <ul class="nav nav-tabs card-header-tabs">
          <li class="nav-item">
-            <a class="<%= class_string("nav-link", "active" => !params[:active_tab].present?) %>" href="#home" data-toggle="tab">Home</a>
+            <%= link_to "Home", "#home", class: class_string("nav-link", "active" => !params[:active_tab].present?), data: { toggle: "tab" } %>
          </li>
          <li class="nav-item">
-            <a class="<%= class_string("nav-link", "active" => params[:active_tab] == "files") %>" href="#files" data-toggle="tab">Files</a>
-          </li>
-          <li class="nav-item">
-            <a class="<%= class_string("nav-link", "active" => params[:active_tab] == "recordings") %>" href="#recordings" data-toggle="tab">Previous Sessions</a>
+            <%= link_to "Previous Sessions", "#recordings", class: class_string("nav-link", "active" => params[:active_tab] == "recordings"), data: { toggle: "tab" } %>
          </li>
        </ul>
      </div>
@@ -118,30 +119,6 @@
            <p class="card-text">If you want to join the ZOOM meeting dedicated to this broadcast, follow the link below.</p>
            <%= link_to 'Video Conference', @conference_url, class: 'btn btn-primary btn-block', target: '_blank' %>
          </div>
-          <div class="<%= class_string("tab-pane fade show", "active" => params[:active_tab] == 'files') %>" id="files">
-            <div class="text-center pb-2" id="broadcast_file_form">
-              <% if controller.class.module_parent.to_s == "Public" %>
-                <%= render partial: "public/broadcasts/file_form", locals: { model: [@broadcast], token: @broadcast.token } %>
-              <% else %>
-                <%= render partial: "broadcasts/file_form", locals: { model: [@project, @broadcast] } %>
-              <% end %>
-            </div>
-            <p class="alert alert-info mt-2"><%= fa_icon("warning", text: "You may need to refresh the page to see new files uploaded by other team members") %></p>
-            <div class="overflow-auto mh-30">
-              <ul class="list-unstyled d-flex flex-column align-items-center text-center" id="broadcast_file_list">
-                <% if @files.present? %>
-                  <%= render partial: "broadcasts/file", collection: @files %>
-                <% else %>
-                  <li class="my-3">
-                    Files will appear here.
-                  </li>
-                <% end %>
-              </ul>
-              <div class="d-flex mt-2 justify-content-center" id="broadcast_files_pagination">
-                <%= will_paginate(@files, params: { active_tab: 'files' })  if @files.present? %>
-              </div>
-            </div>
-          </div>
          <div class="<%= class_string("tab-pane fade show", "active" => params[:active_tab] == 'recordings') %>" id="recordings">
            <div id="broadcast_recordings">
              <%= render partial: 'broadcasts/broadcast_recordings', locals: { recordings: @recordings, broadcast: @broadcast } %>
@@ -150,5 +127,36 @@
        </div>
      </div>
    </div>
+
+    <!-- files section -->
+    <div id="files" class="card shadow-sm mb-3">
+      <div class="card-header">
+        <h2 class="h5">Files</h2>
+        <% if @multi_view_broadcasts %>
+          <ul class="nav nav-tabs card-header-tabs">
+            <% @multi_view_broadcasts.each_with_index do |mvb, index| %>
+              <li class="nav-item">
+                <%= link_to mvb.name, "#files_broadcast_#{mvb.token}", class: class_string("nav-link", "active" => (params[:active_files_tab] == mvb.token || (params[:active_files_tab].nil? && index == 0))), data: { toggle: "tab" } %>
+              </li>
+            <% end %>
+          </ul>
+        <% end %>
+      </div>
+      <div class="card-body p-3">
+        <div class="tab-content">
+          <% if @multi_view_broadcasts.present? %>
+            <% @multi_view_broadcasts.each_with_index do |mvb, index| %>
+              <div class="<%= class_string("tab-pane fade show", "active" => (params[:active_files_tab] == mvb.token || (params[:active_files_tab].nil? && index == 0))) %>" id="files_broadcast_<%= mvb.token %>">
+                <%= render partial: 'broadcasts/files_section', locals: { broadcast: mvb, files: mvb.files } %>
+              </div>
+            <% end %>
+          <% else %>
+            <div class="tab-pane fade show active" id="files_broadcast_<%= @broadcast.id %>">
+              <%= render partial: 'broadcasts/files_section', locals: { broadcast: @broadcast, files: @files } %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
  </div>
-<div>
+</div>
--- a/app/views/broadcasts/update.js.erb
+++ b/app/views/broadcasts/update.js.erb
@@ -1,5 +1,9 @@
-$("#broadcast_file_form").html("<%= j render(partial: "broadcasts/file_form", locals: { model: [@project, @broadcast] }) %>");
-$("#broadcast_file_list").html("<%= j render(partial: "broadcasts/file", collection: @files) %>");
-$("#broadcast_files_pagination").html("<%= j will_paginate(@files) %>");
+$("#broadcast_file_form_<%= @broadcast.token %>").html("<%= j render(partial: "broadcasts/file_form", locals: { model: [@project, @broadcast], token: @broadcast.token }) %>");

-bsCustomFileInput.init();
+var file_id = "#<%= dom_id(@files.first) %>"
+if ($("#broadcast_file_list_<%= @broadcast.token %>").has(file_id).length == 0) {
+  $("#broadcast_file_list_<%= @broadcast.token %>").html("<%= j render(partial: "broadcasts/file", collection: @files) %>");
+  $("#broadcast_files_pagination_<%= @broadcast.token %>").html("<%= j will_paginate(@files, param_name: 'files_page', params: { active_files_tab: @broadcast.token }) %>");
+}
+
+bsCustomFileInput.init();
--- a/app/views/contract_templates/_form.html.erb
+++ b/app/views/contract_templates/_form.html.erb
@@ -2,21 +2,20 @@
  <%= 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: "#guardian_clause", show_values: %w(appearance talent) }, 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">
-      <%= form.number_field :fee, min:"0", max:"99999999",  step: "0.01", prepend: "$", help: "Leave at $0.00 for no-fee", wrapper_class: "col-sm-6" %>
+    <div class="form-row" id="fee_field">
+      <%= form.number_field :fee, min:"0", max:"99999999", step: "0.01", prepend: "$", wrapper_class: "col-sm-6" %>
    </div>
  <% end %>

  <hr>

-  <%= field_set_tag content_tag(:span, t(".exploitable_rights.heading"), class: "h6 text-muted text-uppercase")do %>
+  <%= field_set_tag content_tag(:span, t(".exploitable_rights.heading"), class: "h6 text-muted text-uppercase"), id: "exploitable_rights_fields" do %>
    <%= render "shared/exploitable_rights_fields", form: form %>
+    <hr>
  <% end %>

-  <hr>
-
  <%= field_set_tag content_tag(:span, t(".legal.heading"), class: "h6 text-muted text-uppercase") do %>
    <%= form.form_group do %>
      <%= form.rich_text_area :body %>
@@ -28,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">
--- a/app/views/contracts/_medical_questionnaire.html.erb
+++ b/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 %>
--- a/app/views/contracts/_photos.html.erb
+++ b/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>

--- a/app/views/contracts/_signature_page.html.erb
+++ b/app/views/contracts/_signature_page.html.erb
@@ -29,6 +29,7 @@
  <% if releasable.model_name == "LocationRelease" %>
    <%= description_list_pair "Filming Started On:", releasable&.filming_started_on&.strftime("%D") %>
    <%= description_list_pair "Filming Ended On:", releasable&.filming_ended_on&.strftime("%D") %>
+    <%= description_list_pair "Filming Hours:", releasable&.filming_hours %>
  <% end %>
  <% if contract_template.fee? %>
    <%= description_list_pair "Fee:", number_to_currency(contract_template.fee) %>
@@ -55,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 %>
--- a/app/views/contracts/pdf.html.erb
+++ b/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>
--- a/app/views/location_releases/_form.html.erb
+++ b/app/views/location_releases/_form.html.erb
@@ -11,14 +11,10 @@

  <%= field_set_tag content_tag(:span, t(".signer_details.heading"), class: "h6 text-muted text-uppercase") do %>
    <div class="form-row">
-      <%= form.text_field :person_first_name, wrapper_class: "col-sm-3" %>
-      <%= form.text_field :person_last_name, wrapper_class: "col-sm-3" %>
+      <%= 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" %>
-    </div>
-    <div class="form-row">
      <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
-    </div>
-    <div class="form-row">
      <%= form.text_field :person_company, wrapper_class: "col-sm-6" %>
      <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
    </div>
@@ -38,6 +34,7 @@
    <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" %>
    </div>
  <% end %>

--- a/app/views/material_releases/_form.html.erb
+++ b/app/views/material_releases/_form.html.erb
@@ -13,14 +13,10 @@

  <%= field_set_tag content_tag(:span, t(".signer_details.heading"), class: "h6 text-muted text-uppercase") do %>
    <div class="form-row">
-      <%= form.text_field :person_first_name, wrapper_class: "col-sm-3" %>
-      <%= form.text_field :person_last_name, wrapper_class: "col-sm-3" %>
+      <%= 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" %>
-    </div>
-    <div class="form-row">
      <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
-    </div>
-    <div class="form-row">
      <%= form.text_field :person_company, wrapper_class: "col-sm-6" %>
      <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
    </div>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Senad Uka	71ad502cc1	Taskme update	2020-06-30 05:08:23 +02:00
Senad Uka	1cd125382f	Task me sync	2020-06-26 04:57:23 +02:00
Senad Uka	749aad3467	Task me upstream sync	2020-06-25 08:47:10 +02:00
Senad Uka	c167889ea3	Upstream sync task me mvp	2020-06-24 04:49:28 +02:00
Senad Uka	3e917c29f0	task me sync	2020-06-19 12:32:50 +02:00