Merge pull request #2312 from mikej/dietary-restrictions

Add support for dietary restrictions on member profiles

Author: mroderick

app/assets/javascripts/application.js

@@ -24,6 +24,7 @@
 //= require pickadate/picker.time
 //= require subscriptions-toggle
 //= require invitations
+//= require dietary-restrictions
 //= require cocoon
 //= require font_awesome5
 

app/assets/javascripts/dietary-restrictions.js

@@ -0,0 +1,12 @@
+$(document).ready(function() {
+  $('#member_dietary_restrictions_other').on('change', function () {
+    const $otherDietaryRestrictions = $('#member_other_dietary_restrictions');
+    const $elementToToggle = $otherDietaryRestrictions.parent();
+    if ($elementToToggle.hasClass('d-none')) {
+      $elementToToggle.removeClass('d-none').hide().slideDown(50);
+      $otherDietaryRestrictions.focus();
+    } else {
+      $elementToToggle.slideUp(50, () => $elementToToggle.addClass('d-none'));
+    }
+  });
+});

app/assets/stylesheets/application.scss

@@ -27,3 +27,9 @@
 $primary: $dark-codebar-blue !default;
 
 @import "bootstrap-custom";
+
+/* Bootstrap's Reboot sets legends to float: left, which puts the first check box in a fieldset off to the
+   right instead of underneath the legend. This overrides that. */
+legend {
+  float: none !important;
+}

app/controllers/admin/members_controller.rb

@@ -6,7 +6,7 @@ def index
   end
 
   def show
-    @member = Member.find(params[:id])
+    @member = MemberPresenter.new(Member.find(params[:id]))
     load_attendance_data(@member)
 
     @actions = admin_actions(@member).sort_by(&:created_at).reverse

app/controllers/concerns/member_concerns.rb

@@ -10,8 +10,16 @@ module InstanceMethods
 
     def member_params
       params.require(:member).permit(
-        :pronouns, :name, :surname, :email, :mobile, :about_you, :skill_list, :newsletter
-      )
+        :pronouns, :name, :surname, :email, :mobile, :about_you, :skill_list, :newsletter, :other_dietary_restrictions,
+          dietary_restrictions: [],
+      ).tap do |params|
+        # We want to keep Rails' hidden blank field in the form so that all dietary restrictions for a member can be
+        # removed by submitting the form with all check boxes unticked. However, we want to remove the blank value
+        # before setting the dietary restrictions attribute on the model.
+        # See Gotcha section here:
+        # https://api.rubyonrails.org/v7.1/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-collection_check_boxes
+        params[:dietary_restrictions] = params[:dietary_restrictions].reject(&:blank?) if params[:dietary_restrictions]
+      end
     end
 
     def suppress_notices

app/controllers/members_controller.rb

@@ -1,7 +1,7 @@
 class MembersController < ApplicationController
   include MemberConcerns
 
-  before_action :set_member, only: %i[edit step2 profile update]
+  before_action :set_member, only: %i[edit step2 update]
   before_action :authenticate_member!, only: %i[edit step2 profile]
   before_action :suppress_notices, only: %i[step2]
 
@@ -20,6 +20,7 @@ def step2
   end
 
   def profile
+    @member = MemberPresenter.new(current_user)
     render :show
   end
 

app/models/member.rb

@@ -20,6 +20,10 @@ class Member < ApplicationRecord
   validates :email, uniqueness: true
   validates :about_you, length: { maximum: 255 }
 
+  DIETARY_RESTRICTIONS = %w[vegan vegetarian pescetarian halal gluten_free dairy_free other].freeze
+  validates_inclusion_of :dietary_restrictions, in: DIETARY_RESTRICTIONS
+  validates_presence_of :other_dietary_restrictions, if: :other_dietary_restrictions?
+
   scope :accepted_toc, -> { where.not(accepted_toc_at: nil) }
   scope :order_by_email, -> { order(:email) }
   scope :subscribers, -> { joins(:subscriptions).order('created_at desc').uniq }
@@ -118,6 +122,10 @@ def recent_notes
     member_notes.where('created_at > ?', notes_from_date)
   end
 
+  def other_dietary_restrictions?
+    dietary_restrictions.present? && dietary_restrictions.include?('other')
+  end
+
   def self.find_members_by_name(name)
     name.strip!
     name.eql?('') ? self.none : where("CONCAT(name, ' ', surname) ILIKE ?", "%#{name}%")

app/presenters/member_presenter.rb

@@ -23,6 +23,14 @@ def pairing_details_array(role, tutorial, note)
     role.eql?('Coach') ? coach_pairing_details(note) : student_pairing_details(tutorial, note)
   end
 
+  def displayed_dietary_restrictions
+    return [] if dietary_restrictions.nil?
+
+    (dietary_restrictions - ['other']).map(&:humanize).tap do |drs|
+      drs << other_dietary_restrictions if other_dietary_restrictions? && other_dietary_restrictions.present?
+    end.map(&:upcase_first)
+  end
+
   private
 
   def coach_pairing_details(note)

app/views/admin/members/_profile.html.haml

@@ -10,7 +10,15 @@
     .mb-4
       %h5 Skills
       - @member.skills.each do |skill|
-        .badge.bg-success= skill.name
+        .badge.bg-secondary= skill.name
+
+  .mb-4
+    %h5 Dietary Restrictions      
+    - if @member.dietary_restrictions.present?
+      - @member.displayed_dietary_restrictions.each do |dr|
+        .badge.bg-secondary.text-wrap.text-break.mb-1.text-start= dr
+    - else
+      .text-muted None
 
   - if @workshop_attendances.positive? || @meeting_rsvps.positive? || @event_rsvps.positive?
     .attendance-summary.mt-4

app/views/admin/workshop/_attendances.html.haml

@@ -31,6 +31,10 @@
               = invitation.member.email
             - else
               = invitation.member.full_name
+          - if invitation.member.dietary_restrictions.present?
+            %p
+              - invitation.member.displayed_dietary_restrictions.each do |dr|
+                %span.badge.bg-secondary.text-wrap.text-break.mb-1.text-start= dr
         .col-6
           - if invitation.tutorial?
             %p.mb-1 Tutorial: #{invitation.tutorial}