add safeguard

add specs
make question answers required
2020-07-03 18:44:34 +02:00 · 2020-07-03 18:44:27 +02:00 · 2020-07-03 18:01:34 +02:00
34 changed files with 113 additions and 333 deletions
--- a/app/assets/javascripts/update_required_status.js
+++ b/app/assets/javascripts/update_required_status.js
@@ -1,13 +0,0 @@
-$(document).on("turbolinks:load", function() {
-    $("[data-behavior=update-required-status]").click(function(e) {
-        const required = !!($(this)[0] && $(this)[0].checked);
-
-
-        $("[data-required-tag=guardian]").each(function(index, element) {
-            const labelForField = element.previousSibling;
-
-            element.required = required;
-            labelForField.classList.add("required");
-        });
-    });
-});
--- a/app/controllers/api/api_controller.rb
+++ b/app/controllers/api/api_controller.rb
@@ -17,9 +17,7 @@ class Api::ApiController < ActionController::Base
  def return_error(exception)
    raise exception if Rails.env.test? 

-    Raven.capture_exception(exception)
-
-    logger.error "==Handled======"
+    logger.error "==Handled======="
    logger.error exception.message
    logger.error exception.backtrace.join("\n")
    logger.error "==Handled=======" 
--- a/app/controllers/api/user_token_controller.rb
+++ b/app/controllers/api/user_token_controller.rb
@@ -5,8 +5,6 @@ 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")
--- a/app/controllers/contract_templates_controller.rb
+++ b/app/controllers/contract_templates_controller.rb
@@ -62,19 +62,18 @@ class ContractTemplatesController < ApplicationController
  def contract_template_params
    params
      .require(:contract_template)
-      .permit(:name, :release_type, :body, :guardian_clause,
-              :signature_legal_text, :fee,
+      .permit(:name, :release_type, :body, :guardian_clause, :fee,
              :applicable_medium_id, :applicable_medium_text,
              :territory_id, :territory_text,
              :term_id, :term_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_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_11_text, :question_12_text, 
+              :question_13_text, :question_14_text, 
              :question_15_text)
  end

--- a/app/jobs/generate_contracts_zip_job.rb
+++ b/app/jobs/generate_contracts_zip_job.rb
@@ -22,7 +22,7 @@ class GenerateContractsZipJob < ApplicationJob
        end
      end

-      @download.file.attach(io: File.open(zipfile_name), filename: "#{@folder_name}.zip")
+      @download.file.attach(io: File.open(zipfile_name), filename: @folder_name)
    end
  rescue StandardError => e
    Rails.logger.error("Failed to generate download for project (##{project.id}) with release type #{release_type}\n" + e.message)
--- a/app/models/contract_template.rb
+++ b/app/models/contract_template.rb
@@ -21,7 +21,6 @@ class ContractTemplate < ApplicationRecord
  monetize :fee_cents
  has_rich_text :body
  has_rich_text :guardian_clause
-  has_rich_text :signature_legal_text

  validates :name, presence: true
  validates :release_type, presence: true
--- a/app/models/medical_release.rb
+++ b/app/models/medical_release.rb
@@ -14,37 +14,15 @@ 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]
-              ]
-
-  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]
+              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
--- a/app/models/qr_code.rb
+++ b/app/models/qr_code.rb
@@ -10,7 +10,7 @@ class QrCode
    url       = Rails.application.routes.url_helpers.url_for(route)
    filename  = [contract_template.project.name, contract_template.name].map(&:parameterize).join("_")

-    new(url, "#{filename}.png")
+    new(url, filename)
  end

  def initialize(url, filename = "qrcode.png")
--- a/app/views/broadcasts/splash.html.erb
+++ b/app/views/broadcasts/splash.html.erb
@@ -18,7 +18,15 @@
      <div class="card-body p-0">
        <div class="embed-responsive embed-responsive-16by9">
          <div class="embed-responsive-item">
-            <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>
+            <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>
        </div>
      </div>
--- a/app/views/contract_templates/_contract_template.html.erb
+++ b/app/views/contract_templates/_contract_template.html.erb
@@ -27,7 +27,7 @@
          <%= link_to fa_icon("print", text: "Print"), [:new, contract_template, :blank_contracts], class: "dropdown-item", target: :_blank %>
        <% end %>
        <% if policy(contract_template).destroy? %>
