UI for setting the reason why SHF is waiting on an applicant

app/assets/stylesheets/member-app-waiting-reason.scss

@@ -1,7 +1,27 @@
-.member_app_waiting_reasons {
+#member-app-waiting-reasons {
 
-  input.wpcf7-form-control.is-custom {
-    width: 3rem;
+  margin-bottom: 1rem;
+  .row {
+    margin-top: 0;
+    margin-bottom: 0;
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+  }
+
+  border-bottom: 1pt solid coral;
+
+
+  select {
+    height: 110%;
+  }
+
+  label {
+    font-weight: normal;
+  }
+
+  input[type="text"] {
+    padding: 0.3rem;
+    width: 35rem;
   }
 
 }

app/controllers/membership_applications_controller.rb

@@ -3,6 +3,7 @@ class MembershipApplicationsController < ApplicationController
 
   before_action :get_membership_application, except: [:information, :index, :new, :create]
   before_action :authorize_membership_application, only: [:update, :show, :edit]
+  before_action :set_other_waiting_reason, only: [:show, :edit, :update]
 
 
   def new
@@ -16,7 +17,7 @@ def index
     authorize MembershipApplication
 
     action_params, @items_count, items_per_page =
-      process_pagination_params('membership_application')
+        process_pagination_params('membership_application')
 
     @search_params = MembershipApplication.ransack(action_params)
 
@@ -47,15 +48,11 @@ def create
         helpers.flash_message(:notice, t('.success'))
         redirect_to root_path
       else
-        helpers.flash_message(:alert, t('.error'))
-        current_user.membership_applications.reload
-        render :new
+        create_error(t('.error'))
       end
 
     else
-      helpers.flash_message(:alert, t('.error'))
-      current_user.membership_applications.reload
-      render :new
+      create_error(t('.error'))
     end
   end
 
@@ -67,18 +64,26 @@ def update
 
         check_and_mark_if_ready_for_review params['membership_application'] if params.fetch('membership_application', false)
 
-        helpers.flash_message(:notice, t('.success'))
-        render :show
+        respond_to do |format|
+          format.js do
+            head :ok   # just let the receiver know everything is OK. no need to render anything
+          end
+
+          format.html do
+            helpers.flash_message(:notice, t('.success'))
+            render :show
+          end
+
+        end
 
       else
-        helpers.flash_message(:alert, t('.error'))
-        redirect_to edit_membership_application_path(@membership_application)
+        update_error(t('.error'))
       end
 
     else
-      helpers.flash_message(:alert, t('.error'))
-      redirect_to edit_membership_application_path(@membership_application)
+      update_error(t('.error'))
     end
+
   end
 
 
@@ -95,7 +100,7 @@ def information
 
 
   def destroy
-    @membership_application = MembershipApplication.find(params[:id])  # we don't need to fetch the categories
+    @membership_application = MembershipApplication.find(params[:id]) # we don't need to fetch the categories
     @membership_application.destroy
     redirect_to membership_applications_url, notice: t('membership_applications.application_deleted')
   end
@@ -132,21 +137,30 @@ def need_info
 
 
   def cancel_need_info
+
+    # empty out the reason for waiting info
+    @membership_application.waiting_reason = nil
+    @membership_application.custom_reason_text = nil
+
     simple_state_change(:cancel_waiting_for_applicant!, t('.success'), t('.error'))
   end
 
+
   def need_payment
     simple_state_change(:ask_for_payment!, t('.success'), t('.error'))
   end
 
+
   def cancel_need_payment
     simple_state_change(:cancel_waiting_for_payment!, t('.success'), t('.error'))
   end
 
+
   def received_payment
     simple_state_change(:received_payment!, t('.success'), t('.error'))
   end
 
+
   private
   def membership_application_params
     params.require(:membership_application).permit(*policy(@membership_application || MembershipApplication).permitted_attributes)
@@ -164,6 +178,11 @@ def authorize_membership_application
   end
 
 
+  def set_other_waiting_reason
+    @other_waiting_reason_text = t('admin_only.member_app_waiting_reasons.other_custom_reason')
+  end
+
+
   def new_file_uploaded(params)
 
     successful = true
@@ -205,4 +224,23 @@ def simple_state_change(state_method, success_msg, error_msg)
   end
 
 
+  def create_error(error_message)
+    helpers.flash_message(:alert, error_message)
+    current_user.membership_applications.reload
+    render :new
+  end
+
+
+  def update_error(error_message)
+
+    if request.xhr?
+      render json: @membership_application.errors.full_messages, status: :unprocessable_entity if request.xhr?
+    else
+      helpers.flash_message(:alert, error_message)
+      redirect_to edit_membership_application_path(@membership_application)
+    end
+
+  end
+
+
 end

app/helpers/membership_applications_helper.rb

@@ -4,8 +4,54 @@ def can_edit_state?
     policy(@membership_application).permitted_attributes_for_edit.include? :state
   end
 
+
   def member_full_name
     @membership_application ? "#{@membership_application.first_name} #{@membership_application.last_name}" : '..'
 
   end
+
+
+  # the method to use to get the name for a reason, given the locale
+  # If no locale is given, the current locale is used.
+  # If the locale given isn't found or defined, the default name method is used
+  def reason_name_method(locale = I18n.locale)
+    reason_method 'name', locale
+  end
+
+
+  # the method to use to get the description for a reason, given the locale
+  # If no locale is given, the current locale is used.
+  # If the locale given isn't found or defined, the default name method is used
+  def reason_desc_method(locale = I18n.locale)
+    reason_method 'description', locale
+  end
+
+
+  # a collection of arrays with [the name of the reasons for waiting, the reason (object)]
+  # in the locale
+  def reasons_for_waiting_names(use_locale = I18n.locale)
+    reasons_for_waiting_info('name', use_locale)
+  end
+
+
+  # a collection of arrays with [the descriptions of the reasons for waiting,  the reason (object)]
+  # in the locale
+  def reasons_for_waiting_descs(use_locale = I18n.locale)
+    reasons_for_waiting_info('description', use_locale)
+  end
+
+
+  private
+
+  def reason_method(method_prefix, locale)
+    possible_method = "#{method_prefix}_#{locale}".to_sym
+   (AdminOnly::MemberAppWaitingReason.new.respond_to?(possible_method) ? possible_method : AdminOnly::MemberAppWaitingReason.send("default_#{method_prefix}_method".to_sym))
+  end
+
+
+  def reasons_for_waiting_info(method_prefix, locale)
+    method_name = reason_method(method_prefix, locale)
+    AdminOnly::MemberAppWaitingReason.all.map { |r| [r.id, r.send(method_name)] }
+  end
+
 end

app/models/admin_only/member_app_waiting_reason.rb

@@ -12,15 +12,25 @@ def other_reason_placeholder?
 
 
     # This is effectively a CONSTANT that is used in the UI
-    def self.other_reason_name
-      I18n.t('admin_only.member_app_waiting_reasons.other_custom_reason')
+    def self.other_reason_name(locale = I18n.locale)
+      I18n.t('admin_only.member_app_waiting_reasons.other_custom_reason', locale)
     end
 
 
+    def self.other_reason_desc(locale = I18n.locale)
+      I18n.t('admin_only.member_app_waiting_reasons.other_custom_reason_desc', locale)
+    end
+
+
+
     def self.default_name_method
       :name_sv
     end
 
+    def self.default_description_method
+      :description_sv
+    end
+
   end
 
 end

app/models/membership_application.rb

@@ -23,6 +23,11 @@ class MembershipApplication < ApplicationRecord
   has_and_belongs_to_many :business_categories
   has_many :uploaded_files
 
+  belongs_to :waiting_reason, optional: true,
+             foreign_key: "member_app_waiting_reasons_id",
+             class_name: 'AdminOnly::MemberAppWaitingReason'
+
+
   validates_presence_of :first_name,
                         :last_name,
                         :company_number,

app/policies/membership_application_policy.rb

@@ -97,7 +97,7 @@ def user_owner_attributes
 
 
   def all_attributes
-    owner_attributes + [:membership_number]
+    owner_attributes + [:membership_number, :waiting_reason, :custom_reason_text, :member_app_waiting_reasons_id]
   end
 
 
@@ -121,4 +121,4 @@ def owner?
     user && @record.respond_to?(:user) && @record.user == user
   end
 
-end
+end

app/views/membership_applications/_application_status_form.html.haml

@@ -1,23 +1,31 @@
+- if @membership_application.waiting_for_applicant?
+  = render 'reason_waiting'
+
+
+
 #admin-change-status-buttons
   %p.header
     = "#{t('membership_applications.show.change_status')}:"
 
 
-  = button_to t('membership_applications.start_review_btn'), start_review_membership_application_path(@membership_application), {class: 'btn start-review', disabled: !(@membership_application.may_start_review?)}
+  .row
+    = button_to t('membership_applications.start_review_btn'), start_review_membership_application_path(@membership_application), {class: 'btn start-review', disabled: !(@membership_application.may_start_review?)}
+
+    = button_to t('membership_applications.accept_btn'), accept_membership_application_path(@membership_application), {class: 'btn accept', disabled: !(@membership_application.may_accept?)}
 
-  = button_to t('membership_applications.accept_btn'), accept_membership_application_path(@membership_application), {class: 'btn accept', disabled: !(@membership_application.may_accept?)}
+    = button_to t('membership_applications.reject_btn'), reject_membership_application_path(@membership_application), {class: 'btn reject', disabled: !(@membership_application.may_reject?)}
 
-  = button_to t('membership_applications.reject_btn'), reject_membership_application_path(@membership_application), {class: 'btn reject', disabled: !(@membership_application.may_reject?)}
+    = button_to t('membership_applications.ask_applicant_for_info_btn'), need_info_membership_application_path(@membership_application), {class: 'btn need-info', disabled: !(@membership_application.may_ask_applicant_for_info?)}
 
-  = button_to t('membership_applications.ask_applicant_for_info_btn'), need_info_membership_application_path(@membership_application), {class: 'btn need-info', disabled: !(@membership_application.may_ask_applicant_for_info?)}
+  .row
+    = button_to t('membership_applications.cancel_waiting_for_applicant_btn'), cancel_need_info_membership_application_path(@membership_application), {class: 'btn cancel-need-info', disabled: !(@membership_application.may_cancel_waiting_for_applicant?)}
 
-  = button_to t('membership_applications.cancel_waiting_for_applicant_btn'), cancel_need_info_membership_application_path(@membership_application), {class: 'btn cancel-need-info', disabled: !(@membership_application.may_cancel_waiting_for_applicant?)}
+    = button_to t('membership_applications.ask_applicant_for_payment_btn'), need_payment_membership_application_path(@membership_application), {class: 'btn need-payment', disabled: !(@membership_application.may_ask_for_payment?)}
 
-  = button_to t('membership_applications.ask_applicant_for_payment_btn'), need_payment_membership_application_path(@membership_application), {class: 'btn need-payment', disabled: !(@membership_application.may_ask_for_payment?)}
+    = button_to t('membership_applications.cancel_waiting_for_payment_btn'), cancel_need_payment_membership_application_path(@membership_application), {class: 'btn cancel_need-payment', disabled: !(@membership_application.may_cancel_waiting_for_payment?)}
 
-  = button_to t('membership_applications.cancel_waiting_for_payment_btn'), cancel_need_payment_membership_application_path(@membership_application), {class: 'btn cancel_need-payment', disabled: !(@membership_application.may_cancel_waiting_for_payment?)}
+    = button_to t('membership_applications.received_payment_btn'), received_payment_membership_application_path(@membership_application), {class: 'btn received-payment', disabled: !(@membership_application.may_received_payment?)}
 
-  = button_to t('membership_applications.received_payment_btn'), received_payment_membership_application_path(@membership_application), {class: 'btn received-payment', disabled: !(@membership_application.may_received_payment?)}
 
 %br
   - if !@membership_application.paid?