Upstream sync
This commit is contained in:
@@ -40,7 +40,16 @@ class Admin::CastingSubmissionsController < Admin::ApplicationController
|
||||
end
|
||||
|
||||
def casting_submission_params
|
||||
params.require(:casting_submission).permit(:casting_call_id, :performer_name, :interview_date, :zoom_meeting_url, :interview_recording)
|
||||
params.require(:casting_submission).permit(
|
||||
:casting_call_id, :performer_name, :interview_date,
|
||||
:zoom_meeting_url, :interview_recording, :time_elapsed_1,
|
||||
:time_elapsed_2, :time_elapsed_3, :time_elapsed_4, :time_elapsed_5,
|
||||
:time_elapsed_6, :time_elapsed_7, :time_elapsed_8, :time_elapsed_9,
|
||||
:time_elapsed_10, :time_elapsed_11, :time_elapsed_12, :time_elapsed_13,
|
||||
:time_elapsed_14, :time_elapsed_15, :note_1 , :note_2 , :note_3 , :note_4,
|
||||
:note_5, :note_6, :note_7, :note_8, :note_9, :note_10, :note_11, :note_12, :note_13,
|
||||
:note_14, :note_15
|
||||
)
|
||||
end
|
||||
|
||||
def casting_submissions
|
||||
|
||||
@@ -11,6 +11,8 @@ class CastingSubmissionsController < ApplicationController
|
||||
def show
|
||||
@casting_call = @casting_submission.casting_call
|
||||
@files = @casting_submission.files.order("created_at DESC").paginate(page: params[:files_page])
|
||||
@markers = @casting_submission.markers
|
||||
|
||||
render layout: 'application'
|
||||
end
|
||||
|
||||
|
||||
@@ -3,37 +3,23 @@ class CastingSubmission < ApplicationRecord
|
||||
has_many_attached :files
|
||||
has_one_attached :interview_recording
|
||||
|
||||
NUMBER_OF_MARKER_FIELDS = 15
|
||||
|
||||
has_secure_token
|
||||
|
||||
validates :performer_name, presence: true
|
||||
validate :zoom_meeting_url_validation
|
||||
|
||||
scope :completed, -> { where.not(interviewed_at: nil) }
|
||||
|
||||
def join_zoom_meeting_url
|
||||
uri = URI.parse(self.zoom_meeting_url)
|
||||
zoom_meeting_id = uri.path.gsub("/j/", "")
|
||||
zoom_meeting_pwd = uri.query.gsub("pwd=", "")
|
||||
|
||||
"zoommtg://zoom.us/join?confno=#{zoom_meeting_id}&pwd=#{zoom_meeting_pwd}"
|
||||
end
|
||||
|
||||
def zip_file_name
|
||||
"#{self.casting_call.title.parameterize}_#{self.performer_name.parameterize}_#{Time.now.strftime('%Y-%m-%d_%H-%M-%S')}"
|
||||
end
|
||||
|
||||
def zoom_meeting_url_validation
|
||||
# valid url format :
|
||||
# https://us01web.zoom.us/j/12345?pwd=Ab103odw3ok343ko
|
||||
valid_url_regex = %r{^https\://[a-z0-9]+\.zoom.us/j/[0-9]+\?pwd\=.+}
|
||||
return true if zoom_meeting_url.match valid_url_regex
|
||||
|
||||
errors.add(:base, invalid_meeting_url_message)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def invalid_meeting_url_message
|
||||
I18n.t('casting_submissions.validation_errors.invalid_meeting_url')
|
||||
def markers
|
||||
(1..NUMBER_OF_MARKER_FIELDS).map do |n|
|
||||
if public_send("time_elapsed_#{n}").present?
|
||||
OpenStruct.new(id: n, time_elapsed: public_send("time_elapsed_#{n}"), note: public_send("note_#{n}") )
|
||||
end
|
||||
end.compact
|
||||
end
|
||||
end
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<%= form.text_field :zoom_meeting_url %>
|
||||
|
||||
<% unless casting_submission.new_record? %>
|
||||
<%= form.file_field :interview_recording, accept: "video/*", data: { direct_upload_url: rails_direct_uploads_url, aws_bucket: ENV['AWS_BUCKET'], aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'], signer_url: multipart_signatures_url } %>
|
||||
<%= form.file_field :interview_recording, accept: "video/mp4", data: { direct_upload_url: rails_direct_uploads_url, aws_bucket: ENV['AWS_BUCKET'], aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'], signer_url: multipart_signatures_url } %>
|
||||
|
||||
<% if casting_submission.interview_recording.attached? %>
|
||||
<p>
|
||||
@@ -17,8 +17,15 @@
|
||||
<span class="text-muted"><%= fa_icon "long-arrow-left" %> <em>Current interview recording</em></span>
|
||||
</p>
|
||||
<% end %>
|
||||
|
||||
|
||||
<hr>
|
||||
<%= card_field_set_tag t(".casting_submission_markers.heading") do %>
|
||||
<% (1..CastingSubmission::NUMBER_OF_MARKER_FIELDS).each do |n| %>
|
||||
<div class="form-row">
|
||||
<%= form.number_field "time_elapsed_#{n}", wrapper_class: "col-md-6", label: "Elapsed Time #{n} (in seconds)" %>
|
||||
<%= form.text_area "note_#{n}", wrapper_class: "col-md-6", label: "Note #{n}" %>
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<div class="row align-items-center text-center mt-4">
|
||||
|
||||
@@ -22,14 +22,27 @@
|
||||
<%= render partial: 'casting_submissions/video', locals: { casting_submission: @casting_submission } %>
|
||||
<% if @casting_submission.interview_recording.present? %>
|
||||
<%= javascript_tag nonce: true do %>
|
||||
new Clappr.Player({
|
||||
parentId: '#casting_submission_video',
|
||||
source: "<%= rails_blob_url(@casting_submission.interview_recording, host: AppHost.new.domain_with_port) %>",
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
mute: true,
|
||||
autoPlay: true,
|
||||
hlsMinimumDvrSize: 1
|
||||
var markerData = <%= raw @markers.to_json %>;
|
||||
|
||||
var player = new Clappr.Player({
|
||||
parentId: '#casting_submission_video',
|
||||
source: "<%= rails_blob_url(@casting_submission.interview_recording, host: AppHost.new.domain_with_port) %>",
|
||||
plugins: {
|
||||
core: [ClapprMarkersPlugin]
|
||||
},
|
||||
markersPlugin: {},
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
mute: true,
|
||||
autoPlay: true,
|
||||
hlsMinimumDvrSize: 1
|
||||
});
|
||||
|
||||
markerData.forEach(function(marker, index) {
|
||||
var markers = player.getPlugin("markers-plugin");
|
||||
var marker = new ClapprMarkersPlugin.StandardMarker(Number(marker.table.time_elapsed), marker.table.note)
|
||||
|
||||
markers.addMarker(marker);
|
||||
});
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="row align-items-center justify-content-center mt-3">
|
||||
<%= link_to "Start Interview", @casting_submission.join_zoom_meeting_url, target: "_blank", class: "btn btn-primary" %>
|
||||
<%= link_to "Start Interview", @casting_submission.zoom_meeting_url, target: "_blank", class: "btn btn-primary" %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user