5084 Display Drive Count on Summary page for Selected Dates (#5114)

Author: christianloring

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

spec/factories/donations.rb

@@ -31,9 +31,14 @@
     end
 
     factory :product_drive_donation do
-      product_drive
+      product_drive { build(:product_drive) }
       product_drive_participant
       source { Donation::SOURCES[:product_drive] }
+
+      after(:build) do |donation|
+        donation.product_drive.start_date = donation.issued_at
+        donation.product_drive.end_date = donation.issued_at
+      end
     end
 
     factory :donation_site_donation do

spec/requests/reports/product_drives_summary_spec.rb

@@ -46,6 +46,7 @@
         it "shows the correct total and links" do
           expect(response.body).to match(%r{<span class="total_received_donations">\s*14\s*</span>})
           expect(response.body).to match(%r{<span class="total_money_raised">\s*\$24.00\s*</span>})
+          expect(response.body).to match(%r{<span class="total_drives">\s*2\s*</span>})
         end
       end
 
@@ -54,6 +55,7 @@
         it "shows the correct total and links" do
           expect(response.body).to match(%r{<span class="total_received_donations">\s*16\s*</span>})
           expect(response.body).to match(%r{<span class="total_money_raised">\s*\$24.00\s*</span>})
+          expect(response.body).to match(%r{<span class="total_drives">\s*2\s*</span>})
         end
       end
 
@@ -62,6 +64,7 @@
         it "shows the correct total and links" do
           expect(response.body).to match(%r{<span class="total_received_donations">\s*122\s*</span>})
           expect(response.body).to match(%r{<span class="total_money_raised">\s*\$24.00\s*</span>})
+          expect(response.body).to match(%r{<span class="total_drives">\s*2\s*</span>})
         end
       end
 
@@ -70,6 +73,7 @@
         it "shows the correct total and links" do
           expect(response.body).to match(%r{<span class="total_received_donations">\s*248\s*</span>})
           expect(response.body).to match(%r{<span class="total_money_raised">\s*\$48.00\s*</span>})
+          expect(response.body).to match(%r{<span class="total_drives">\s*4\s*</span>})
         end
       end
 
@@ -78,6 +82,7 @@
         it "shows the correct total and links" do
           expect(response.body).to match(%r{<span class="total_received_donations">\s*422\s*</span>})
           expect(response.body).to match(%r{<span class="total_money_raised">\s*\$120.00\s*</span>})
+          expect(response.body).to match(%r{<span class="total_drives">\s*10\s*</span>})
         end
       end
     end