Task me sync

2020-06-03 07:24:01 +02:00
parent e3d4d22a34
commit 88836e937e
76 changed files with 847 additions and 497 deletions
--- a/app/assets/javascripts/channels/broadcasts.coffee
+++ b/app/assets/javascripts/channels/broadcasts.coffee
@@ -17,7 +17,6 @@ $(document).on "turbolinks:load", ->
      switch data.event
        when "broadcast_stream_update" then @refreshBroadcastVideo(data)
        when "stream_recording_ready" then @showBroadcastRecordings(data)
-        when "file_upload_update" then @refreshFilesTab(data)

    refreshBroadcastVideo: (data) ->
      $("#broadcast_updates").html data.status_content
@@ -38,8 +37,3 @@ $(document).on "turbolinks:load", ->
      $(".flash-message").html data.flash_content
      $("#broadcast_recordings").html data.recordings_content
      $("#broadcast_recordings_nav").html data.recordings_nav_content
-    
-    refreshFilesTab: (data) ->
-      $("#broadcast_file_list").html data.files_content
-      $("#broadcast_files_pagination").html data.pagination_content
-      
--- a/app/assets/javascripts/channels/projects.coffee
+++ b/app/assets/javascripts/channels/projects.coffee
@@ -16,7 +16,6 @@ $(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/channels/broadcasts_channel.rb
+++ b/app/channels/broadcasts_channel.rb
@@ -28,20 +28,10 @@ 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.file_upload_updates(broadcast, files, pagination_content)
-    files_content = ApplicationController.render partial: "broadcasts/file", collection: files
-
-    broadcast_to broadcast, {
-      event: :file_upload_update,
-      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,12 +25,4 @@ 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/admin/task_requests_controller.rb
+++ b/app/controllers/admin/task_requests_controller.rb
@@ -0,0 +1,32 @@
+class Admin::TaskRequestsController < Admin::ApplicationController
+  before_action :set_task_request, only: [:edit, :update]
+
+  def index
+    @task_requests = task_requests.order_by_recent.paginate(page: params[:page])
+  end
+
+  def edit
+  end
+
+  def update
+    if @task_request.update(task_request_params)
+      redirect_to [:admin, :task_requests], notice: t(".notice")
+    else
+      render :edit
+    end
+  end
+
+  private
+
+  def task_request_params
+    params.require(:task_request).permit(:status, :deliverable_url)
+  end
+
+  def task_requests
+    policy_scope TaskRequest
+  end
+
+  def set_task_request
+    @task_request = authorize policy_scope(TaskRequest).find(params[:id])
+  end
+end
--- a/app/controllers/appearance_release_imports_controller.rb
+++ b/app/controllers/appearance_release_imports_controller.rb
@@ -3,6 +3,7 @@
 class AppearanceReleaseImportsController < ApplicationController
  include AppearanceReleaseContext
  include ProjectContext
+  include CreateReleasableJobs

  before_action :set_project, only: [:create]

@@ -10,16 +11,24 @@ 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
-      filtered_attachments = filter_attachments attachments
-      MatchAppearanceReleasesJob.perform_later(@project, filtered_attachments)
-      notice_message = t 'appearance_releases.create.matching_started'
-      redirect_to [@project, :appearance_releases], notice: notice_message
+      attachments.each do |attachment|
+        create_imported_appearance_release attachment
+      end
    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
@@ -36,18 +45,45 @@ class AppearanceReleaseImportsController < ApplicationController
    params.require(:attachments)
  end

-  def filter_attachments(attachments)
-    filtered_attachments = []
-    attachments.each do |attachment|
-      blob = ActiveStorage::Blob.find_signed attachment
-      next if blob.nil?
+  def build_appearance_release(params = {})
+    authorize appearance_releases.build(params)
+  end

-      extension = blob.filename.extension
-      filtered_attachments << attachment if blob.image? || extension == 'pdf'
+  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
  end
-
-  def acceptable_extensions
-    AppearanceRelease.acceptable_import_file_extensions
-  end
 end
--- a/app/controllers/broadcasts_controller.rb
+++ b/app/controllers/broadcasts_controller.rb
@@ -27,9 +27,6 @@ class BroadcastsController < ApplicationController
  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] })
-    BroadcastsChannel.file_upload_updates(@broadcast, @files, pagination_content)
  end

  def show
