Merge branch 'main' into 4946-partner-profile-export

Author: Benjamin-Couey

app/assets/stylesheets/simple_form-bootstrap/_form_multi_select.scss

@@ -16,4 +16,10 @@
     margin-left: 0 !important;
     margin-right: 0 !important;
   }
-}
+}
+
+.input-group, .form-group {
+  select {
+    @extend .form-select;
+  }
+}

app/controllers/admin/users_controller.rb

@@ -1,6 +1,6 @@
 # [Super Admin] This is for administrating users at a global level. We can create, view, modify, etc.
 class Admin::UsersController < AdminController
-  before_action :load_organizations, only: %i[new create edit update]
+  before_action :load_organizations, only: %i[create edit update]
   before_action :user_params, only: %i[create update]
 
   def index
@@ -34,15 +34,19 @@ def new
 
   def edit
     @user = User.find_by(id: params[:id])
-    @resources = Role.resources_for_select
   end
 
   def create
     @user = User.new(user_params)
-    UserInviteService.invite(name: user_params[:name],
+    validate_role_resource_params
+    klass = Role::TITLE_TO_RESOURCE[params[:resource_type].to_sym]
+    resource = klass&.find(params[:resource_id])
+    UserInviteService.invite(
+      name: user_params[:name],
       email: user_params[:email],
-      roles: [Role::ORG_USER],
-      resource: Organization.find(organization_id_param))
+      roles: [params[:resource_type].to_sym],
+      resource: resource
+    )
     flash[:notice] = "Created a new user!"
     redirect_to admin_users_path
   rescue => e
@@ -95,12 +99,9 @@ def user_params
     params.require(:user).permit(:name, :email)
   end
 
-  def organization_id_param
-    organization_id = params[:user][:organization_id]
-
-    raise "Please select an organization for the user." if organization_id.blank?
-
-    organization_id
+  def validate_role_resource_params
+    raise "Please select a role for the user." if params[:resource_type].blank?
+    raise "Please select an associated resource for the role." if !Role::ROLES_WITHOUT_RESOURCE.map(&:to_s).include?(params[:resource_type]) && params[:resource_id].blank?
   end
 
   def load_organizations

app/controllers/concerns/importable.rb

@@ -25,7 +25,7 @@ module Importable
   def import_csv
     if params[:file].present?
       data = File.read(params[:file].path, encoding: "BOM|UTF-8")
-      csv = CSV.parse(data, headers: true).reject { |row| row.to_hash.values.any?(&:nil?) }
+      csv = CSV.parse(data, headers: true)
       if csv.count.positive? && csv.first.headers.all? { |header| !header.nil? }
         errors = resource_model.import_csv(csv, current_organization.id)
         if errors.empty?

app/controllers/partner_users_controller.rb

@@ -24,6 +24,9 @@ def create
       @users = @partner.users
       render :index
     end
+  rescue => e
+    flash[:error] = e.message
+    redirect_to partner_users_path(@partner)
   end
 
   def destroy

app/helpers/items_helper.rb

@@ -19,4 +19,8 @@ def selected_item_request_units(item)
     item_request_unit_names = item.persisted? ? item.request_units.pluck(:name) : []
     current_organization.request_units.select { |unit| item_request_unit_names.include?(unit.name) }.pluck(:id)
   end
+
+  def quantity_below_minimum?(row_item)
+    row_item[:quantity] < row_item[:item_on_hand_minimum_quantity]
+  end
 end

app/javascript/controllers/hide_by_source_val_controller.js

@@ -0,0 +1,14 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ["source", "destination"]
+  static values = {
+    valuesToHide: Array
+  }
+  sourceChanged() {
+    const val = $(this.sourceTarget).val()
+    this.destinationTargets.forEach(
+      destination_target => { $(destination_target).toggleClass("d-none", this.valuesToHideValue.includes(val)); }
+    )
+  }
+}

app/models/base_item.rb

@@ -39,7 +39,7 @@ class BaseItem < ApplicationRecord
     "Adult Briefs (XXXL)" => "adult_incontinence",
     "Adult Cloth Diapers (Large/XL/XXL)" => "adult_incontinence",
     "Adult Cloth Diapers (Small/Medium)" => "adult_incontinence",
-    "adult_incontinence Pads" => "adult_incontinence",
+    "Adult Incontinence Pads" => "adult_incontinence",
     "Bed Pads (Cloth)" => "other",
     "Bed Pads (Disposable)" => "other",
     "Bibs (Adult & Child)" => "other",
@@ -69,7 +69,7 @@ class BaseItem < ApplicationRecord
     "Kids S/M (38-65 lbs)" => "disposable_diapers",
     "Kit" => nil,
     "Liners (Incontinence)" => "adult_incontinence",
-    "Liners (Menstrual)" => "menstrual",
+    "Liners (Menstrual)" => "period_liners",
     "Other" => "other",
     "Pads" => "pads",
     "Swimmers" => "disposable_diapers",