-          <%= link_to fa_icon("trash", text: "Delete"), contract_template, class: "dropdown-item", method: :delete, data: { confirm: "Are you sure?" } %>
+          <%= link_to fa_icon("archive", text: "Archive"), contract_template, class: "dropdown-item", method: :delete, data: { confirm: "Are you sure?" } %>
        <% end %>
      </div>
    </div>
--- a/app/views/contract_templates/_form.html.erb
+++ b/app/views/contract_templates/_form.html.erb
@@ -25,11 +25,6 @@
        <%= form.rich_text_area :guardian_clause %>
      <% end %>
    </div>
-    <div id="signature_legal_text">
-      <%= form.form_group do %>
-        <%= form.rich_text_area :signature_legal_text %>
-      <% end %>
-    </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 %>
--- a/app/views/contract_templates/splash.html.erb
+++ b/app/views/contract_templates/splash.html.erb
@@ -18,7 +18,15 @@
      <div class="card-body p-0">
        <div class="embed-responsive embed-responsive-16by9">
          <div class="embed-responsive-item">
-            <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>
+            <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>
        </div>
      </div>
--- a/app/views/public/acquired_media_releases/new.html.erb
+++ b/app/views/public/acquired_media_releases/new.html.erb
@@ -50,7 +50,7 @@
      <hr>

      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form %>
      <% end %>

      <div class="mt-5">
--- a/app/views/public/appearance_releases/new.html.erb
+++ b/app/views/public/appearance_releases/new.html.erb
@@ -16,7 +16,7 @@

      <% unless @contract_template.guardian_clause.blank? %>
        <%= form.form_group :minor do %>
-          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
        <% end %>

        <%= card_field_set_tag t(".guardian_clause.heading") do %>
@@ -72,12 +72,12 @@
        <div class="<%= class_string("collapse" => !@appearance_release.minor?) %>" data-ujs-target="guardian-fields">
          <%= 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", data: { required_tag: "guardian" } %>
-              <%= form.text_field :guardian_last_name, required: @appearance_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
-              <%= form.phone_field :guardian_phone, required: @appearance_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
-              <%= form.text_field :guardian_email, required: @appearance_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= 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, required: @appearance_release.minor?, wrapper_class: "col-sm-6" %>
+              <%= form.text_field :guardian_email, required: @appearance_release.minor?, wrapper_class: "col-sm-6" %>
            </div>
-            <%= render "shared/address_fields", form: form, subject: "guardian", required: @appearance_release.minor?, data: { required_tag: "guardian" } %>
+            <%= render "shared/address_fields", form: form, subject: "guardian", required: @appearance_release.minor? %>
          <% end %>

          <hr>
@@ -156,7 +156,7 @@
      <% end %>

      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form %>
      <% end %>

      <div class="mt-5">
--- a/app/views/public/location_releases/new.html.erb
+++ b/app/views/public/location_releases/new.html.erb
@@ -50,7 +50,7 @@
      <% end %>

      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, instruction: 'An Authorized Signatory', signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form, instruction: 'An Authorized Signatory' %>
      <% end %>

      <div class="mt-5">
--- a/app/views/public/material_releases/new.html.erb
+++ b/app/views/public/material_releases/new.html.erb
@@ -41,7 +41,7 @@
      <hr>

      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, instruction: 'For Owner or Authorized Signatory', signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form, instruction: 'For Owner or Authorized Signatory' %>
      <% end %>

      <div class="mt-5">
--- a/app/views/public/medical_releases/new.html.erb
+++ b/app/views/public/medical_releases/new.html.erb
@@ -16,7 +16,7 @@

      <% unless @contract_template.guardian_clause.blank? %>
        <%= form.form_group :minor do %>
