Upstream sync

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

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

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 video_analysis)
   end
 
   def project_params_with_current_account

app/controllers/public/location_releases_controller.rb

@@ -64,7 +64,8 @@ class Public::LocationReleasesController < Public::BaseController
       :person_address_country,
       :signature_base64,
       :locale, :contract_template, :filming_started_on, :filming_ended_on,
-      :filming_hours
+      :filming_hours,
+      photos: []
     )
   end
 

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
 

app/controllers/public/medical_releases_controller.rb

@@ -0,0 +1,81 @@
+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,
+        :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 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

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
@@ -16,6 +16,12 @@ class ZoomNotificationsController < ApplicationController
     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_event
       Rails.logger.info notification
@@ -42,6 +48,10 @@ class ZoomNotificationsController < ApplicationController
     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
     @zoom_meeting = ZoomMeeting.find_by!(api_meeting_id: notification_meeting_id)
   end

app/helpers/dropzone_helper.rb

@@ -3,8 +3,12 @@ module DropzoneHelper
     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"
+    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"
     else

app/jobs/attach_recording_to_zoom_meeting_job.rb

@@ -1,4 +1,3 @@
-require 'zoom_gateway'
 class AttachRecordingToZoomMeetingJob < ApplicationJob
   queue_as :default
 

app/models/account.rb

@@ -55,6 +55,7 @@ class Account < ApplicationRecord
         User.joins(:project_memberships).where(project_memberships: { project: projects }),
         Broadcast.where(project: projects),
         ZoomMeeting.where(project: projects),
+        MedicalRelease.where(project: projects),
         self
       ])).sum(:byte_size).to_f
   end

app/models/contract_template.rb

@@ -13,6 +13,7 @@ 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
 
   monetize :fee_cents
   has_rich_text :body

app/models/medical_release.rb

@@ -0,0 +1,71 @@
+class MedicalRelease < ApplicationRecord
+  include Contractable
+  include Notable
+  include Photoable
+  include Releasable
+  include Searchable
+  include Signable
+  include Syncable
+  include PersonName
+
+  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 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 minor?
+    false
+  end
+
+  def contract_file_name
+    "#{project.name.parameterize}_#{contract_template.release_type}_#{(signed_at || created_at).strftime("%Y.%m.%d")}_#{release_number}_#{filename_suffix.parameterize}"
+  end
+end

app/models/project.rb

@@ -3,8 +3,8 @@ class Project < ApplicationRecord
   include Filterable
   include Syncable
 
-  SIGNABLE_RELEASE_TYPES = %w(talent appearance acquired_media location material)
-  AVAILABLE_RELEASE_TYPES = %w(appearance location material acquired_media talent music)
+  SIGNABLE_RELEASE_TYPES = %w(talent appearance acquired_media location material medical)
+  AVAILABLE_RELEASE_TYPES = %w(appearance location material acquired_media talent music medical)
 
   belongs_to :account
   has_many :acquired_media_releases, dependent: :destroy
@@ -13,6 +13,7 @@ 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 :videos, dependent: :destroy
   has_many :imports, dependent: :destroy
   has_many :contract_templates, dependent: :destroy
@@ -33,6 +34,7 @@ class Project < ApplicationRecord
       material_release: false,
       music_release: false,
       talent_release: false,
+      medical_release: false,
       video_analysis: false,
     }
   end
@@ -65,6 +67,7 @@ class Project < ApplicationRecord
         material_release: true,
         music_release: true,
         talent_release: true,
+        medical_release: true,
         video_analysis: true,
       }
     when "nat_geo"
@@ -76,6 +79,7 @@ class Project < ApplicationRecord
         material_release: true,
         music_release: true,
         talent_release: true,
+        medical_release: true,
         video_analysis: true,
       }
     else

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)
 
   def initialize(params)
     @params = params

app/models/zoom_meeting.rb

@@ -1,5 +1,3 @@
-require 'zoom_gateway'
-
 class ZoomMeeting < ApplicationRecord
   belongs_to :project, optional: true
   belongs_to :zoom_user

app/models/zoom_user.rb

@@ -1,4 +1,3 @@
-require 'zoom_gateway'
 require 'securerandom'
 class ZoomUser < ApplicationRecord
   has_many :zoom_meetings, dependent: :nullify

app/policies/medical_release_policy.rb

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

app/views/medical_releases/_medical_release.html.erb

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

app/views/medical_releases/index.html.erb

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

app/views/medical_releases/index.js.erb

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

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

@@ -45,6 +45,10 @@
         </div>
       <% end %>
 
+      <%= card_field_set_tag t(".photos.heading") do %>
+        <%= render "shared/photos_dropzone_fields", form: form, release: @location_release %>
+      <% end %>
+
       <%= card_field_set_tag t(".signature.heading") do %>
         <%= render "shared/signature_fields", form: form, instruction: 'An Authorized Signatory' %>
       <% end %>

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

@@ -34,6 +34,10 @@
         <%= render "shared/address_fields", form: form, subject: "person" %>
       <% end %>
 
+      <%= card_field_set_tag t(".photo.heading") do %>
+        <%= render "shared/photos_dropzone_fields", form: form, release: @material_release %>
+      <% end %>
+
       <hr>
 
       <%= card_field_set_tag t(".signature.heading") do %>

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

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

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

@@ -0,0 +1,43 @@
+<div class="card shadow-sm">
+  <div class="card-body">
+    <%= errors_summary_for @medical_release %>
+    <%= bootstrap_form_with model: [@account, @project, @contract_template, @medical_release], local: true, validation_context: :native do |form| %>
+      <div class="alert alert-warning font-weight-bold"><%= t ".instructions_html", name: @project.name %></div>
+      <%= card_field_set_tag t(".legal.heading") do %>
+        <p><%= @contract_template.body %></p>
+        <% if @contract_template.fee? %>
+          <p>
+            Fee <span class="font-weight-bold text-success"><%= number_to_currency @contract_template.fee %></span>
+          </p>
+        <% end %>
+      <% end %>
+
+      <hr>
+
+      <%= card_field_set_tag t(".personal_info.heading") do %>
+        <div class="alert alert-warning font-weight-bold"><%= t ".personal_info.instructions" %></div>
+        <div class="form-row">
+          <%= form.text_field :person_first_name, required: true, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :person_last_name, required: true, wrapper_class: "col-sm-6" %>
+          <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
+          <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
+        </div>
+        <%= render "shared/address_fields", form: form, subject: "person" %>
+      <% end %>
+
+      <hr>
+
+      <%= card_field_set_tag t(".photo.heading") do %>
+        <%= render "shared/photos_dropzone_fields", form: form, release: @medical_release %>
+      <% end %>
+
+      <%= card_field_set_tag t(".signature.heading") do %>
+        <%= render "shared/signature_fields", form: form %>
+      <% end %>
+
+      <div class="mt-5">
+        <%= form.button t("shared.submit_release_long"), class: "btn btn-block btn-lg btn-success", data: { disable_with: t("shared.disable_with") } %>
+      </div>
+    <% end %>
+  </div>
+</div>

app/views/shared/_address_fields.html.erb

@@ -11,6 +11,6 @@
 </div>
 <%= form.form_group "#{field_name_prefix}address_country" do %>
   <%= form.label "#{field_name_prefix}address_country" %>
-  <%= form.country_select "#{field_name_prefix}address_country", { priority: %w(US CA), prompt: true }, class: "form-control custom-select" %>
+  <%= form.country_select "#{field_name_prefix}address_country", { selected: 'US', priority: %w(US CA), prompt: true }, class: "form-control custom-select" %>
 <% end %>