821 Create manufacturers on new donations (#1013) (#1020)

Merges the development branch

Author: armahillo

app/assets/javascripts/donations.coffee.erb

@@ -4,35 +4,62 @@
 
 $ ->
   control_id = "#donation_source"
+
   diaper_drive_participant_id = "#donation_diaper_drive_participant_id"
+  manufacturer_id = "#donation_manufacturer_id"
+
+  donation_site_container_id = "div.donation_donation_site"
+  diaper_drive_participant_container_id = "div.donation_diaper_drive_participant"
+  manufacturer_container_id = "div.donation_manufacturer"
+
   diaper_drive_participant_text = "<%= Donation::SOURCES[:diaper_drive] %>"
+  manufacturer_text = "<%= Donation::SOURCES[:manufacturer] %>"
   donation_site_text = "<%= Donation::SOURCES[:donation_site] %>"
-  diaper_drive_participant_container_id = "div.donation_diaper_drive_participant"
-  donation_site_container_id = "div.donation_donation_site"
+
   $(diaper_drive_participant_container_id).hide()
+  $(manufacturer_container_id).hide()
   $(donation_site_container_id).hide()
+
   create_new_diaper_drive_text = "---Create new diaper drive---"
+  create_new_manufacturer_text = "---Create new Manufacturer---"
+
   $(diaper_drive_participant_id).
-  append('<option value="">---Create new diaper drive---</option>')
+  append('<option value="">' + create_new_diaper_drive_text + '</option>')
+
+  $(manufacturer_id).
+  append('<option value="">' + create_new_manufacturer_text + '</option>')
 
   $(document).on "change", diaper_drive_participant_id, (evt) ->
     selection = $(diaper_drive_participant_id + " option").
     filter(':selected').text()
     if (selection is create_new_diaper_drive_text)
       $("#new_diaper_drive").click()
 
+  $(document).on "change", manufacturer_id, (evt) ->
+    selection = $(manufacturer_id + " option").
+    filter(':selected').text()
+    if (selection is create_new_manufacturer_text)
+      $("#new_manufacturer").click()
+
   $(document).on "change", control_id, (evt) ->
     selection = $(control_id + " option").filter(':selected').text()
 
     if (selection is diaper_drive_participant_text)
       $(diaper_drive_participant_container_id).show()
       $(donation_site_container_id).hide()
+      $(manufacturer_container_id).hide()
+    else if (selection is manufacturer_text)
+      $(manufacturer_container_id).show()
+      $(diaper_drive_participant_container_id).hide()
+      $(donation_site_container_id).hide()
     else if (selection is donation_site_text)
       $(diaper_drive_participant_container_id).hide()
       $(donation_site_container_id).show()
+      $(manufacturer_container_id).hide()
     else
       $(diaper_drive_participant_container_id).hide()
       $(donation_site_container_id).hide()
+      $(manufacturer_container_id).hide()
 
   $(control_id).change()
 

app/controllers/dashboard_controller.rb

@@ -9,5 +9,10 @@ def index
     @total_inventory = current_organization.total_inventory
 
     @org_stats = OrganizationStats.new(current_organization)
+
+    # calling .recent on recent donations by manufacturers will only count the last 3 donations
+    # which may not make sense when calculating total count using a date range
+    @recent_donations_from_manufacturers = current_organization.donations.includes(:line_items).during(helpers.selected_range).by_source(:manufacturer)
+    @top_manufacturers = current_organization.manufacturers.by_donation_count
   end
 end

app/controllers/donations_controller.rb

@@ -6,7 +6,7 @@ class DonationsController < ApplicationController
 
   def index
     @donations = current_organization.donations
-                                     .includes(:line_items, :storage_location, :donation_site, :diaper_drive_participant)
+                                     .includes(:line_items, :storage_location, :donation_site, :diaper_drive_participant, :manufacturer)
                                      .order(created_at: :desc)
                                      .class_filter(filter_params)
     # Are these going to be inefficient with large datasets?
@@ -22,8 +22,10 @@ def index
     @diaper_drives = @donations.collect do |d|
       d.source == Donation::SOURCES[:diaper_drive] ? d.diaper_drive_participant : nil
     end.compact.uniq
-
     @selected_diaper_drive = filter_params[:by_diaper_drive_participant]
+    @manufacturers = @donations.collect(&:manufacturer).compact.uniq
+    @selected_manufacturer = filter_params[:from_manufacturer]
+
     @selected_date = date_filter
   end
 
@@ -102,13 +104,14 @@ def load_form_collections
     @storage_locations = current_organization.storage_locations
     @donation_sites = current_organization.donation_sites
     @diaper_drive_participants = current_organization.diaper_drive_participants
+    @manufacturers = current_organization.manufacturers
     @items = current_organization.items.alphabetized
   end
 
   def donation_params
     strip_unnecessary_params
     params = compact_line_items
-    params.require(:donation).permit(:source, :comment, :storage_location_id, :money_raised, :issued_at, :donation_site_id, :diaper_drive_participant_id, line_items_attributes: %i(id item_id quantity _destroy)).merge(organization: current_organization)
+    params.require(:donation).permit(:source, :comment, :storage_location_id, :money_raised, :issued_at, :donation_site_id, :diaper_drive_participant_id, :manufacturer_id, line_items_attributes: %i(id item_id quantity _destroy)).merge(organization: current_organization)
   end
 
   def donation_item_params
@@ -118,7 +121,7 @@ def donation_item_params
   def filter_params
     return {} unless params.key?(:filters)
 
-    fp = params.require(:filters).slice(:at_storage_location, :by_source, :from_donation_site, :by_diaper_drive_participant)
+    fp = params.require(:filters).slice(:at_storage_location, :by_source, :from_donation_site, :by_diaper_drive_participant, :from_manufacturer)
     fp.merge(by_issued_at: date_filter)
   end
 
@@ -136,6 +139,7 @@ def date_filter
   # Omits donation_site_id or diaper_drive_participant_id if those aren't selected as source
   def strip_unnecessary_params
     params[:donation].delete(:donation_site_id) unless params[:donation][:source] == Donation::SOURCES[:donation_site]
+    params[:donation].delete(:manufacturer_id) unless params[:donation][:source] == Donation::SOURCES[:manufacturer]
     params[:donation].delete(:diaper_drive_participant_id) unless params[:donation][:source] == Donation::SOURCES[:diaper_drive]
     params
   end

app/controllers/manufacturers_controller.rb

@@ -0,0 +1,54 @@
+class ManufacturersController < ApplicationController
+  def index
+    @manufacturers = current_organization.manufacturers.includes(:donations).all.order(:name)
+  end
+
+  def create
+    @manufacturer = current_organization.manufacturers.new(manufacturer_params.merge(organization: current_organization))
+    respond_to do |format|
+      if @manufacturer.save
+        format.html { redirect_to manufacturers_path, notice: "New Manufacturer added!" }
+        format.js
+      else
+        flash[:error] = "Something didn't work quite right -- try again?"
+        format.html { render action: :new }
+        format.js { render template: "manufacturers/new_modal.js.erb" }
+      end
+    end
+  end
+
+  def new
+    @manufacturer = current_organization.manufacturers.new
+    if request.xhr?
+      respond_to do |format|
+        format.js { render template: "manufacturers/new_modal.js.erb" }
+      end
+    end
+  end
+
+  def edit
+    @manufacturer = current_organization.manufacturers.find(params[:id])
+  end
+
+  def show
+    @manufacturer = current_organization.manufacturers.includes(:donations).find(params[:id])
+  end
+
+  def update
+    @manufacturer = current_organization.manufacturers.find(params[:id])
+    if @manufacturer.update(manufacturer_params)
+      redirect_to manufacturers_path, notice: "#{@manufacturer.name} updated!"
+
+    else
+      flash[:error] = "Something didn't work quite right -- try again?"
+      render action: :edit
+    end
+  end
+
+  private
+
+  def manufacturer_params
+    params.require(:manufacturer)
+          .permit(:name)
+  end
+end

app/models/donation.rb

@@ -13,17 +13,20 @@
 #  diaper_drive_participant_id :integer
 #  issued_at                   :datetime
 #  money_raised                :integer
+#  manufacturer_id             :bigint(8)
 #
 
 class Donation < ApplicationRecord
   SOURCES = { diaper_drive: "Diaper Drive",
+              manufacturer: "Manufacturer",
               donation_site: "Donation Site",
               misc: "Misc. Donation" }.freeze
 
   belongs_to :organization
 
   belongs_to :donation_site, optional: true # Validation is conditionally handled below.
   belongs_to :diaper_drive_participant, optional: proc { |d| d.from_diaper_drive? } # Validation is conditionally handled below.
+  belongs_to :manufacturer, optional: proc { |d| d.from_manufacturer? } # Validation is conditionally handled below.
   belongs_to :storage_location
   include Itemizable
 
@@ -36,6 +39,9 @@ class Donation < ApplicationRecord
   scope :by_diaper_drive_participant, ->(diaper_drive_participant_id) {
     where(diaper_drive_participant_id: diaper_drive_participant_id)
   }
+  scope :from_manufacturer, ->(manufacturer_id) {
+    where(manufacturer_id: manufacturer_id)
+  }
   scope :for_csv_export, ->(organization) {
     where(organization: organization)
       .includes(:line_items, :storage_location, :donation_site)
@@ -50,6 +56,9 @@ class Donation < ApplicationRecord
   validates :diaper_drive_participant, presence:
     { message: "must be specified since you chose '#{SOURCES[:diaper_drive]}'" },
                                        if: :from_diaper_drive?
+  validates :manufacturer, presence:
+    { message: "must be specified since you chose '#{SOURCES[:manufacturer]}'" },
+                           if: :from_manufacturer?
   validates :source, presence: true, inclusion: { in: SOURCES.values,
                                                   message: "Must be a valid source." }
 
@@ -66,6 +75,10 @@ def from_diaper_drive?
     source == SOURCES[:diaper_drive]
   end
 
+  def from_manufacturer?
+    source == SOURCES[:manufacturer]
+  end
+
   def from_donation_site?
     source == SOURCES[:donation_site]
   end

app/models/manufacturer.rb

@@ -0,0 +1,37 @@
+# == Schema Information
+#
+# Table name: manufacturers
+#
+#  id              :bigint(8)        not null, primary key
+#  name            :string
+#  organization_id :bigint(8)
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#
+
+class Manufacturer < ApplicationRecord
+  belongs_to :organization
+
+  has_many :donations, inverse_of: :manufacturer, dependent: :destroy
+
+  has_many :line_items, through: :donations
+
+  validates :name, presence: true, uniqueness: { scope: :organization, message: 'Manufacturer already exists' }
+
+  def volume
+    # returns 0 instead of nil when Manufacturer exists without any donations
+    donations.map { |d| d.line_items.total }.reduce(:+) || 0
+  end
+
+  def self.by_donation_count(count = 10)
+    # selects manufacturers that have donation qty > 0
+    # and sorts them by highest volume of donation
+    select { |m| m.volume.positive? }.sort.reverse.first(count)
+  end
+
+  private
+
+  def exists_in_org?
+    organization.manufacturers.where(name: name).exists?
+  end
+end

app/models/organization.rb

@@ -40,6 +40,7 @@ def all
   has_many :purchases, dependent: :destroy
   has_many :donation_sites, dependent: :destroy
   has_many :diaper_drive_participants, dependent: :destroy
+  has_many :manufacturers, dependent: :destroy
   has_many :vendors, dependent: :destroy
   has_many :storage_locations, dependent: :destroy
   has_many :inventory_items, through: :storage_locations

app/views/dashboard/_manufacturer.html.erb

@@ -0,0 +1,7 @@
+<div class="row manufacturer">
+  <div class="pull-left">
+    <%= link_to manufacturer do %>
+      <%= manufacturer.name %> (<%= number_with_delimiter(manufacturer.volume) %>)
+    <% end %>
+  </div>
+</div>

app/views/dashboard/index.html.erb

@@ -155,6 +155,31 @@
                 }) %>
             </div>
           </div>