-          <%= form.check_box :minor, label: t("helpers.label.medical_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+          <%= form.check_box :minor, label: t("helpers.label.medical_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
        <% end %>

        <%= card_field_set_tag t(".guardian_clause.heading") do %>
@@ -59,12 +59,14 @@
        <div class="<%= class_string("collapse" => !@medical_release.minor?) %>" data-ujs-target="guardian-fields">
          <%= card_field_set_tag t(".guardian_info.heading") do %>
            <div class="form-row">
-              <%= form.text_field :guardian_first_name, required: @medical_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
-              <%= form.text_field :guardian_last_name, required: @medical_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
-              <%= form.phone_field :guardian_phone, required: @medical_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
-              <%= form.text_field :guardian_email, required: @medical_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_first_name, required: @medical_release.minor?, wrapper_class: "col-sm-3" %>
+              <%= form.text_field :guardian_last_name, required: @medical_release.minor?, wrapper_class: "col-sm-3" %>
+              <%= form.phone_field :guardian_phone, required: @medical_release.minor?, wrapper_class: "col-sm-6" %>
            </div>
-            <%= render "shared/address_fields", form: form, subject: "guardian", required: @medical_release.minor?, data: { required_tag: "guardian" } %>
+            <div class="form-row">
+              <%= form.text_field :guardian_email, required: @medical_release.minor?, wrapper_class: "col-sm-6" %>
+            </div>
+            <%= render "shared/address_fields", form: form, subject: "guardian", required: @medical_release.minor? %>
          <% end %>

          <hr>
@@ -145,7 +147,7 @@
      <% end %>

      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form %>
      <% end %>

      <div class="mt-5">
--- a/app/views/public/misc_releases/new.html.erb
+++ b/app/views/public/misc_releases/new.html.erb
@@ -11,7 +11,7 @@

      <% unless @contract_template.guardian_clause.blank? %>
        <%= form.form_group :minor do %>
-          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
        <% end %>

        <%= card_field_set_tag t(".guardian_clause.heading") do %>
@@ -39,7 +39,9 @@
          <%= 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, required: true, wrapper_class: "col-sm-6" %>
+        </div>
+        <div class="form-row">
+          <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
        </div>
        <%= render "shared/address_fields", form: form, subject: "person" %>
      <% end %>
@@ -54,12 +56,14 @@
        <div class="<%= class_string("collapse" => !@misc_release.minor?) %>" data-ujs-target="guardian-fields">
          <%= card_field_set_tag t(".guardian_info.heading") do %>
            <div class="form-row">
-              <%= form.text_field :guardian_first_name, required: @misc_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
-              <%= form.text_field :guardian_last_name, required: @misc_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
-              <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
-              <%= form.text_field :guardian_email, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_first_name, required: @misc_release.minor?, wrapper_class: "col-sm-3" %>
+              <%= form.text_field :guardian_last_name, required: @misc_release.minor?, wrapper_class: "col-sm-3" %>
+              <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
            </div>
-            <%= render "shared/address_fields", form: form, subject: "guardian", data: { required_tag: "guardian" } %>
+            <div class="form-row">
+              <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
+            </div>
+            <%= render "shared/address_fields", form: form, subject: "guardian" %>
          <% end %>

          <hr>
@@ -95,7 +99,7 @@
      <% end %>

      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form %>
      <% end %>

      <div class="mt-5">
--- a/app/views/public/talent_releases/new.html.erb
+++ b/app/views/public/talent_releases/new.html.erb
@@ -16,7 +16,7 @@

      <% unless @contract_template.guardian_clause.blank? %>
        <%= form.form_group :minor do %>
-          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
        <% end %>

        <%= card_field_set_tag t(".guardian_clause.heading") do %>
@@ -46,12 +46,12 @@
        <div class="<%= class_string("collapse" => !@talent_release.minor?) %>" data-ujs-target="guardian-fields">
          <%= card_field_set_tag t(".guardian_info.heading") do %>
            <div class="form-row">
-              <%= form.text_field :guardian_first_name, required: @talent_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
-              <%= form.text_field :guardian_last_name, required: @talent_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
-              <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
-              <%= form.text_field :guardian_email, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_first_name, required: @talent_release.minor?, wrapper_class: "col-sm-3" %>
+              <%= form.text_field :guardian_last_name, required: @talent_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" %>
            </div>
-            <%= render "shared/address_fields", form: form, subject: "guardian", data: { required_tag: "guardian" } %>
+            <%= render "shared/address_fields", form: form, subject: "guardian" %>
          <% end %>

          <hr>
@@ -131,7 +131,7 @@
      <% end %>

      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form %>
      <% end %>

      <div class="mt-5">
--- a/app/views/shared/_address_fields.html.erb
+++ b/app/views/shared/_address_fields.html.erb
@@ -1,15 +1,14 @@
 <% field_name_prefix = subject.present? ? "#{subject}_" : "" %>
 <% required = required || false %>
-<% data = data || nil %>

 <div class="form-row">
-  <%= form.text_field "#{field_name_prefix}address_street1", required: required, wrapper_class: "col-sm-6", data: data %>
+  <%= form.text_field "#{field_name_prefix}address_street1", required: required, wrapper_class: "col-sm-6" %>
  <%= form.text_field "#{field_name_prefix}address_street2", wrapper_class: "col-sm-6" %>
 </div>
 <div class="form-row">
-  <%= form.text_field "#{field_name_prefix}address_city", required: required, wrapper_class: "col-sm-6", data: data %>
-  <%= form.text_field "#{field_name_prefix}address_state", required: required, wrapper_class: "col-sm-3", data: data %>
-  <%= form.text_field "#{field_name_prefix}address_zip", required: required, wrapper_class: "col-sm-3", data: data %>
+  <%= form.text_field "#{field_name_prefix}address_city", required: required, wrapper_class: "col-sm-6" %>
+  <%= form.text_field "#{field_name_prefix}address_state", required: required, wrapper_class: "col-sm-3" %>
+  <%= form.text_field "#{field_name_prefix}address_zip", required: required, wrapper_class: "col-sm-3" %>
 </div>
 <%= form.form_group "#{field_name_prefix}address_country" do %>
  <%= form.label "#{field_name_prefix}address_country" %>
--- a/app/views/shared/_signature_fields.html.erb
+++ b/app/views/shared/_signature_fields.html.erb
@@ -12,8 +12,4 @@
    <%= fa_icon "refresh" %> <%= t "shared.clear" %>
  <% end %>
 </div>
-<br>

-<% if local_assigns[:signature_legal_text] && signature_legal_text.present? %>
-  <div class="alert alert-warning font-weight-bold"><%= signature_legal_text %></div>
-<% end %>
--- a/app/views/task_requests/create.html.erb
+++ b/app/views/task_requests/create.html.erb
@@ -13,4 +13,3 @@
  <% end %>
 <% end %>
 <p class="alert alert-success p-3 lead text-center"><%= t '.success_message' %></p>
-<%= link_to fa_icon("check", text: "Done"), [@project, :task_requests], class: "btn btn-primary" %>
--- a/app/views/videos/splash.html.erb
+++ b/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"), [:landing, @project, :videos], class: "btn btn-success border align-self-center h-50 pb-2" %>
+    <%= link_to t(".actions.upload_video"), [:new, @project, :video], class: "btn btn-success border align-self-center h-50 pb-2" %>
  <% end %>
 </div>

@@ -18,7 +18,15 @@
      <div class="card-body p-0">
        <div class="embed-responsive embed-responsive-16by9">
          <div class="embed-responsive-item">
-            <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>
+            <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>
        </div>
      </div>
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -364,7 +364,6 @@ en:
      contract_template:
        fee: Leave at $0.00 for no-fee
        guardian_clause: Leave blank if not required for this contract
-        signature_legal_text: Leave blank if not required for this contract
      task_request:
        time_allowed: Minimum of 2 hours, no partial hours allowed
      video:
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -160,7 +160,6 @@ es:
      contract_template:
        fee: Leave at $0.00 for no-fee (ES)
        guardian_clause: Leave blank if not required for this contract (ES)
-        signature_legal_text: Leave blank if not required for this contract (ES)
    label:
      appearance_release:
        guardian_2_address_city: Guardian 2 city (ES)
--- a/spec/features/user_creates_task_request_spec.rb
+++ b/spec/features/user_creates_task_request_spec.rb
@@ -21,7 +21,6 @@ RSpec.feature 'User creates task request', type: :feature do
    click_on 'Create Task request'

    expect(page).to have_content task_created_message
-    expect(page).to have_link("Done")
  end

  scenario 'user can view task request details' do
@@ -90,4 +89,4 @@ RSpec.feature 'User creates task request', type: :feature do
  def task_created_message
    t 'task_requests.create.success_message'
  end
-end
+end
--- a/spec/features/user_manages_contract_templates_spec.rb
+++ b/spec/features/user_manages_contract_templates_spec.rb
@@ -35,24 +35,6 @@ RSpec.feature 'User manages contract templates', type: :feature do
    expect(page).to have_content(create_contract_template_success_message)
  end

-  scenario 'creating new release template, all release types accept signature legal text' do
-    all_release_types = ['Acquired Media', 'Appearance', 'Location', 'Material', 'Medical', 'Misc', 'Talent']
-
-    all_release_types.each do |release_type|
-      visit new_project_contract_template_path(project)
-
-      dropdown_selection = "#{release_type} Release"
-      select dropdown_selection, from: 'Release type'
-
-      fill_in 'Name', with: "My #{release_type} template"
-      fill_in_trix signature_legal_text_field, with: 'LL'
-
-      expect do
-        click_on 'Create Release Template'
-      end.to change(ContractTemplate, :count).by(1)
-    end
-  end
-
  scenario 'medical release template has a guardian clause field' do
    visit new_project_contract_template_path(project)

@@ -240,7 +222,7 @@ RSpec.feature 'User manages contract templates', type: :feature do

    click_on 'Manage'
    accept_alert do
-      click_on 'Delete'
+      click_on 'Archive'
    end

    expect(page).to have_content('The release template has been archived')
@@ -291,7 +273,7 @@ RSpec.feature 'User manages contract templates', type: :feature do
      visit project_contract_templates_path(project)

      click_on 'Manage'
-      expect(page).to have_content('Delete')
+      expect(page).to have_content('Archive')
    end

    it 'does not show create release button on splash page' do
@@ -328,10 +310,6 @@ RSpec.feature 'User manages contract templates', type: :feature do
    'contract_template_guardian_clause_trix_input_contract_template'
  end

-  def signature_legal_text_field
-    'contract_template_signature_legal_text'
-  end
-
  def create_contract_template_success_message
    'The release template has been created'
  end
@@ -351,8 +329,4 @@ RSpec.feature 'User manages contract templates', type: :feature do
  def create_release_template
    t 'contract_templates.splash.actions.create_template'
  end
-
-  def signature_legal_text_trix_field
-    'Signature legal text'
-  end
 end
--- a/spec/features/user_managing_acquired_media_releases_spec.rb
+++ b/spec/features/user_managing_acquired_media_releases_spec.rb
@@ -41,13 +41,6 @@ feature "User managing acquired_media releases" do
      expect(AcquiredMediaRelease.last.categories).to include("Still Photograph")
      expect(page).to have_content("Your release was successfully submitted. Thank you.")
    end
-
-    scenario "creating a release, if contract template contains signature legal language, it is shown" do
-      contract_template = create(:contract_template, project: project, signature_legal_text: dummy_signature_legal_text)
-      visit new_account_project_contract_template_acquired_media_release_path(project.account, project, contract_template)
-
-      expect(page).to have_content dummy_signature_legal_text
-    end
  end

  context "when signed in" do
@@ -364,8 +357,4 @@ feature "User managing acquired_media releases" do
  def destroy_release_alert
    t "acquired_media_releases.destroy.alert"
  end
-
-  def dummy_signature_legal_text
-    'Some signature legal language'
-  end
 end
--- a/spec/features/user_managing_appearance_releases_spec.rb
+++ b/spec/features/user_managing_appearance_releases_spec.rb
@@ -30,24 +30,6 @@ feature 'User managing appearance releases' do
      expect(page).to have_content(successful_submission_message)
    end

-    scenario "creating a release for a minor - guardian fields are required when minor checkbox is checked", js: true do
-      contract_template = create(:contract_template, project: project)
-
-      visit new_account_project_contract_template_appearance_release_path(project.account, project, contract_template)
-
-      all('input[data-required-tag="guardian"]').each do |field|
-        expect(field['required']).to eq 'false'
-        expect(field).not_to be_visible
-      end
-
-      page.check person_is_minor_checkbox
-
-      all('input[data-required-tag="guardian"]').each do |field|
-        expect(field['required']).to eq 'true'
-        expect(field).to be_visible
-      end
-    end
-
    scenario 'creating a release for a minor', js: true do
      allow(BrayniacAI::Validation).to receive(:create).and_return(double(:validation, valid: true))

@@ -68,7 +50,6 @@ feature 'User managing appearance releases' do
      fill_in guardian_first_name_field, with: 'Guardian'
      fill_in guardian_last_name_field, with: 'Name'
      fill_in guardian_phone_field, with: '001101'
-      fill_in guardian_email_field, with: 'valid@email.com'
      fill_in person_first_name_field, with: 'Jane'
      fill_in person_last_name_field, with: 'Doe'
      fill_in_person_address_fields
@@ -79,6 +60,11 @@ feature 'User managing appearance releases' do
      attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all
      draw_signature file_fixture('signature.png'), 'appearance_release_signature_base64'

+      fill_in guardian_email_field, with: 'invalid@email'
+      click_button submit_release_button
+      expect(page).to have_content('Guardian email is not an email')
+
+      fill_in guardian_email_field, with: 'valid@email.com'
      fill_in_guardian_address_fields
      attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all
      draw_signature file_fixture('signature.png'), 'appearance_release_signature_base64'
@@ -113,7 +99,6 @@ feature 'User managing appearance releases' do
      fill_in guardian_first_name_field, with: 'Guardian'
      fill_in guardian_last_name_field, with: 'Name'
      fill_in guardian_phone_field, with: '001101'
-      fill_in guardian_email_field, with: 'valid@email.com'
      fill_in person_first_name_field, with: 'Jane'
      fill_in person_last_name_field, with: 'Doe'
      fill_in_person_address_fields
@@ -124,6 +109,11 @@ feature 'User managing appearance releases' do
      attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all
      draw_signature file_fixture('signature.png'), 'appearance_release_signature_base64'

+      fill_in guardian_email_field, with: 'invalid@email'
+      click_button submit_release_button
+      expect(page).to have_content('Guardian email is not an email')
+
+      fill_in guardian_email_field, with: 'valid@email.com'
      fill_in_guardian_address_fields
      attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all
      draw_signature file_fixture('signature.png'), 'appearance_release_signature_base64'
@@ -137,13 +127,6 @@ feature 'User managing appearance releases' do
      expect(page).to have_content(successful_submission_message)
      expect(AppearanceRelease.last.guardian_2_first_name).to eq 'Second'
    end
-
-    scenario "creating a release, if contract template contains signature legal language, it is shown" do
-      contract_template = create(:contract_template, project: project, signature_legal_text: dummy_signature_legal_text)
-      visit new_account_project_contract_template_appearance_release_path(project.account, project, contract_template)
-
-      expect(page).to have_content dummy_signature_legal_text
-    end
  end

  context 'when signed in' do
@@ -713,8 +696,4 @@ feature 'User managing appearance releases' do
  def guardian_2_photo_heading
    t 'appearance_releases.form.photos.guardian_2_photo.heading'
  end
-
-  def dummy_signature_legal_text
-    'Some signature legal language'
-  end
 end
--- a/spec/features/user_managing_location_releases_spec.rb
+++ b/spec/features/user_managing_location_releases_spec.rb
@@ -71,13 +71,6 @@ feature "User managing location releases" do
      expect(page).to have_content("Your release was successfully submitted. Thank you.")
      expect(LocationRelease.last.photos.attached?).to eq true
    end
-
-    scenario "creating a release, if contract template contains signature legal language, it is shown" do
-      contract_template = create(:contract_template, project: project, signature_legal_text: dummy_signature_legal_text)
-      visit new_account_project_contract_template_location_release_path(project.account, project, contract_template)
-
-      expect(page).to have_content dummy_signature_legal_text
-    end
  end

  context "when signed in" do
@@ -382,8 +375,4 @@ feature "User managing location releases" do
    select "Other", from: "Restriction"
    fill_in "Describe other restrictions", with: "Test"
  end
-
-  def dummy_signature_legal_text
-    'Some signature legal language'
-  end
 end
--- a/spec/features/user_managing_material_releases_spec.rb
+++ b/spec/features/user_managing_material_releases_spec.rb
@@ -84,13 +84,6 @@ feature "User managing material releases" do
      click_button submit_release_button
      expect(page).to have_content success_submit_message
    end
-
-    scenario "creating a release, if contract template contains signature legal language, it is shown" do
-      contract_template = create(:contract_template, project: project, signature_legal_text: dummy_signature_legal_text)
-      visit new_account_project_contract_template_material_release_path(project.account, project, contract_template)
-
-      expect(page).to have_content dummy_signature_legal_text
-    end
  end

  context "when signed in" do
@@ -389,8 +382,4 @@ feature "User managing material releases" do
    click_button submit_release_button
    expect(page).not_to have_content success_submit_message
  end
-
-  def dummy_signature_legal_text
-    'Some signature legal language'
-  end
 end
--- a/spec/features/user_managing_medical_releases_spec.rb
+++ b/spec/features/user_managing_medical_releases_spec.rb
@@ -28,24 +28,6 @@ feature "User managing medical releases" do
      expect(page).to have_content(successful_submission_message)
    end

-    scenario "creating a release for a minor - guardian fields are required when minor checkbox is checked", js: true do
-      contract_template = create(:contract_template, project: project)
-
-      visit new_account_project_contract_template_medical_release_path(project.account, project, contract_template)
-
-      all('input[data-required-tag="guardian"]').each do |field|
-        expect(field['required']).to eq 'false'
-        expect(field).not_to be_visible
-      end
-
-      page.check person_is_minor_checkbox
-
-      all('input[data-required-tag="guardian"]').each do |field|
-        expect(field['required']).to eq 'true'
-        expect(field).to be_visible
-      end
-    end
-
    scenario 'creating a release for a minor', js: true do
      allow(BrayniacAI::Validation).to receive(:create).and_return(double(:validation, valid: true))

@@ -65,7 +47,6 @@ feature "User managing medical releases" do
      fill_in guardian_first_name_field, with: 'Guardian'
      fill_in guardian_last_name_field, with: 'Name'
      fill_in guardian_phone_field, with: '001101'
-      fill_in guardian_email_field, with: "valid@email.com"
      fill_in person_first_name_field, with: 'Jane'
      fill_in person_last_name_field, with: 'Doe'
      fill_in_person_address_fields
@@ -75,6 +56,11 @@ feature "User managing medical releases" do
      attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all
      draw_signature file_fixture('signature.png'), 'medical_release_signature_base64'

+      fill_in guardian_email_field, with: 'invalid@email'
+      click_button submit_release_button
+      expect(page).to have_content email_validation_error_for('Guardian')
+
+      fill_in guardian_email_field, with: 'valid@email.com'
      fill_in_guardian_address_fields
      attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all
      draw_signature file_fixture('signature.png'), 'medical_release_signature_base64'
@@ -108,7 +94,6 @@ feature "User managing medical releases" do
      fill_in guardian_first_name_field, with: 'Guardian'
      fill_in guardian_last_name_field, with: 'Name'
      fill_in guardian_phone_field, with: '001101'
-      fill_in guardian_email_field, with: "valid@email.com"
      fill_in person_first_name_field, with: 'Jane'
      fill_in person_last_name_field, with: 'Doe'
      fill_in_person_address_fields
@@ -118,6 +103,11 @@ feature "User managing medical releases" do
      attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all
      draw_signature file_fixture('signature.png'), 'medical_release_signature_base64'

+      fill_in guardian_email_field, with: 'invalid@email'
+      click_button submit_release_button
+      expect(page).to have_content email_validation_error_for('Guardian')
+
+      fill_in guardian_email_field, with: 'valid@email.com'
      fill_in_guardian_address_fields
      attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all
      draw_signature file_fixture('signature.png'), 'medical_release_signature_base64'
@@ -168,13 +158,6 @@ feature "User managing medical releases" do
      expect(page).to have_content(successful_submission_message)

    end
-
-    scenario "creating a release, if contract template contains signature legal language, it is shown" do
-      contract_template = create(:contract_template, project: project, signature_legal_text: dummy_signature_legal_text)
-      visit new_account_project_contract_template_medical_release_path(project.account, project, contract_template)
-
-      expect(page).to have_content dummy_signature_legal_text
-    end
  end

  context "when signed in as account manager" do
@@ -454,8 +437,4 @@ feature "User managing medical releases" do
  def answer_field_for_question(number)
    "medical_release[question_#{number}_answer]"
  end
-
-  def dummy_signature_legal_text
-    'Some signature legal language'
-  end
 end
--- a/spec/features/user_managing_misc_releases_spec.rb
+++ b/spec/features/user_managing_misc_releases_spec.rb
@@ -7,7 +7,7 @@ feature "User managing misc releases" do
  context 'when signed out' do
    scenario 'creating a release for an adult', js: true do
      project = create(:project, members: current_user, account: current_user.primary_account)
-      contract_template = create(:misc_release_contract_template,
+      contract_template = create(:misc_release_contract_template, 
                                 question_1_text: "Question 1",
                                 project: project)

@@ -30,31 +30,6 @@ feature "User managing misc releases" do

      expect(page).to have_content(successful_submission_message)
    end
-
-    scenario "creating a release for a minor - guardian fields are required when minor checkbox is checked", js: true do
-      contract_template = create(:contract_template, project: project)
-
-      visit new_account_project_contract_template_misc_release_path(project.account, project, contract_template)
-
-      all('input[data-required-tag="guardian"]').each do |field|
-        expect(field['required']).to eq 'false'
-        expect(field).not_to be_visible
-      end
-
-      page.check person_is_minor_checkbox
-
-      all('input[data-required-tag="guardian"]').each do |field|
-        expect(field['required']).to eq 'true'
-        expect(field).to be_visible
-      end
-    end
-
-    scenario "creating a release, if contract template contains signature legal language, it is shown" do
-      contract_template = create(:contract_template, project: project, signature_legal_text: dummy_signature_legal_text)
-      visit new_account_project_contract_template_misc_release_path(project.account, project, contract_template)
-
-      expect(page).to have_content dummy_signature_legal_text
-    end
  end

  context "when signed in as account manager" do
@@ -202,12 +177,4 @@ feature "User managing misc releases" do
  def successful_submission_message
    "Your release was successfully submitted. Thank you."
  end
-
-  def person_is_minor_checkbox
-    'misc_release_minor'
-  end
-
-  def dummy_signature_legal_text
-    'Some signature legal language'
-  end
 end
--- a/spec/features/user_managing_talent_releases_spec.rb
+++ b/spec/features/user_managing_talent_releases_spec.rb
@@ -32,24 +32,6 @@ feature "User managing talent releases" do
      expect(page).to have_content("Your release was successfully submitted. Thank you.")
    end

-    scenario "creating a release for a minor - guardian fields are required when minor checkbox is checked", js: true do
-      contract_template = create(:contract_template, project: project)
-
-      visit new_account_project_contract_template_talent_release_path(project.account, project, contract_template)
-
-      all('input[data-required-tag="guardian"]').each do |field|
-        expect(field['required']).to eq 'false'
-        expect(field).not_to be_visible
-      end
-
-      page.check person_is_minor_checkbox
-
-      all('input[data-required-tag="guardian"]').each do |field|
-        expect(field['required']).to eq 'true'
-        expect(field).to be_visible
-      end
-    end
-
    scenario "creating a release for a minor", js: true do
      contract_template = create(:contract_template, project: project)

@@ -66,8 +48,6 @@ feature "User managing talent releases" do
        fill_in guardian_first_name_field, with: "Guardian"
        fill_in guardian_last_name_field, with: "Name"
        fill_in guardian_phone_field, with: "001101"
-        fill_in guardian_email_field, with: "valid@email.com"
-        fill_in_guardian_address_fields
        fill_in person_first_name_field, with: "Jane"
        fill_in person_last_name_field, with: "Doe"
        fill_in person_address_field, with: "123 Test Lane, New York, NY 10000"
@@ -108,9 +88,6 @@ feature "User managing talent releases" do
      fill_in guardian_first_name_field, with: "Guardian"
      fill_in guardian_last_name_field, with: "Name"
      fill_in guardian_phone_field, with: "001101"
-      fill_in guardian_email_field, with: "valid@email.com"
-
-      fill_in_guardian_address_fields

      fill_in guardian_2_first_name_field, with: "Second"
      fill_in guardian_2_last_name_field, with: "Guardian"
@@ -126,13 +103,6 @@ feature "User managing talent releases" do
      expect(TalentRelease.last.guardian_2_photo.attached?).to eq true
      expect(TalentRelease.last.guardian_2_name).to eq "Second Guardian"
    end
-
-    scenario "creating a release, if contract template contains signature legal language, it is shown" do
-      contract_template = create(:contract_template, project: project, signature_legal_text: dummy_signature_legal_text)
-      visit new_account_project_contract_template_talent_release_path(project.account, project, contract_template)
-
-      expect(page).to have_content dummy_signature_legal_text
-    end
  end

  context "when signed in" do
@@ -417,30 +387,10 @@ feature "User managing talent releases" do
    "talent_release[guardian_2_last_name]"
  end

-  def guardian_address_street1_field
-    "talent_release[guardian_address_street1]"
-  end
-
-  def guardian_address_city_field
-    "talent_release[guardian_address_city]"
-  end
-
-  def guardian_address_state_field
-    "talent_release[guardian_address_state]"
-  end
-
-  def guardian_address_zip_field
-    "talent_release[guardian_address_zip]"
-  end
-
  def guardian_phone_field
    "Guardian phone"
  end

-  def guardian_email_field
-    "talent_release[guardian_email]"
-  end
-
  def guardian_photo_field
    "talent_release[guardian_photo]"
  end
@@ -555,15 +505,4 @@ feature "User managing talent releases" do
  def contract_field
    "talent_release[contract]"
  end
-
-  def fill_in_guardian_address_fields
-    fill_in guardian_address_street1_field, with: "124 Test Lane"
-    fill_in guardian_address_city_field, with: "New York"
-    fill_in guardian_address_state_field, with: "NY"
-    fill_in guardian_address_zip_field, with: '1000'
-  end
-
-  def dummy_signature_legal_text
-    'Some signature legal language'
-  end
 end
Author	SHA1	Message	Date
Bilal	4dad4adde2	add safeguard	2020-07-03 18:44:34 +02:00
Bilal	85b99e18f5	add specs	2020-07-03 18:44:27 +02:00
Bilal	08f6380aaa	make question answers required	2020-07-03 18:01:34 +02:00