update video sources

app/controllers/api/api_controller.rb

@@ -17,7 +17,9 @@ class Api::ApiController < ActionController::Base
   def return_error(exception)
     raise exception if Rails.env.test? 
 
-    logger.error "==Handled======="
+    Raven.capture_exception(exception)
+
+    logger.error "==Handled======"
     logger.error exception.message
     logger.error exception.backtrace.join("\n")
     logger.error "==Handled=======" 

app/controllers/api/user_token_controller.rb

@@ -5,6 +5,8 @@ class Api::UserTokenController < Knock::AuthTokenController
 
   # Catch exception and return JSON-formatted error
   def return_error(exception)
+    Raven.capture_exception(exception)
+
     logger.error "==Handled======="
     logger.error exception.message
     logger.error exception.backtrace.join("\n")

app/models/medical_release.rb

@@ -14,15 +14,37 @@ class MedicalRelease < ApplicationRecord
 
   NUMBER_OF_CUSTOM_FIELDS = 15
 
-  composed_of :person_address, 
+  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) 
+              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]
               ]
 
   def self.face_photo_acceptable_content_types
@@ -32,6 +54,7 @@ class MedicalRelease < ApplicationRecord
   # These validations apply to all releases
   validates :person_first_name, :person_last_name, presence: true
   validates :person_email, email: true, allow_blank: true
+  validate :valid_answers
 
   acts_as_taggable_on :internal_tags, :tags
 
@@ -76,4 +99,15 @@ class MedicalRelease < ApplicationRecord
   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
+
+  private
+
+  def valid_answers
+    (1..ContractTemplate::NUMBER_OF_CUSTOM_FIELDS).each do |index|
+      if contract_template && contract_template["question_#{index}_text"].present? &&
+         public_send("question_#{index}_answer").blank?
+        errors.add("question_#{index}", I18n.t('medical_releases.custom_validation_errors.question_answer_is_required'))
+      end
+    end
+  end
 end

app/views/broadcasts/splash.html.erb

@@ -18,15 +18,7 @@
       <div class="card-body p-0">
         <div class="embed-responsive embed-responsive-16by9">
           <div class="embed-responsive-item">
-            <table class="w-100 h-100 bg-secondary">
-              <tbody>
-              <tr>
-                <td class="text-center align-middle text-white">
-                  Video tutorial will be available soon
-                </td>
-              </tr>
-              </tbody>
-            </table>
+            <div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/435943632" style="position:absolute;top:0;left:0;width:100%;height:100%;" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe></div><script src="https://player.vimeo.com/api/player.js"></script>
           </div>
         </div>
       </div>

app/views/contract_templates/splash.html.erb

@@ -18,15 +18,7 @@
       <div class="card-body p-0">
         <div class="embed-responsive embed-responsive-16by9">
           <div class="embed-responsive-item">
-            <table class="w-100 h-100 bg-secondary">
-              <tbody>
-              <tr>
-                <td class="text-center align-middle text-white">
-                  Video tutorial will be available soon
-                </td>
-              </tr>
-              </tbody>
-            </table>
+            <div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/435942851" style="position:absolute;top:0;left:0;width:100%;height:100%;" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe></div><script src="https://player.vimeo.com/api/player.js"></script>
           </div>
         </div>
       </div>

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

@@ -30,7 +30,7 @@
           <% (1..MedicalRelease::NUMBER_OF_CUSTOM_FIELDS).each do |n| %>
             <% if @contract_template.public_send("question_#{n}_text").present? %>
               <div class="form-row">
-                <%= form.text_area "question_#{n}_answer", wrapper_class: "col-sm-12", label: @contract_template.public_send("question_#{n}_text") %>
+                <%= form.text_area "question_#{n}_answer", required: true, wrapper_class: "col-sm-12", label: @contract_template.public_send("question_#{n}_text") %>
               </div>
             <% end %>
           <% end %>

app/views/videos/splash.html.erb

@@ -6,7 +6,7 @@
 
   <%= link_to t(".actions.book_demo"), 'https://meetings.hubspot.com/bray2', class: "btn btn-primary border align-self-center h-50 ml-auto mr-2 pb-2", target: '_blank' %>
   <% if policy(Video).new? %>
-    <%= link_to t(".actions.upload_video"), [:new, @project, :video], class: "btn btn-success border align-self-center h-50 pb-2" %>
+    <%= link_to t(".actions.upload_video"), [:landing, @project, :videos], class: "btn btn-success border align-self-center h-50 pb-2" %>
   <% end %>
 </div>
 
@@ -18,15 +18,7 @@
       <div class="card-body p-0">
         <div class="embed-responsive embed-responsive-16by9">
           <div class="embed-responsive-item">
-            <table class="w-100 h-100 bg-secondary">
-              <tbody>
-              <tr>
-                <td class="text-center align-middle text-white">
-                  Video tutorial will be available soon
-                </td>
-              </tr>
-              </tbody>
-            </table>
+            <div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/435943995" style="position:absolute;top:0;left:0;width:100%;height:100%;" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe></div><script src="https://player.vimeo.com/api/player.js"></script>
           </div>
         </div>
       </div>