--- a/app/controllers/password_resets_controller.rb
+++ b/app/controllers/password_resets_controller.rb
@@ -18,7 +18,6 @@ class PasswordResetsController < ApplicationController
  end

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

  def update
--- a/app/controllers/public/broadcasts_controller.rb
+++ b/app/controllers/public/broadcasts_controller.rb
@@ -14,9 +14,6 @@ class Public::BroadcastsController < Public::BaseController
  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] })
-    BroadcastsChannel.file_upload_updates(@broadcast, @files, pagination_content)
  end

  private
--- a/app/controllers/task_requests_controller.rb
+++ b/app/controllers/task_requests_controller.rb
@@ -0,0 +1,74 @@
+class TaskRequestsController < ApplicationController
+  layout "project"
+
+  before_action :set_project
+  before_action :build_task_request, only: [:new, :create]
+  before_action :set_task_request, only: [:show, :edit, :update, :cancel]
+
+  def index
+    if params[:completed_only]
+      @task_requests = task_requests.completed.order_by_recent.paginate(page: params[:page])
+    else
+      @task_requests = task_requests.order_by_recent.paginate(page: params[:page])
+    end
+  end
+
+  def new
+  end
+
+  def create
+    @task_request.attributes = task_request_params
+
+    if @task_request.save
+      log_create_analytics
+      redirect_to [@project, :task_requests], notice: t(".notice")
+    else
+      render :new
+    end
+  end
+
+  def show
+  end
+  
+  def edit
+  end
+
+  def update
+    if @task_request.update(task_request_params)
+      redirect_to [@project, :task_requests], notice: t(".notice")
+    else
+      render :edit
+    end
+  end
+
+  def cancel
+    @task_request.cancelled!
+    redirect_to [@project, :task_requests], notice: t(".notice")
+  end
+
+  private
+
+  def task_request_params
+    params.require(:task_request).permit(:description, :deadline, :time_allowed, :additional_notes, files: [])
+  end
+
+  def set_project
+    @project = policy_scope(Project).find(params[:project_id])
+  end
+
+  def set_task_request
+    @task_request = authorize policy_scope(TaskRequest).find(params[:id])
+  end
+
+  def task_requests
+    authorize policy_scope(@project.task_requests)
+  end
+
+  def build_task_request
+    @task_request = authorize @project.task_requests.build
+  end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_task_request, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
+end
--- a/app/controllers/zoom_notifications_controller.rb
+++ b/app/controllers/zoom_notifications_controller.rb
@@ -13,11 +13,8 @@ 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'])
    else
-      Rails.logger.info notification_event
+      Rails.logger.info notification_type
      Rails.logger.info notification
    end

@@ -26,20 +23,16 @@ class ZoomNotificationsController < ApplicationController

  private

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

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

  def notification_host_id
-    notification.dig(:payload, :object, :host_id)
+    params.dig(:payload, :object, :host_id)
  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") + mail_to(email)
+    content_tag(:abbr, "E: ", title: "Email") + email
  end

  def phone_abbr(phone)
--- a/app/jobs/attach_recording_to_zoom_meeting_job.rb
+++ b/app/jobs/attach_recording_to_zoom_meeting_job.rb
@@ -1,26 +0,0 @@
-require 'zoom_gateway'
-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
@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-class MatchAppearanceReleasesJob < ApplicationJob
-  queue_as :default
-
-  def perform(project, attachments)
-    matching_request = MatchingRequest.create project: project, attachments: attachments
-
-    payload = { request_id: matching_request.id, bucket: aws_bucket_name, files: attachments}
-    response = BrayniacAI::AppearanceReleaseMatching.match_attachments payload
-    # BrayniacAI::QrMatching.enable_logging
-    # response = BrayniacAI::QrMatching.create! payload
-
-    matches = response[:matches] || []
-
-    handle_matches matches, project
-    matching_request.destroy
-  end
-
-  private
-
-  def handle_matches(matches, project)
-    matches.each do |match|
-      contract = match[:contracts].blank? ? nil : match[:contracts].first
-      headshot = match[:headshots].blank? ? nil : match[:headshots].first
-      identifier = match[:identifier]
-
-      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
-end
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -54,7 +54,7 @@ class Account < ApplicationRecord
        Download.where(project: projects),
        User.joins(:project_memberships).where(project_memberships: { project: projects }),
        Broadcast.where(project: projects),