+          <div class="box box-success">
+            <div class="box-header with-border">
+              <h3 class="box-title">Manufacturer Donations</h3>
+              <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i>
+                </button>
+                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+              </div>
+            </div>
+            <div class="box-body text-center float-center">
+              <h3 class="text-center"><%= number_with_delimiter(@recent_donations_from_manufacturers.sum { |d| d.line_items.total }) %> items donated <%= display_interval %> by <%= pluralize(@recent_donations_from_manufacturers.group_by(&:manufacturer).count, 'Manufacturer') %></h3>
+            </div>
+            <div class="box-body">
+              <div class="box-body text-center float-center">
+                <h4>Top Manufacturer Donations</h4>
+                <%= render partial: "manufacturer", collection: @top_manufacturers, as: :manufacturer %>
+              </div>
+            </div>
+            <div class="box-footer text-center">
+              <%= link_to "See more...", donations_path(
+                filters: {
+                  by_source: "Manufacturer"
+                }) %>
+            </div>
+          </div>
           <div class="box box-info">
             <div class="box-header with-border">
               <h3 class="box-title">Purchases</h3>

app/views/donations/_donation_form.html.erb

@@ -32,6 +32,18 @@
     </div>
   </div>
 
+  <div class="row">
+    <div class="col-xs-8 col-md-6 col-lg-3">
+    <%= f.association :manufacturer,
+      collection: @manufacturers,
+      prompt: "Choose one...",
+      label_method: :name,
+      label: "Manufacturer",
+      error: "Which Manufacturer was this from?",
+      wrapper: :vertical_input_group %>
+    </div>
+  </div>
+
   <div class="row">
     <div class="col-xs-8 col-md-6 col-lg-3">
     <%= f.association :storage_location,