feat: Adds Legal Agreements object for dynamic agreements

app/assets/stylesheets/forms/_forms.sass

@@ -18,6 +18,9 @@ $form-spacing-horizontal: 9px
   .section-title
     margin: 12px 0 5px
 
+#disclaimer.alert
+  border: 2px solid var(--alert--border)
+
 fieldset
   margin: 25px 0 0
   border: 1px solid #aaa

app/controllers/manage/agreements_controller.rb

@@ -0,0 +1,65 @@
+class Manage::AgreementsController < Manage::ApplicationController
+  before_action :require_director
+  before_action :set_agreement, only: [:show, :edit, :update, :destroy]
+
+  respond_to :html, :json
+
+  # GET /agreements
+  def index
+    @agreements = Agreement.all
+  end
+
+  # GET /agreements/new
+  def new
+    @agreement = Agreement.new
+  end
+
+  # GET /agreements/1/edit
+  def edit
+  end
+
+  # POST /agreements
+  def create
+    if !agreement_params['agreement_url'].start_with?('http://', 'https://')
+      flash[:alert] = "Agreement URL must start with http:// or https://"
+      redirect_to new_manage_agreement_path
+    else
+      @agreement = Agreement.new(agreement_params)
+      @agreement.save
+      flash[:notice] = "#{@agreement.name} was successfully created."
+      redirect_to manage_agreements_path
+    end
+  end
+
+  # PATCH/PUT /agreements/1
+  def update
+    if !agreement_params['agreement_url'].nil? and agreement_params['agreement_url'].start_with?('http://', 'https://')
+      flash[:alert] = "Agreement URL must start with http:// or https://"
+      render :edit
+    else
+      @agreement.update_attributes(agreement_params)
+      flash[:notice] = nil
+      redirect_to manage_agreements_path
+    end
+  end
+
+  # DELETE /agreements/1
+  def destroy
+    @agreement.destroy
+    flash[:notice] = 'Agreement was successfully destroyed.'
+    respond_with(:manage, @agreement, location: manage_agreements_path)
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_agreement
+      @agreement = Agreement.find(params[:id])
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def agreement_params
+      params.require(:agreement).permit(
+        :name, :agreement_url
+      )
+    end
+end

app/controllers/manage/checkins_controller.rb

@@ -12,6 +12,7 @@ def datatable
   end
 
   def show
+    @agreements = Agreement.all
     respond_with(:manage, @questionnaire)
   end
 

app/controllers/manage/questionnaires_controller.rb

@@ -14,6 +14,7 @@ def datatable
   end
 
   def show
+    @agreements = Agreement.all
     respond_with(:manage, @questionnaire)
   end
 
@@ -70,7 +71,7 @@ def check_in
     index_redirect_path = redirect_to_checkins ? manage_checkins_path : manage_questionnaires_path
     if params[:check_in] == "true"
       if params[:questionnaire]
-        q_params = params.require(:questionnaire).permit(:agreement_accepted, :phone, :can_share_info, :email)
+        q_params = params.require(:questionnaire).permit(:phone, :can_share_info, :email)
         email = q_params.delete(:email)
         @questionnaire.update_attributes(q_params)
         @questionnaire.user.update_attributes(email: email)
@@ -153,9 +154,8 @@ def questionnaire_params
       :email, :experience, :gender,
       :date_of_birth, :interest, :school_id, :school_name, :major, :level_of_study,
       :shirt_size, :dietary_restrictions, :special_needs, :international,
-      :portfolio_url, :vcs_url, :agreement_accepted, :bus_captain_interest,
-      :phone, :can_share_info, :code_of_conduct_accepted,
-      :travel_not_from_school, :travel_location, :data_sharing_accepted,
+      :portfolio_url, :vcs_url, :bus_captain_interest,:phone, :can_share_info,
+      :travel_not_from_school, :travel_location,
       :graduation_year, :race_ethnicity, :resume, :delete_resume, :why_attend,
       :bus_list_id, :is_bus_captain, :boarded_bus
     )

app/controllers/questionnaires_controller.rb