-        ZoomMeeting.where(project: projects),
+        TaskRequest.where(project: projects),
        self
      ])).sum(:byte_size).to_f
  end
@@ -79,6 +79,10 @@ class Account < ApplicationRecord
    plan_uid.to_s == "me_suite" || plan_uid.to_s == "releaseme"
  end

+  def assistme_enabled?
+    plan_uid.to_s == "me_suite" || plan_uid.to_s == "assistme"
+  end
+
  def plan_name
    case plan_uid.to_s
    when "deliverme"
@@ -87,6 +91,8 @@ class Account < ApplicationRecord
      "DirectME"
    when "releaseme"
      "ReleaseME"
+    when "assistme"
+      "AssistME"
    when "me_suite"
      "ME Suite"
    end
--- a/app/models/broadcast.rb
+++ b/app/models/broadcast.rb
@@ -7,6 +7,8 @@ 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,6 +1,8 @@
 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
@@ -1,9 +0,0 @@
-# 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,6 +6,8 @@ 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/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.headshot_collection_uid, appearance_releases_with_photo + project.talent_releases)
+    new(project.id, 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 { |_, v| v.blank? }
+    }
  end

  private
--- a/app/models/matching_request.rb
+++ b/app/models/matching_request.rb
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class MatchingRequest < ApplicationRecord
-  include Attachable
-
-  belongs_to :project
-end
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -4,4 +4,6 @@ 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
@@ -22,6 +22,7 @@ class Project < ApplicationRecord
  has_many :downloads, dependent: :destroy
  has_many :broadcasts, dependent: :destroy
  has_many :zoom_meetings, dependent: :destroy
+  has_many :task_requests, dependent: :destroy

  accepts_nested_attributes_for :project_memberships

--- a/app/models/task_request.rb
+++ b/app/models/task_request.rb
@@ -0,0 +1,8 @@
+class TaskRequest < ApplicationRecord
+  belongs_to :project
+  has_many_attached :files
+
+  enum status: [:pending, :completed, :cancelled]
+
+  scope :order_by_recent, -> { order(created_at: :desc) }
+end
--- a/app/models/zoom_meeting.rb
+++ b/app/models/zoom_meeting.rb
@@ -4,9 +4,6 @@ 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,4 +1,3 @@
-require 'zoom_gateway'
 class ZoomUser < ApplicationRecord
  has_many :zoom_meetings, dependent: :nullify

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

  def destroy?
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -36,4 +36,8 @@ class ProjectPolicy < ApplicationPolicy
  def show_downloads?
    show?
  end
+
+  def show_task_results?
+    show?
+  end
 end
--- a/app/policies/task_request_policy.rb
+++ b/app/policies/task_request_policy.rb
@@ -0,0 +1,25 @@
+class TaskRequestPolicy < ApplicationPolicy
+  def index?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def create?
+    true
+  end
+
+  def destroy?
+    true
+  end
+
+  def update?
+    true
+  end
+
+  def cancel?
+    true
+  end
+end
--- a/app/telemetry/analytics.rb
+++ b/app/telemetry/analytics.rb
@@ -151,6 +151,24 @@ class Analytics
      )
    end
  end
+
+  def track_create_task_request(user_agent:, user_ip:)
+    if analytics_enabled?
+      identify
+      track(
+        {
+          user_id: user.id,
+          event: "Task request created",
+          properties: {
+            account: account.try(:name),
+            account_id: account.try(:id),
+            user_agent: user_agent,
+            ip: user_ip,
+          },
+        }
+      )
+    end
+  end
  
  private

--- a/app/views/admin/application/_side_nav.html.erb
+++ b/app/views/admin/application/_side_nav.html.erb
@@ -7,6 +7,9 @@
      <li class="nav-item">
        <%= link_to fa_icon("users fw", text: "Users"), [:admin, :users], class: class_string("nav-link", "active" => controller_name == "users") %>
      </li>
+      <li class="nav-item">
+        <%= link_to fa_icon("tasks fw", text: "Task Requests"), [:admin, :task_requests], class: class_string("nav-link", "active" => controller_name == "task_requests") %>
+      </li>
      <li class="nav-item">
        <%= link_to fa_icon("bug fw", text: "Errors"), "https://sentry.io/bigmedia/", class: "nav-link", target: :_blank %>
      </li>