config/locales/en.yml

@@ -772,6 +772,8 @@ en:
     update:
       notice: The material release has been updated
   medical_releases:
+    custom_validation_errors:
+      question_answer_is_required: answer is required
     destroy:
       alert: The medical release has been deleted
     index:

config/locales/es.yml

@@ -282,6 +282,9 @@ es:
     form:
       photos:
         dropzone_label: Tap to take a photo of Licensed Material (optional) (ES)
+  medical_releases:
+    custom_validation_errors:
+      question_answer_is_required: answer is required (ES)
   public:
     appearance_releases:
       create:

spec/controllers/public/medical_releases_controller_spec.rb

@@ -19,14 +19,29 @@ RSpec.describe Public::MedicalReleasesController, type: :controller do
     end
 
     it "displays validation errors" do
-      contract_template = create(:contract_template, project: project)
+      contract_template = create(:contract_template,
+                                 project: project,
+                                 question_1_text: "Question 1",
+                                 question_2_text: "Question 2"
+      )
       sign_in(user)
 
-      post :create, params: { account_id: user.primary_account.to_param, project_id: project, contract_template_id: contract_template, medical_release: { person_address_city: "Albuquerque" } }
+      post :create, params: {
+        account_id: user.primary_account.to_param,
+        project_id: project,
+        contract_template_id: contract_template,
+        medical_release: {
+          person_address_city: "Albuquerque",
+          question_2_answer: "Answer 2"
+        }
+      }
+
       body = CGI.unescape_html(response.body)
       expect(body).to match /Person first name can't be blank/
       expect(body).to match /Person last name can't be blank/
       expect(body).to match />can't be blank</
+      expect(body).to match /Question 1 #{question_answer_validation_error}/
+      expect(body).not_to match /Question 2 #{question_answer_validation_error}/
     end
 
     it "responds with success " do
@@ -68,4 +83,8 @@ RSpec.describe Public::MedicalReleasesController, type: :controller do
 
     { signature_base64: data_uri }
   end
+
+  def question_answer_validation_error
+    t 'medical_releases.custom_validation_errors.question_answer_is_required'
+  end
 end

spec/features/user_managing_medical_releases_spec.rb

@@ -131,6 +131,43 @@ feature "User managing medical releases" do
       expect(page).to have_content(successful_submission_message)
       expect(MedicalRelease.last.guardian_2_first_name).to eq 'Second'
     end
+
+    scenario 'when signing release, question answers are required', js: true do
+      project = create(:project, members: current_user, account: current_user.primary_account)
+      contract_template = create(:contract_template,
+                                 project: project,
+                                 question_1_text: 'Question 1',
+                                 question_2_text: 'Question 2'
+      )
+
+      visit new_account_project_contract_template_medical_release_path(project.account, project, contract_template)
+
+      fill_in person_first_name_field, with: 'Jane'
+      fill_in person_last_name_field, with: 'Doe'
+      draw_signature file_fixture("signature.png"), "medical_release_signature_base64"
+
+      expect do
+        click_button submit_release_button
+      end.to change(MedicalRelease, :count).by(0)
+      expect(page).not_to have_content(successful_submission_message)
+
+      fill_in answer_field_for_question(1), with: 'Answer 1'
+      draw_signature file_fixture("signature.png"), "medical_release_signature_base64"
+
+      expect do
+        click_button submit_release_button
+      end.to change(MedicalRelease, :count).by(0)
+      expect(page).not_to have_content(successful_submission_message)
+
+      fill_in answer_field_for_question(2), with: 'Answer 2'
+      draw_signature file_fixture("signature.png"), "medical_release_signature_base64"
+
+      expect do
+        click_button submit_release_button
+      end.to change(MedicalRelease, :count).by(1)
+      expect(page).to have_content(successful_submission_message)
+
+    end
   end
 
   context "when signed in as account manager" do
@@ -406,4 +443,8 @@ feature "User managing medical releases" do
   def guardian_2_information_heading
     t 'public.medical_releases.new.guardian_2_info.heading'
   end
+
+  def answer_field_for_question(number)
+    "medical_release[question_#{number}_answer]"
+  end
 end

spec/models/medical_release_spec.rb

@@ -22,6 +22,23 @@ RSpec.describe MedicalRelease do
     context "for non-native releases" do
       it { is_expected.to validate_attachment_of(:contract).on(:non_native) }
     end
+
+    context "question answers" do
+      let(:project) { create(:project) }
+      let(:contract_template) { create(:contract_template, project: project, question_1_text: 'Question 1') }
+
+      it "returns validation errors if answers are missing" do
+        expect do
+          create(:medical_release, contract_template: contract_template)
+        end.to raise_exception ActiveRecord::RecordInvalid
+      end
+
+      it "creates release if answers are present" do
+        expect do
+          create(:medical_release, contract_template: contract_template, question_1_answer: 'Answer 1')
+        end.to change(MedicalRelease, :count).by(1)
+      end
+    end
   end
 
   describe "attachments" do