@@ -24,6 +24,7 @@ def new
       return redirect_to questionnaires_path
     end
     @questionnaire = Questionnaire.new
+    @agreements = Agreement.all
 
     if session["devise.provider_data"] && session["devise.provider_data"]["info"]
       info = session["devise.provider_data"]["info"]
@@ -50,6 +51,7 @@ def new
 
   # GET /apply/edit
   def edit
+    @agreements = Agreement.all
   end
 
   # POST /apply
@@ -62,6 +64,7 @@ def create
 
     @questionnaire = Questionnaire.new(convert_school_name_to_id(questionnaire_params))
     @questionnaire.user_id = current_user.id
+    @agreements = Agreement.all
 
     respond_to do |format|
       if @questionnaire.save
@@ -86,7 +89,7 @@ def update
         format.html { redirect_to questionnaires_path, notice: 'Application was successfully updated.' }
         format.json { head :no_content }
       else
-        format.html { render action: "edit" }
+        format.html { redirect_to edit_questionnaires_url }
         format.json { render json: @questionnaire.errors, status: :unprocessable_entity }
       end
     end
@@ -126,10 +129,9 @@ def questionnaire_params
       :email, :experience, :gender,
       :date_of_birth, :interest, :school_id, :school_name, :major, :level_of_study,
       :shirt_size, :dietary_restrictions, :special_needs, :international,
-      :portfolio_url, :vcs_url, :agreement_accepted, :bus_captain_interest,
-      :phone, :can_share_info, :code_of_conduct_accepted,
-      :travel_not_from_school, :travel_location, :data_sharing_accepted,
-      :graduation_year, :race_ethnicity, :resume, :delete_resume, :why_attend
+      :portfolio_url, :vcs_url, :bus_captain_interest,
+      :phone, :can_share_info, :travel_not_from_school, :travel_location,
+      :graduation_year, :race_ethnicity, :resume, :delete_resume, :why_attend, :agreement_ids => []
     )
   end
 

app/controllers/rsvps_controller.rb

@@ -47,7 +47,7 @@ def update
     bus = @questionnaire.bus_list_id
     acc_status = @questionnaire.acc_status
 
-    unless @questionnaire.update_attributes(params.require(:questionnaire).permit(:agreement_accepted, :phone))
+    unless @questionnaire.update_attributes(params.require(:questionnaire).permit(:phone))
       flash[:alert] = @questionnaire.errors.full_messages.join(", ")
       redirect_to rsvp_path
       return

app/models/agreement.rb

@@ -0,0 +1,13 @@
+class Agreement < ApplicationRecord
+    include ActionView::Helpers::UrlHelper
+    validates_presence_of :name
+    validates_presence_of :agreement_url
+
+    strip_attributes
+
+    has_and_belongs_to_many :questionnaires
+
+    def formatted_agreement
+        "I read and accept the&nbsp;#{link_to name, agreement_url, target: "_blank"}&nbsp;agreement.".html_safe
+    end
+end

app/models/questionnaire.rb

@@ -18,19 +18,19 @@ class Questionnaire < ApplicationRecord
   belongs_to :user
   belongs_to :school
   belongs_to :bus_list, optional: true
+  has_and_belongs_to_many :agreements
 
   validates_uniqueness_of :user_id
 
   validates_presence_of :phone, :date_of_birth, :school_id, :experience, :shirt_size, :interest
   validates_presence_of :gender, :major, :level_of_study, :graduation_year, :race_ethnicity
-  validates_presence_of :agreement_accepted, message: "Please read & accept"
-  validates_presence_of :code_of_conduct_accepted, message: "Please read & accept"
-  validates_presence_of :data_sharing_accepted, message: "Please read & accept"
 
   DIETARY_SPECIAL_NEEDS_MAX_LENGTH = 500
   validates_length_of :dietary_restrictions, maximum: DIETARY_SPECIAL_NEEDS_MAX_LENGTH
   validates_length_of :special_needs, maximum: DIETARY_SPECIAL_NEEDS_MAX_LENGTH
 
+  validate :agreements_present
+
   # if HackathonManager.field_enabled?(:why_attend)
   #   validates_presence_of :why_attend
   # end