--- a/app/views/admin/task_requests/_form.html.erb
+++ b/app/views/admin/task_requests/_form.html.erb
@@ -0,0 +1,13 @@
+<%= errors_summary_for task_request %>
+
+<%= bootstrap_form_with model: model, local: true do |form| %>
+  <%= form.select :status, options_for_select(TaskRequest.statuses.except(:cancelled).keys, task_request.status), { class: "form-control" } %>
+  <%= form.text_field :deliverable_url  %>
+
+  <div class="row align-items-center text-center mt-4">
+    <%= link_to t("shared.cancel"), [:admin, :task_requests], class: "col-3 text-reset" %>
+    <div class="col-9">
+      <%= form.submit class: class_string("btn btn-block", ["btn-success", "btn-primary"] => task_request.new_record?), data: { disable_with: t("shared.disable_with") } %>
+    </div>
+  </div>
+<% end %>
--- a/app/views/admin/task_requests/_task_request.html.erb
+++ b/app/views/admin/task_requests/_task_request.html.erb
@@ -0,0 +1,25 @@
+<tr id="<%= dom_id(task_request) %>">
+  <td>
+    <%= task_request.id %>
+  </td>
+  <td>
+    <%= task_request.created_at.strftime("%D") %>
+  </td>
+  <td>
+    <%= task_request.deadline.try(:strftime, '%D') %>
+  </td>
+  <td>
+    <%= task_request.time_allowed %>
+  </td>
+  <td>
+    <%= task_request.status.titleize %>
+  </td>
+  <td class="text-right">
+    <div class="btn-group">
+      <%= button_tag "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">
+        <%= link_to fa_icon("pencil", text: "Edit"), [:edit, :admin, task_request], class: "dropdown-item" %>
+      </div>
+    </div>
+  </td>
+</tr>
--- a/app/views/admin/task_requests/edit.html.erb
+++ b/app/views/admin/task_requests/edit.html.erb
@@ -0,0 +1,6 @@
+<div class="card shadow-sm">
+  <%= card_header text: "Edit Task Request", close_action_path: [:admin, :task_requests] %>
+  <div class="card-body">
+    <%= render "form", model: [:admin, @task_request], task_request: @task_request %>
+  </div>
+</div>
--- a/app/views/admin/task_requests/index.html.erb
+++ b/app/views/admin/task_requests/index.html.erb
@@ -0,0 +1,23 @@
+<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>Task ID</th>
+        <th>Created On</th>
+        <th>Deadline</th>
+        <th>Time Allowed</th>
+        <th>Status</th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody id="users">
+      <% if @task_requests.any? %>
+        <%= render @task_requests %>
+      <% else %>
+        <tr>
+          <td colspan="6" class="py-4 text-center text-muted"><%= t(".empty") %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</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) %>
+      <%= image_tag medium_variant(appearance_release.photo), class: "img-fluid" %>
    <% else %>
      <%= fa_icon("warning", text: t(".no_photos"), class: "text-danger") %>
    <% end %>
@@ -11,11 +11,10 @@
    <%= appearance_release.name %>
  </td>
  <td>
-    <%= contact_info( 
-      address: appearance_release.person_address, 
-      phone: appearance_release.person_phone, 
-      email: appearance_release.person_email
-    ) %>
+    <%= number_to_phone appearance_release.person_phone %>
+  </td>
+  <td>
+    <%= mail_to 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
@@ -52,7 +52,7 @@
      <% 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, hide_label: true, 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, 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(",") %>
      </div>
    </div>

--- a/app/views/appearance_releases/index.html.erb
+++ b/app/views/appearance_releases/index.html.erb
@@ -46,7 +46,8 @@
        <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(:contact_info) %></th>
+        <th><%= AppearanceRelease.human_attribute_name(:person_phone) %></th>
+        <th><%= AppearanceRelease.human_attribute_name(:person_email) %></th>
        <th><%= t(".table_headers.notes") %></th>
        <th><%= t(".table_headers.tags") %></th>
        <th><%= t(".table_headers.signed_at") %></th>
--- a/app/views/application/_sidebar.html.erb
+++ b/app/views/application/_sidebar.html.erb
@@ -35,6 +35,12 @@
          <%= product_wordmark :deliver_me, class: class_string("d-inline-block", "disabled" => !Current.account.deliverme_enabled?) %>
        <% end %>
      </li>
