Merge branch 'main' into summary-report-guide-correction

Author: cielf

app/controllers/partners_controller.rb

@@ -15,7 +15,7 @@ def index
 
     respond_to do |format|
       format.html
-      format.csv { send_data Exports::ExportPartnersCSVService.new(@partners.unscope(:includes)).generate_csv, filename: "Partners-#{Time.zone.today}.csv" }
+      format.csv { send_data Exports::ExportPartnersCSVService.new(@partners.unscope(:includes), current_organization).generate_csv, filename: "Partners-#{Time.zone.today}.csv" }
     end
   end
 

app/helpers/donations_helper.rb

@@ -16,6 +16,11 @@ def total_received_from_product_drives(range = selected_range)
     number_with_delimiter total_received_from_product_drives_unformatted(range)
   end
 
+  def total_number_of_drives(range = selected_range)
+    formatted_range = format_date_range_to_iso(range)
+    current_organization.product_drives.within_date_range(formatted_range).count
+  end
+
   private
 
   def total_received_donations_unformatted(range = selected_range)
@@ -25,4 +30,8 @@ def total_received_donations_unformatted(range = selected_range)
   def total_received_from_product_drives_unformatted(range = selected_range)
     LineItem.active.where(itemizable: current_organization.donations.by_source(:product_drive).during(range)).sum(:quantity)
   end
+
+  def format_date_range_to_iso(range)
+    "#{range.begin.to_date.iso8601} - #{range.end.to_date.iso8601}"
+  end
 end

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/item.rb

@@ -29,6 +29,7 @@ class Item < ApplicationRecord
   include Exportable
   include Valuable
 
+  after_initialize :set_default_distribution_quantity, if: :new_record?
   after_update :update_associated_kit_name, if: -> { kit.present? }
   before_create :set_reporting_category
   before_destroy :validate_destroy, prepend: true
@@ -67,56 +68,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)
@@ -228,6 +195,10 @@ def set_reporting_category
     self.reporting_category = base_item.reporting_category if base_item.reporting_category
   end
 
+  def set_default_distribution_quantity
+    self.distribution_quantity ||= kit_id.present? ? 1 : 50
+  end
+
   def update_associated_kit_name
     kit.update(name: name)
   end

app/models/organization.rb

@@ -168,6 +168,10 @@ def address_changed?
     street_changed? || city_changed? || state_changed? || zipcode_changed?
   end
 
+  def partials_to_show
+    partner_form_fields.presence || ALL_PARTIALS.map { |partial| partial[1] }
+  end
+
   def self.seed_items(organization = Organization.all)
     base_items = BaseItem.without_kit.map(&:to_h)
 

app/models/partner.rb

@@ -66,18 +66,7 @@ class Partner < ApplicationRecord
     where(status: status.to_sym)
   }
 
-  ALL_PARTIALS = %w[
-    media_information
-    agency_stability
-    organizational_capacity
-    sources_of_funding
-    area_served
-    population_served
-    executive_director
-    pick_up_person
-    agency_distribution_information
-    attached_documents
-  ].freeze
+  ALL_PARTIALS = Organization::ALL_PARTIALS.map { |partial| partial[1] }.freeze
 
   # @return [String]
   def display_status
@@ -126,33 +115,8 @@ def self.import_csv(csv, organization_id)
     errors
   end
 
-  def contact_person
-    return @contact_person if @contact_person
-
-    @contact_person = {
-      name: profile.primary_contact_name,
-      email: profile.primary_contact_email,
-      phone: profile.primary_contact_phone ||
-             profile.primary_contact_mobile
-    }
-  end
-
-  def agency_info
-    return @agency_info if @agency_info
-
-    symbolic_agency_type = profile.agency_type&.to_sym
-    @agency_info = {
-      address: [profile.address1, profile.address2].select(&:present?).join(', '),
-      city: profile.city,
-      state: profile.state,
-      zip_code: profile.zip_code,
-      website: profile.website,
-      agency_type: (symbolic_agency_type == :other) ? "#{I18n.t symbolic_agency_type, scope: :partners_profile}: #{profile.other_agency_type}" : (I18n.t symbolic_agency_type, scope: :partners_profile)
-    }
-  end
-
   def partials_to_show
-    organization.partner_form_fields.presence || ALL_PARTIALS
+    organization.partials_to_show
   end
 
   def quantity_year_to_date

app/models/partners/profile.rb

@@ -8,15 +8,13 @@
 #  address2                       :string
 #  agency_mission                 :text
 #  agency_type                    :string
-#  application_data               :text
 #  at_fpl_or_below                :integer
 #  case_management                :boolean
 #  city                           :string
 #  client_capacity                :string
 #  currently_provide_diapers      :boolean
 #  describe_storage_space         :text
 #  distribution_times             :string
-#  distributor_type               :string
 #  enable_child_based_requests    :boolean          default(TRUE), not null
 #  enable_individual_requests     :boolean          default(TRUE), not null
 #  enable_quantity_based_requests :boolean          default(TRUE), not null
@@ -144,7 +142,44 @@ class Profile < Base
     validate :has_at_least_one_request_setting
     validate :pick_up_email_addresses
 
+    # For the sake of documentation, here are the partials each field belongs to. In the order those
+    # partials appear in the actual form.
+    # agency_information -- this partial is always shown, contains the agency information AND the Program / Delivery Address sections of the form
+    #   agency_type, other_agency_type, agency_mission, address1, address2, city, state, zip_code,
+    #   program_address1, program_address2, program_city, program_state, program_zip_code
+    # media_information
+    #   website, facebook, twitter, instagram, no_social_media_presence
+    # agency_stability
+    #   founded, form_990, program_name, program_description, program_age, evidence_based, case_management,
+    #   essentials_use, receives_essentials_from_other, currently_provide_diapers
+    # organizational_capacity
+    #   client_capacity, storage_space, describe_storage_space
+    # sources_of_funding
+    #   sources_of_funding, sources_of_diapers, essentials_budget, essentials_funding_source
+    # area_served
+    #   has no associated Partners::Profile fields
+    # population_served
+    #   income_requirement_desc, income_verification, population_black, population_white,
+    #   population_hispanic, population_asian, population_american_indian, population_island,
+    #   population_multi_racial, population_other, zips_served, at_fpl_or_below, above_1_2_times_fpl
+    #   greater_2_times_fpl, poverty_unknown
+    # executive_director
+    #   executive_director_name, executive_director_phone, executive_director_email, primary_contact_name,
+    #   primary_contact_phone, primary_contact_mobile, primary_contact_email
+    # pick_up_person
+    #   pick_up_name, pick_up_phone, pick_up_email
+    # agency_distribution_information
+    #   distribution_times, new_client_times, more_docs_required
+    # attached_documents
+    #   has no associated Partners::Profile fields
+    # partner_settings -- this partial is always shown
+    #   enable_quantity_based_requests, enable_child_based_requests, enable_individual_requests
+
+    # These are columns which currently do not appear in any partial of the profile form.
+    # It is possible these will be removed in the future.
     self.ignored_columns += %w[
+      application_data
+      distributor_type
       evidence_based_description
       program_client_improvement
       incorporate_plan