@@ -215,6 +215,26 @@ def verbal_status
     end
   end
 
+  def agreements_present
+    if (Agreement.all - self.agreements).any?
+      errors.add(:agreements, "must be accepted.")
+    end
+  end
+
+  def all_agreements_accepted?
+    (Agreement.all - self.agreements).empty?
+  end
+
+  def unaccepted_agreements
+    Agreement.all - self.agreements
+  end
+
+  def as_json(options = {})
+    result = super
+    result['all_agreements_accepted'] = all_agreements_accepted?
+    result
+  end
+
   private
 
   def clean_for_non_rsvp
@@ -277,4 +297,5 @@ def queue_triggered_email_rsvp_reminder
     end
     UserMailer.rsvp_reminder_email(user_id).deliver_later(wait_until: deliver_date) if deliver_date.present?
   end
+
 end

app/views/application/_unaccepted_agreements_notice.html.haml

@@ -0,0 +1,10 @@
+#disclaimer.alert
+  %h1.section-title
+    %span.emphasized.fa.fa-exclamation-circle
+    Missing
+    %span.emphasized Agreements
+  %p
+    You have unaccepted agreements. You will not be allowed at #{HackathonConfig['name']} until all agreements have been accepted. Please 
+    %strong
+      #{link_to "edit your application", edit_questionnaires_path} 
+    and review all agreements before attending.

app/views/doorkeeper/applications/index.html.haml

@@ -10,8 +10,6 @@
           = t(:name, scope: 'doorkeeper.applications.index')
         %th
           = t(:callback_url, scope: 'doorkeeper.applications.index')
-        %th
-          = t(:confidential, scope: 'doorkeeper.applications.index')
 
 
     %tbody
@@ -26,4 +24,3 @@
             = simple_format(application.redirect_uri)
           %td
             = application.confidential? ? t('doorkeeper.applications.index.confidentiality.yes') : t('doorkeeper.applications.index.confidentiality.no')
-

app/views/layouts/manage/application.html.haml

@@ -100,6 +100,10 @@
                   = active_link_to manage_users_path, class: "nav-link" do
                     .fa.fa-users.fa-fw.icon-space-r-half
                     = t(:title, scope: 'pages.manage.users')
+                %li.nav-item
+                  = active_link_to manage_agreements_path, class: "nav-link" do
+                    .fa.fa-balance-scale.fa-fw.icon-space-r-half
+                    = t(:title, scope: 'pages.manage.agreements')
                 %li.nav-item
                   = active_link_to manage_configs_path, class: "nav-link" do
                     .fa.fa-wrench.fa-fw.icon-space-r-half

app/views/manage/agreements/_form.html.haml

@@ -0,0 +1,10 @@
+.form-container
+  = bs_horizontal_simple_form_for(@agreement, url: url_for(action: @agreement.new_record? ? "create" : "update", controller: "agreements")) do |f|
+    = f.error_notification
+
+    .form-inputs
+      = f.input :name
+      = f.input :agreement_url, hint: "Should be a full https:// URL to a web page or .pdf file", label: t(:agreement_url, scope: 'pages.manage.agreements')
+
+    .form-actions
+      = f.button :submit, class: 'btn-primary'

app/views/manage/agreements/edit.html.haml

@@ -0,0 +1,3 @@
+= render "layouts/manage/page_title", title: t(:edit, scope: 'pages.manage.agreements')
+
+= render 'form'

app/views/manage/agreements/index.html.haml

@@ -0,0 +1,28 @@
+= render "layouts/manage/page_title", title: t(:title, scope: 'pages.manage.agreements') do
+  = link_to "New Agreement", new_manage_agreement_path, class: "btn btn-sm btn-outline-secondary"
+
+%p.text-muted
+  = t(:notice, scope: 'pages.manage.agreements', hackathon_name: HackathonConfig['name'])
+.mb-4
+  %table.table.table-striped.table-hover
+    %thead
+      %tr
+        %th
+        %th
+        %th
+          = t(:name, scope: 'pages.manage.agreements')
+        %th
+          = t(:agreement_url, scope: 'pages.manage.agreements')
+
+    %tbody
+      - @agreements.each do |agreement|
+        %tr
+          %td
+            = link_to '<i class="fa fa-pencil"></i>'.html_safe, edit_manage_agreement_path(agreement)
+          %td
+            = link_to '<i class="fa fa-trash"></i>'.html_safe, manage_agreement_path(agreement), method: :delete, data: { confirm: "Are you sure? The agreement will be permanently deleted. This action is irreversible." }
+          %td
+            %strong
+              = agreement.name
+          %td
+            = agreement.agreement_url