+      <li class="nav-item">
+        <%= link_to [project, :task_requests], class: class_string("nav-link", "active" => controller_name == "task_requests") do %>
+          <%= lock_icon_for(Current.account, :assistme) %>
+          <%= product_wordmark :assist_me, class: class_string("d-inline-block", "disabled" => !Current.account.assistme_enabled?) %>
+        <% end %>
+      </li>
    </ul>
  </nav>
  <hr class="divider-light mx-n4">
--- a/app/views/broadcasts/_file.html.erb
+++ b/app/views/broadcasts/_file.html.erb
@@ -1,4 +1,4 @@
-<li class="my-2" id="<%= dom_id(file) %>">
+<li class="my-2">
  <% 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/show.html.erb
+++ b/app/views/broadcasts/show.html.erb
@@ -126,6 +126,7 @@
                <%= 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? %>
@@ -137,7 +138,7 @@
                <% 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? %>
+                <%= will_paginate(@files, params: { active_tab: 'files' })  if @files.present? %>
              </div>
            </div>
          </div>
--- a/app/views/broadcasts/update.js.erb
+++ b/app/views/broadcasts/update.js.erb
@@ -1,9 +1,5 @@
 $("#broadcast_file_form").html("<%= j render(partial: "broadcasts/file_form", locals: { model: [@project, @broadcast] }) %>");
-
-var file_id = "#<%= dom_id(@files.first) %>"
-if ($("#broadcast_file_list").has(file_id).length == 0) {
-  $("#broadcast_file_list").html("<%= j render(partial: "broadcasts/file", collection: @files) %>");
-  $("#broadcast_files_pagination").html("<%= j will_paginate(@files) %>");
-}
+$("#broadcast_file_list").html("<%= j render(partial: "broadcasts/file", collection: @files) %>");
+$("#broadcast_files_pagination").html("<%= j will_paginate(@files) %>");

 bsCustomFileInput.init();
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -16,6 +16,11 @@
      <%= link_to t("projects.show.downloads"), [@project, :downloads], class: "text-decoration-none text-reset stretched-link" %>
    <% end %>
  <% end %>
+  <% if policy(Project).show_task_results? %>
+    <%= render "folder_card" do %>
+      <%= link_to t("projects.show.task_requests"), [@project, :task_requests, completed_only: true], class: "text-decoration-none text-reset stretched-link" %>
+    <% end %>
+  <% end %>
 </div>

 <hr/>
--- a/app/views/public/broadcasts/update.js.erb
+++ b/app/views/public/broadcasts/update.js.erb
@@ -1,9 +1,5 @@
 $("#broadcast_file_form").html("<%= j render(partial: "public/broadcasts/file_form", locals: { model: [@project, @broadcast], token: @broadcast.token }) %>");
-
-var file_id = "#<%= dom_id(@files.first) %>"
-if ($("#broadcast_file_list").has(file_id).length == 0) {
-  $("#broadcast_file_list").html("<%= j render(partial: "broadcasts/file", collection: @files) %>");
-  $("#broadcast_files_pagination").html("<%= j will_paginate(@files) %>");
-}
+$("#broadcast_file_list").html("<%= j render(partial: "broadcasts/file", collection: @files) %>");
+$("#broadcast_files_pagination").html("<%= j will_paginate(@files) %>");

 bsCustomFileInput.init();
