Merge branch 'main' into 5037-default-the-quantity-per-individual-to-50-in-the-data

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/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

app/services/exports/export_partners_csv_service.rb

@@ -4,8 +4,12 @@ class ExportPartnersCSVService
     # to this service object; this is happening within the same request/response cycle, so it's already
     # in memory, so we can pass that collection in directly. Should this be moved to a background / async
     # job, we will need to pass in a collection of IDs instead.
-    def initialize(partners)
+    def initialize(partners, organization)
       @partners = partners.includes(:profile)
+      # Assumes that all of the partners belong to the same organization. This is true for the time being
+      # and, were that to change, base_table would need to be reworked anyway to account for partners from
+      # different orgs having different partials enabled, and thus different columns in the CSV.
+      @partials_to_show = organization.partials_to_show
     end
 
     def generate_csv
@@ -19,28 +23,148 @@ def generate_csv
 
     attr_reader :partners
 
-    def headers
-      base_table.keys
-    end
-
     def base_table
-      {
+      table = {
         "Agency Name" => ->(partner) { partner.name },
         "Agency Email" => ->(partner) { partner.email },
-        "Agency Address" => ->(partner) { partner.agency_info[:address] },
-        "Agency City" => ->(partner) { partner.agency_info[:city] },
-        "Agency State" => ->(partner) { partner.agency_info[:state] },
-        "Agency Zip Code" => ->(partner) { partner.agency_info[:zip_code] },
-        "Agency Website" => ->(partner) { partner.agency_info[:website] },
-        "Agency Type" => ->(partner) { partner.agency_info[:agency_type] },
-        "Contact Name" => ->(partner) { partner.contact_person[:name] },
-        "Contact Phone" => ->(partner) { partner.contact_person[:phone] },
-        "Contact Email" => ->(partner) { partner.contact_person[:email] },
         "Notes" => ->(partner) { partner.notes },
-        "Counties Served" => ->(partner) { county_list_by_regions[partner.id] || "" },
-        "Providing Diapers" => ->(partner) { diaper_statuses[partner.id] },
-        "Providing Period Supplies" => ->(partner) { period_supplies_statuses[partner.id] }
+        "Agency Type" => ->(partner) { I18n.t(partner.profile.agency_type, scope: :partners_profile) }, # Columns from the agency_information partial
+        "Other Agency Type" => ->(partner) { partner.profile.other_agency_type },
+        "Agency Mission" => ->(partner) { partner.profile.agency_mission },
+        "Agency Address" => ->(partner) {
+          (partner.profile.address1.blank? || partner.profile.address2.blank?) ?
+          "" : "#{partner.profile.address1}, #{partner.profile.address2}"
+        },
+        "Agency City" => ->(partner) { partner.profile.city },
+        "Agency State" => ->(partner) { partner.profile.state },
+        "Agency Zip Code" => ->(partner) { partner.profile.zip_code },
+        "Program/Delivery Address" => ->(partner) {
+          (partner.profile.program_address1.blank? || partner.profile.program_address2.blank?) ?
+          "" : "#{partner.profile.program_address1}, #{partner.profile.program_address2}"
+        },
+        "Program City" => ->(partner) { partner.profile.program_city },
+        "Program State" => ->(partner) { partner.profile.program_state },
+        "Program Zip Code" => ->(partner) { partner.profile.program_zip_code }
       }
+
+      media_information_col(table)
+      agency_stability_col(table)
+      organizational_capacity_col(table)
+      sources_of_funding_col(table)
+      area_served_col(table)
+      population_served_col(table)
+      executive_director_col(table)
+      pick_up_person_col(table)
+      agency_distribution_information_col(table)
+
+      table["Quantity-based Requests"] = ->(partner) { partner.profile.enable_quantity_based_requests } # Columns from the partner_settings partial
+      table["Child-based Requests"] = ->(partner) { partner.profile.enable_child_based_requests }
+      table["Individual Requests"] = ->(partner) { partner.profile.enable_individual_requests }
+
+      table["Providing Diapers"] = ->(partner) { diaper_statuses[partner.id] }
+      table["Providing Period Supplies"] = ->(partner) { period_supplies_statuses[partner.id] }
+
+      table
+    end
+
+    def media_information_col(table)
+      if @partials_to_show.include? "media_information"
+        table["Agency Website"] = ->(partner) { partner.profile.website }
+        table["Facebook"] = ->(partner) { partner.profile.facebook }
+        table["Twitter"] = ->(partner) { partner.profile.twitter }
+        table["Instagram"] = ->(partner) { partner.profile.instagram }
+        table["No Social Media Presence"] = ->(partner) { partner.profile.no_social_media_presence }
+      end
+    end
+
+    def agency_stability_col(table)
+      if @partials_to_show.include? "agency_stability"
+        table["Year Founded"] = ->(partner) { partner.profile.founded }
+        table["Form 990 Filed"] = ->(partner) { partner.profile.form_990 }
+        table["Program Name"] = ->(partner) { partner.profile.program_name }
+        table["Program Description"] = ->(partner) { partner.profile.program_description }
+        table["Agency Age"] = ->(partner) { partner.profile.program_age }
+        table["Evidence Based"] = ->(partner) { partner.profile.evidence_based }
+        table["Case Management"] = ->(partner) { partner.profile.case_management }
+        table["How Are Essentials Used"] = ->(partner) { partner.profile.essentials_use }
+        table["Receive Essentials From Other Sources"] = ->(partner) { partner.profile.receives_essentials_from_other }
+        table["Currently Providing Diapers"] = ->(partner) { partner.profile.currently_provide_diapers }
+      end
+    end
+
+    def organizational_capacity_col(table)
+      if @partials_to_show.include? "organizational_capacity"
+        table["Client Capacity"] = ->(partner) { partner.profile.client_capacity }
+        table["Storage Space"] = ->(partner) { partner.profile.storage_space }
+        table["Storage Space Description"] = ->(partner) { partner.profile.describe_storage_space }
+      end
+    end
+
+    def sources_of_funding_col(table)
+      if @partials_to_show.include? "sources_of_funding"
+        table["Sources Of Funding"] = ->(partner) { partner.profile.sources_of_funding }
+        table["How do you currently obtain diapers?"] = ->(partner) { partner.profile.sources_of_diapers }
+        table["Essentials Budget"] = ->(partner) { partner.profile.essentials_budget }
+        table["Essentials Funding Source"] = ->(partner) { partner.profile.essentials_funding_source }
+      end
+    end
+
+    def area_served_col(table)
+      if @partials_to_show.include? "area_served"
+        table["Area Served"] = ->(partner) { county_list_by_regions[partner.id] || "" }
+      end
+    end
+
+    def population_served_col(table)
+      if @partials_to_show.include? "population_served"
+        table["Income Requirement"] = ->(partner) { partner.profile.income_requirement_desc }
+        table["Verify Income"] = ->(partner) { partner.profile.income_verification }
+        table["% African American"] = ->(partner) { partner.profile.population_black }
+        table["% Caucasian"] = ->(partner) { partner.profile.population_white }
+        table["% Hispanic"] = ->(partner) { partner.profile.population_hispanic }
+        table["% Asian"] = ->(partner) { partner.profile.population_asian }
+        table["% American Indian"] = ->(partner) { partner.profile.population_american_indian }
+        table["% Pacific Island"] = ->(partner) { partner.profile.population_island }
+        table["% Multi-racial"] = ->(partner) { partner.profile.population_multi_racial }
+        table["% Other"] = ->(partner) { partner.profile.population_other }
+        table["Zip Codes Served"] = ->(partner) { partner.profile.zips_served }
+        table["% At FPL or Below"] = ->(partner) { partner.profile.at_fpl_or_below }
+        table["% Above 1-2 times FPL"] = ->(partner) { partner.profile.above_1_2_times_fpl }
+        table["% Greater than 2 times FPL"] = ->(partner) { partner.profile.greater_2_times_fpl }
+        table["% Poverty Unknown"] = ->(partner) { partner.profile.poverty_unknown }
+      end
+    end
+
+    def executive_director_col(table)
+      if @partials_to_show.include? "executive_director"
+        table["Executive Director Name"] = ->(partner) { partner.profile.executive_director_name }
+        table["Executive Director Phone"] = ->(partner) { partner.profile.executive_director_phone }
+        table["Executive Director Email"] = ->(partner) { partner.profile.executive_director_email }
+        table["Primary Contact Name"] = ->(partner) { partner.profile.primary_contact_name }
+        table["Primary Contact Phone"] = ->(partner) { partner.profile.primary_contact_phone }
+        table["Primary Contact Cell"] = ->(partner) { partner.profile.primary_contact_mobile }
+        table["Primary Contact Email"] = ->(partner) { partner.profile.primary_contact_email }
+      end
+    end
+
+    def pick_up_person_col(table)
+      if @partials_to_show.include? "pick_up_person"
+        table["Pick Up Person Name"] = ->(partner) { partner.profile.pick_up_name }
+        table["Pick Up Person Phone"] = ->(partner) { partner.profile.pick_up_phone }
+        table["Pick Up Person Email"] = ->(partner) { partner.profile.pick_up_email }
+      end
+    end
+
+    def agency_distribution_information_col(table)
+      if @partials_to_show.include? "agency_distribution_information"
+        table["Distribution Times"] = ->(partner) { partner.profile.distribution_times }
+        table["New Client Times"] = ->(partner) { partner.profile.new_client_times }
+        table["More Docs Required"] = ->(partner) { partner.profile.more_docs_required }
+      end
+    end
+
+    def headers
+      base_table.keys
     end
 
     def build_row_data(partner)

app/views/profiles/_show.html.erb

@@ -55,7 +55,7 @@
       </p>
       <p>Program Name(s): <%= partner_profile.program_name %></p>
       <p>Program Description(s): <%= partner_profile.program_description %></p>
-      <p>Program Age: <%= partner_profile.program_age %></p>
+      <p>Agency Age: <%= partner_profile.program_age %></p>
       <p>Case Management: <%= humanize_boolean_3state(partner_profile.case_management) %></p>
       <p>Evidence Based: <%= humanize_boolean_3state(partner_profile.evidence_based) %></p>
       <p>How Are Essentials (e.g. diapers, period supplies) Used In Your Program? <%= partner_profile.essentials_use %></p>
@@ -146,7 +146,7 @@
     <% if partner_profile_fields.include?('sources_of_funding') || partner_profile_fields.empty? %>
       <h4 class='text-2xl underline'>Sources of Funding</h4>
       <p>Sources of Funding: <%= partner_profile.sources_of_funding %></p>
-      <p>Sources of Diapers: <%= partner_profile.sources_of_diapers %> </p>
+      <p>How do you currently obtain diapers? <%= partner_profile.sources_of_diapers %> </p>
       <p>Essentials Budget:<%= partner_profile.essentials_budget %></p>
       <p>Essentials Funding Source: <%= partner_profile.essentials_funding_source %></p>
       <br>

app/views/reports/product_drives_summary.html.erb

@@ -10,6 +10,12 @@
   footer: link_to("See more...", product_drives_path),
 ) do %>
 
+  <h3 class="text-center">
+    <span class="total_drives">
+      <%= total_number_of_drives %>
+    </span> drives active
+    <%= @selected_date_range_label %>
+  </h3>
   <h3 class="text-center">
     <span class="total_received_donations">
       <%= total_received_from_product_drives %>