app/models/distribution.rb

@@ -47,7 +47,7 @@ class Distribution < ApplicationRecord
   enum :state, { scheduled: 5, complete: 10 }
   enum :delivery_method, { pick_up: 0, delivery: 1, shipped: 2 }
   scope :active, -> { joins(:line_items).joins(:items).where(items: { active: true }) }
-  scope :with_diapers, -> { joins(line_items: :item).merge(Item.disposable.or(Item.cloth_diapers)) }
+  scope :with_diapers, -> { joins(line_items: :item).merge(Item.disposable_diapers.or(Item.cloth_diapers)) }
   scope :with_period_supplies, -> { joins(line_items: :item).merge(Item.period_supplies) }
   # add item_id scope to allow filtering distributions by item
   scope :by_item_id, ->(item_id) { includes(:items).where(items: { id: item_id }) }

app/models/donation_site.rb

@@ -23,6 +23,7 @@ class DonationSite < ApplicationRecord
   belongs_to :organization
 
   validates :name, :address, presence: true
+  validates :name, uniqueness: {scope: :organization_id, message: "must be unique within the organization"}
   validates :contact_name, length: {minimum: 3}, allow_blank: true
   validates :email, format: {with: URI::MailTo::EMAIL_REGEXP, message: "is not a valid email format"}, allow_blank: true
 
@@ -36,12 +37,17 @@ class DonationSite < ApplicationRecord
   scope :alphabetized, -> { order(:name) }
 
   def self.import_csv(csv, organization)
-    csv.each do |row|
+    errors = []
+    csv.each_with_index do |row, index|
       loc = DonationSite.new(row.to_hash)
       loc.organization_id = organization
-      loc.save!
+      if loc.save
+        Rails.logger.info "Successfully imported: #{loc.name}"
+      else
+        errors << "Row #{index + 2}, #{row.to_hash["name"]} - #{loc.errors.full_messages.join(", ")}"
+      end
     end
-    []
+    errors
   end
 
   def self.csv_export_headers

app/models/item.rb

@@ -67,56 +67,22 @@ class Item < ApplicationRecord
 
   scope :by_size, ->(size) { joins(:base_item).where(base_items: { size: size }) }
 
-  # Scopes - explanation of business rules for filtering scopes as of 20240527.  This was a mess, but is much better now.
-  # 1/  Disposable.   Disposables are only the disposable diapers for children.  So we deliberately exclude adult and cloth
-  # 2/  Cloth.  Cloth diapers for children.  Exclude adult cloth. Cloth training pants also go here.
-  # 3/  Adult incontinence.  Items for adult incontinence -- diapers, ai pads, but not adult wipes.
-  # 4/  Period supplies.  All things with 'menstrual in the category'
-  # 5/  Other -- Miscellaneous, and wipes
-  # Known holes and ambiguities as of 20240527.  Working on these with the business
-  # 1/  Liners.   We are adding a new item for AI liners,  and renaming the current liners to be specifically for periods,
-  # having confirmed with the business that the majority of liners are for menstrual use.
-  # However, there is a product which can be used for either, so we are still sussing out what to do about that.
-
-  scope :disposable, -> {
-    joins(:base_item)
-      .where("lower(base_items.category) LIKE '%diaper%'")
-      .where.not("lower(base_items.category) LIKE '%cloth%' OR lower(base_items.name) LIKE '%cloth%'")
-      .where.not("lower(base_items.category) LIKE '%adult%'")
-  }
-
-  scope :cloth_diapers, -> {
-    joins(:base_item)
-      .where("lower(base_items.category) LIKE '%cloth%'")
-      .or(where("base_items.category = 'Training Pants'"))
-      .where.not("lower(base_items.category) LIKE '%adult%'")
-  }
-
-  scope :adult_incontinence, -> {
-    joins(:base_item)
-      .where("lower(base_items.category) LIKE '%adult%' AND lower(base_items.category) NOT LIKE '%wipes%'")
-  }
-
   scope :period_supplies, -> {
-    joins(:base_item)
-      .where("lower(base_items.category) LIKE '%menstrual%'")
-  }
-
-  scope :other_categories, -> {
-    joins(:base_item)
-      .where("lower(base_items.category) LIKE '%wipes%'")
-      .or(where("base_items.category = 'Miscellaneous'"))
+    where(reporting_category: [:pads, :tampons, :period_liners, :period_underwear, :period_other])
   }
 
   enum :reporting_category, {
     adult_incontinence: "adult_incontinence",
     cloth_diapers: "cloth_diapers",
     disposable_diapers: "disposable_diapers",
     menstrual: "menstrual",
-    other: "other",
+    other_categories: "other",
     pads: "pads",
+    period_liners: "period_liners",
+    period_other: "period_other",
+    period_underwear: "period_underwear",
     tampons: "tampons"
-  }, scopes: false, instance_methods: false
+  }, instance_methods: false
 
   def self.reactivate(item_ids)
     item_ids = Array.wrap(item_ids)