--- a/app/views/task_requests/_form.html.erb
+++ b/app/views/task_requests/_form.html.erb
@@ -0,0 +1,34 @@
+<%= errors_summary_for task_request %>
+
+<%= bootstrap_form_with model: model, local: true do |form| %>
+  <%= form.text_area :description %>
+  <%= form.text_field :deadline, class: "datepicker-control"  %>
+  <%= form.text_field :time_allowed  %>
+  <%= form.text_area :additional_notes %>
+  <%= field_set_tag content_tag(:span, "Files", class: "h6 text-muted text-uppercase") do %>
+    <div class="field d-none">
+      <%= form.label :files %>
+      <%= form.file_field :files, disable: true, direct_upload: true, multiple: true, id: "task_request_files", hide_label: true %>
+      <% task_request.files.each do |file| %>
+        <% unless file.persisted? %>
+          <%= hidden_field_tag "#{task_request.model_name.param_key}[files][]", file.signed_id %>
+        <% end %>
+      <% end %>
+    </div>
+
+    <div class="dropzone field border-dashed" 
+      data-accepted-files="audio/*,image/*,video/*,application/*"
+      data-behavior="dropzone" 
+      data-file-input-id="task_request_files" 
+      data-existing-files="<%= mock_photos_json(task_request.files) %>" 
+      data-placeholder="<%= dropzone_placeholder_message_for(task_request) %>"
+      data-submit-button="#submit_folder"></div>
+  <% end %>
+
+  <div class="row align-items-center text-center mt-4">
+    <%= link_to t("shared.cancel"), [project, :task_requests], class: "col-3 text-reset" %>
+    <div class="col-9">
+      <%= form.submit class: class_string("btn btn-block", ["btn-success", "btn-primary"] => task_request.new_record?), data: { disable_with: t("shared.disable_with") } %>
+    </div>
+  </div>
+<% end %>
--- a/app/views/task_requests/_task_request.html.erb
+++ b/app/views/task_requests/_task_request.html.erb
@@ -0,0 +1,35 @@
+<tr>
+  <td>
+    <%= task_request.created_at.strftime('%D') %>
+  </td>
+  <td>
+    <%= task_request.deadline.try(:strftime, '%D') %>
+  </td>
+  <td>
+    <%= task_request.time_allowed %>
+  </td>
+  <td>
+    <%= task_request.status.titleize %>
+  </td>
+  <% if params[:completed_only] %>
+    <td>
+      <%= task_request.deliverable_url %>
+    </td>
+  <% end %>
+  <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(task_request).show? %>
+          <%= link_to fa_icon("tasks fw", text: "View"), [task_request.project, task_request], class: "dropdown-item", target: '_blank' %>
+        <% end %>
+        <% if policy(task_request).edit? %>
+          <%= link_to fa_icon("pencil fw", text: "Edit"), [:edit, task_request.project, task_request], class: "dropdown-item" %>
+        <% end %>
+        <% if policy(task_request).cancel? && !task_request.cancelled? %>
+          <%= link_to fa_icon("ban fw", text: "Cancel"), [:cancel, task_request.project, task_request], class: "dropdown-item", method: :post %>
+        <% end %>
+      </div>
+    </div>
+  </td>
+</tr>
--- a/app/views/task_requests/edit.html.erb
+++ b/app/views/task_requests/edit.html.erb
@@ -0,0 +1,6 @@
+<div class="card shadow-sm">
+  <%= card_header text: t(".heading"), close_action_path: [@project, :task_requests] %>
+  <div class="card-body">
+    <%= render "form", model: [@project, @task_request], task_request: @task_request, project: @project %>
+  </div>
+</div>
--- a/app/views/task_requests/index.html.erb
+++ b/app/views/task_requests/index.html.erb
@@ -0,0 +1,41 @@
+<%= product_wordmark :assist_me, class: "small mb-3" %>
+
+<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 policy(TaskRequest).new? %>
+        <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :task_request], class: "btn btn-primary mb-2" %>
+      <% 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><%= t(".table_headers.task_request_created_on") %></th>
+        <th><%= t(".table_headers.task_request_deadline") %></th>
+        <th><%= t(".table_headers.task_request_time_allowed") %></th>
+        <th><%= t(".table_headers.task_request_status") %></th>
+        <% if params[:completed_only] %>
+          <th><%= t(".table_headers.task_request_results") %></th>
+        <% end %>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody id="task_requests">
+      <% if @task_requests.any? %>
+        <%= render @task_requests %>
+      <% else %>
+        <tr>
+          <td colspan="5" class="py-4 text-center text-muted"><%= t(".empty") %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div id="task_requests_pagination" class="mt-3">
+  <%= will_paginate @task_requests %>
+</div>
--- a/app/views/task_requests/new.html.erb
+++ b/app/views/task_requests/new.html.erb
@@ -0,0 +1,6 @@
+<div class="card shadow-sm">
+  <%= card_header text: t(".heading"), close_action_path: [@project, :task_requests] %>
+  <div class="card-body">
+    <%= render "form", model: [@project, @task_request], task_request: @task_request, project: @project %>
+  </div>
+</div>
--- a/app/views/task_requests/show.html.erb
+++ b/app/views/task_requests/show.html.erb
@@ -0,0 +1,18 @@
+<dl>
+  <%= description_list_pair_for @task_request, :description, append: ":" %>
+  <%= description_list_pair_for @task_request, :created_at, 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| %>
+        <%= file.filename %><br>
+      <% end %>
+    <% else %>
+      "No files attached."
+    <% end %>
+  </dd>
+</dl>