app/views/manage/agreements/new.html.haml

@@ -0,0 +1,3 @@
+= render "layouts/manage/page_title", title: t(:new, scope: 'pages.manage.agreements')
+
+= render 'form'

app/views/manage/questionnaires/_checkin_compliance_card.html.haml

@@ -33,12 +33,15 @@
         %li.list-group-item.list-group-item-warning
           %span.fa.fa-exclamation-circle.fa-fw.icon-space-r
           18 years or older
-      - if @questionnaire.agreement_accepted && @questionnaire.code_of_conduct_accepted && @questionnaire.data_sharing_accepted
-        %li.list-group-item
-          .text-success
-            %span.fa.fa-check.fa-fw.icon-space-r
-            Event agreement, MLH Code of Conduct, and MLH Data Sharing
-      - else
-        %li.list-group-item.list-group-item-danger
-          %span.fa.fa-close.fa-fw.icon-space-r
-          One or more of the following was not accepted: Event agreement, MLH Code of Conduct, and/or MLH Data Sharing
+      - if @agreements.any?
+        - if @questionnaire.all_agreements_accepted?
+          %li.list-group-item
+            .text-success
+              %span.fa.fa-check.fa-fw.icon-space-r
+              = @questionnaire.agreements.map(&:name).join(', ')
+              accepted.
+        - else
+          %li.list-group-item.list-group-item-danger
+            %span.fa.fa-close.fa-fw.icon-space-r
+            Unaccepted Agreements: 
+            = @questionnaire.unaccepted_agreements.map(&:name).join(', ')

app/views/manage/questionnaires/_form.html.haml

@@ -85,30 +85,11 @@
 
             = f.input :can_share_info, label: "Share resume with employers?"
 
-      - if !HackathonConfig['digital_hackathon']
-        .col-xl-12
-          .card.mb-4
-            .card-header Agreements
-            .card-body
-              .supporting-text
-                Please read the
-                = link_to asset_url(HackathonConfig['agreement_pdf_asset']), target: '_blank' do
-                  #{HackathonConfig['name']} Agreement
-                  %span.fa.fa-external-link.icon-space-l-half
-              = f.input :agreement_accepted, label: "I accept the #{HackathonConfig['name']} agreement.", input_html: { "data-validate" => "presence" }
-
-              .supporting-text
-                Please read the
-                %a{ href:"http://static.mlh.io/docs/mlh-code-of-conduct.pdf", target: "_blank" }
-                  MLH Code of Conduct
-                  %span.fa.fa-external-link.icon-space-l-half
-              = f.input :code_of_conduct_accepted, label: "I accept the MLH Code of Conduct.", input_html: { "data-validate" => "presence" }
-
-              .supporting-text
-                I agree to the terms of both the
-                <a href="https://github.com/MLH/mlh-policies/tree/master/prize-terms-and-conditions" target="_blank">MLH Contest Terms</a> and Conditions and the
-                <a href="https://mlh.io/privacy" target="_blank">MLH Privacy Policy</a>. Please note that you may receive pre and post-event informational e-mails and occasional messages about hackathons from MLH as per the MLH Privacy Policy.
-              = f.input :data_sharing_accepted, label: "I accept the MLH policies.", input_html: { "data-validate" => "presence" }
+      .col-xl-6
+        .card.mb-4
+          .card-header Agreements
+          .card-body
+            = f.association :agreements, as: :check_boxes, label_method: :formatted_agreement, value_method: :id, label: ""
 
     .center.mb-4
       = f.button :submit, value: ( @questionnaire.new_record? ? 'Create' : 'Save' ), class: 'btn-primary'