From e7f43d303601b14f7eab5b724b31d5233404dfa0 Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Fri, 28 Jul 2023 15:28:17 -0400 Subject: [PATCH 001/122] Create dashboard/card partial Removes the highly duplicated nested card divs and card-tools. Results in the same HTML (modulo whitespace) --- app/views/dashboard/_card.html.erb | 68 +++++ app/views/dashboard/index.html.erb | 420 +++++++++++++---------------- 2 files changed, 249 insertions(+), 239 deletions(-) create mode 100644 app/views/dashboard/_card.html.erb diff --git a/app/views/dashboard/_card.html.erb b/app/views/dashboard/_card.html.erb new file mode 100644 index 0000000000..7720acade1 --- /dev/null +++ b/app/views/dashboard/_card.html.erb @@ -0,0 +1,68 @@ +<% + # Allows locals to be optional + footer ||= nil + footer_div ||= nil + header_div ||= nil + id ||= nil + subtitle ||= nil + table ||= false + title ||= nil + + options ||= {} + options.symbolize_keys! + options[:class] ||= "" + options[:class] += " card" + options[:id] = id if id +%> +<%= content_tag(:div, **options) do %> + <%= + header_div || + begin + gradient ||= "primary" + + header_options ||= {} + header_options.symbolize_keys! + header_options[:class] ||= "" + header_options[:class] += " card-header border-0 bg-gradient-#{gradient}" + + header ||= + begin + title = h title + title += " ".html_safe + content_tag(:small, subtitle) if subtitle + content_tag :h3, title, class: "card-title" + end + + content_tag(:div, **header_options) do %> + <%= header %> +
+ +
+ <% end + end + %> + <% if table %> +
+ <%= yield %> +
+ <% else %> +
+
+
+ <%= yield %> +
+
+
+ <% end %> + <%= + footer_div || + if footer + footer_options ||= {} + footer_options.symbolize_keys! + footer_options[:class] ||= "" + footer_options[:class] += " card-footer" + content_tag(:div, footer, **footer_options) + end + %> +<% end %> diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 68ccd8d9ed..dd3bce0b4c 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -109,7 +109,7 @@ <%= if announcement.created_at.strftime("%Y") == DateTime.now.strftime("%Y") announcement.created_at.strftime("%B %d") else - announcement.created_at.strftime("%B %d %Y") + announcement.created_at.strftime("%B %d %Y") end %>
<%= announcement.message %> @@ -124,264 +124,206 @@ <% end %> -
-
-

Distributions - <%= @selected_date_range %>

-
- -
-
-
-
-
- <%= new_button_to new_distribution_path, {text: "New Distribution"} %> - <%= print_button_to distributions_by_county_report_path(filters: { date_range: date_range_params }), {text: "Distributions by County", size: "md"} %> + <%= render( + "card", + id: "distributions", + gradient: "info", + title: "Distributions", + subtitle: @selected_date_range, + footer: link_to("See more...", distributions_path), + footer_options: { class: "text-center" }, + ) do %> + <%= new_button_to new_distribution_path, {text: "New Distribution"} %> + <%= print_button_to distributions_by_county_report_path(filters: { date_range: date_range_params }), {text: "Distributions by County", size: "md"} %> -

- - <%= total_distributed %> - - items distributed <%= @selected_date_range_label %> -

-

(<%= future_distributed %> items scheduled for future distribution)

-
-

Recent distributions

- <%= render partial: "distribution", collection: @recent_distributions, as: :distribution %> -
-
-
-
-
- <%= link_to "See more...", distributions_path %> +

+ + <%= total_distributed %> + + items distributed <%= @selected_date_range_label %> +

+

(<%= future_distributed %> items scheduled for future distribution)

+
+

Recent distributions

+ <%= render partial: "distribution", collection: @recent_distributions, as: :distribution %>
-
+ <% end %> -
-
-

Itemized Distributions - <%= @selected_date_range %>

-
- -
+ <%= render( + "card", + gradient: "success", + title: "Itemized Distributions", + subtitle: @selected_date_range, + table: true, + ) do %> +
+ <%= download_button_to(itemized_breakdown_distributions_path(format: :csv, filters: { date_range: date_range_params }), {text: "Export To CSV"}) %>
-
-
- <%= download_button_to(itemized_breakdown_distributions_path(format: :csv, filters: { date_range: date_range_params }), {text: "Export To CSV"}) %> -
- - <%= render partial: "itemized_distributions_partial", locals: { itemized_breakdown: @itemized_distribution_data } %> -
-
-
-
-

Activity - <%= @selected_date_range %> -

-
- -
-
-
-
-
-
-
-
- <% - activity_chart_config = { - chart: { - type: "bar" - }, - title: "", - xAxis: { - categories: @distribution_data.keys, - title: { - text: nil - } - }, - yAxis: { - title: { - text: nil - } - }, - legend: { - enabled: false - }, - series: [ - { - data: @distribution_data.values - } - ] - }.to_json - %> -
-
-
+ <%= render partial: "itemized_distributions_partial", locals: { itemized_breakdown: @itemized_distribution_data } %> + <% end %> -
-
+ <%= render( + "card", + gradient: "warning", + title: "Activity", + subtitle: @selected_date_range, + ) do %> +
+
+
+ <% + activity_chart_config = { + chart: { + type: "bar" + }, + title: "", + xAxis: { + categories: @distribution_data.keys, + title: { + text: nil + } + }, + yAxis: { + title: { + text: nil + } + }, + legend: { + enabled: false + }, + series: [ + { + data: @distribution_data.values + } + ] + }.to_json + %> +
+
+
-
+ <% end %> +
-
-
-

Donations (All Sources) - <%= @selected_date_range %>

-
- -
+ <%= render( + "card", + id: "donations", + title: "Donations (All Sources)", + subtitle: @selected_date_range, + footer_options: { class: "text-center" }, + footer: link_to("See more...", donations_path), + ) do %> + <%= new_button_to new_donation_path, {text: "New Donation"} %> +

+ + <%= total_received_donations %> + + items + received <%= @selected_date_range_label %> +

+

+ <%= dollar_presentation(total_received_money_donations) %> + raised <%= @selected_date_range_label %> +

+
+

Recent Donations

+ <%= render partial: "donation", collection: @recent_donations, as: :donation %>
-
-
-
- <%= new_button_to new_donation_path, {text: "New Donation"} %> -

- - <%= total_received_donations %> - - items - received <%= @selected_date_range_label %>

-

<%= dollar_presentation(total_received_money_donations) %> - raised <%= @selected_date_range_label %>

-
-

Recent Donations

- <%= render partial: "donation", collection: @recent_donations, as: :donation %> -
-
-
-
-
- <%= link_to "See more...", donations_path %> -
-
+ <% end %> -
-
-

Product Drives <%= @selected_date_range %>

-
- -
-
-
-
-
-

- - <%= total_received_from_product_drives %> - items - received <%= @selected_date_range_label %>

-

- - <%= dollar_presentation( total_received_money_donations_from_product_drives) %> - raised <%= @selected_date_range_label %>

-
-

Recent Donations from Product Drives

- <%= render partial: "product_drive", collection: @recent_donations.by_source(:product_drive), as: :donation %> -
-
-
-
-
- <%= link_to "See more...", donations_path( - filters: { - by_source: "Product Drive" - }) %> + <%= render( + "card", + id: "product_drives", + gradient: "info", + title: "Product Drives", + subtitle: @selected_date_range, + footer_options: { class: "text-center" }, + footer: link_to("See more...", donations_path( + filters: { + by_source: "Product Drive" + } + )), + ) do %> +

+ + <%= total_received_from_product_drives %> + items + received <%= @selected_date_range_label %> +

+

+ + <%= dollar_presentation( total_received_money_donations_from_product_drives) %> + raised <%= @selected_date_range_label %> +

+
+

Recent Donations from Product Drives

+ <%= render partial: "product_drive", collection: @recent_donations.by_source(:product_drive), as: :donation %>
-
+ <% end %> -
-
-

Manufacturer Donations <%= @selected_date_range %>

-
- -
-
-
-
-
-

- - <%= number_with_delimiter(@recent_donations_from_manufacturers.sum { |d| d.line_items.total }) %> - - items donated <%= @selected_date_range_label %> - by - - <%= pluralize(@recent_donations_from_manufacturers.group_by(&:manufacturer).count, 'Manufacturer') %> - -

-
-

Top Manufacturer Donations

- <%= render partial: "manufacturer", collection: @top_manufacturers, as: :manufacturer %> -
-
-
+ <%= render( + "card", + id: "manufacturers", + gradient: "success", + title: "Manufacturer Donations", + subtitle: @selected_date_range, + footer_options: { class: "text-center" }, + footer: link_to("See more...", donations_path( + filters: { + by_source: "Manufacturer" + } + )), + ) do %> +

+ + <%= number_with_delimiter(@recent_donations_from_manufacturers.sum { |d| d.line_items.total }) %> + + items donated <%= @selected_date_range_label %> + by + + <%= pluralize(@recent_donations_from_manufacturers.group_by(&:manufacturer).count, 'Manufacturer') %> + +

+
+

Top Manufacturer Donations

+ <%= render partial: "manufacturer", collection: @top_manufacturers, as: :manufacturer %>
-
- <%= link_to "See more...", donations_path( - filters: { - by_source: "Manufacturer" - }) %> -
-
+ <% end %> -
-
-

Purchases <%= @selected_date_range %>

-
- -
+ <%= render( + "card", + id: "purchases", + gradient: "secondary", + title: "Purchases", + subtitle: @selected_date_range, + footer_options: { class: "text-center" }, + footer: link_to("See more...", purchases_path), + ) do %> + <%= new_button_to new_purchase_path, {text: "New Purchase"} %> +

<%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %> + spent + <%= @selected_date_range_label %> +

+
+

Recent purchases

+ <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %>
-
-
-
- <%= new_button_to new_purchase_path, {text: "New Purchase"} %> -

<%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %> - spent - <%= @selected_date_range_label %>

-
-

Recent purchases

- <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %> -
-
-
-
-
- <%= link_to "See more...", purchases_path %> -
-
- + <% end %> -
-
-

Itemized Donations - <%= @selected_date_range %>

-
-
-
-
- <%= render partial: "itemized_donations_partial", locals: { itemized_breakdown: @itemized_donation_data } %> -
-
+ <%= render( + "card", + gradient: "warning", + title: "Itemized Donations", + subtitle: @selected_date_range, + table: true, + ) do %> + <%= render partial: "itemized_donations_partial", locals: { itemized_breakdown: @itemized_donation_data } %> + <% end %>
From 64a5d6e59166faf37eb3900ff4bbb3872a2d5faf Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Fri, 28 Jul 2023 15:28:39 -0400 Subject: [PATCH 002/122] Also convert summary card to partial Has slightly different layout than the others, so required some changes to the partial. --- app/views/dashboard/_card.html.erb | 32 ++++++++++------- app/views/dashboard/index.html.erb | 55 +++++++++++++----------------- 2 files changed, 43 insertions(+), 44 deletions(-) diff --git a/app/views/dashboard/_card.html.erb b/app/views/dashboard/_card.html.erb index 7720acade1..2772f635fd 100644 --- a/app/views/dashboard/_card.html.erb +++ b/app/views/dashboard/_card.html.erb @@ -5,8 +5,8 @@ header_div ||= nil id ||= nil subtitle ||= nil - table ||= false title ||= nil + type ||= :box # or :table or :plain options ||= {} options.symbolize_keys! @@ -42,19 +42,27 @@ <% end end %> - <% if table %> -
- <%= yield %> -
- <% else %> -
-
-
- <%= yield %> + <% case type.to_sym + when :box %> +
+
+
+ <%= yield %> +
-
- <% end %> + <% when :plain %> +
+ <%= yield %> +
+ <% when :table %> +
+ <%= yield %> +
+ <% else + raise "Unknown card type: #{type}" + end %> + <%= footer_div || if footer diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index dd3bce0b4c..185404290a 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -19,35 +19,11 @@
-
-
-
<%= current_organization.name %>
-
- - -
-
- -
-
- <%= render partial: "getting_started_prompt", locals: {org_stats: @org_stats} %> - -
- <%== display_logo_or_name %> -
- -
- -
- -
- -
-
+ <%= render( + "card", + id: "summary", + header: content_tag(:h5, current_organization.name, class: "card-title"), + footer: capture { %>
@@ -81,8 +57,23 @@
+ <% }, + type: :plain, + ) do %> +
+ <%= render partial: "getting_started_prompt", locals: {org_stats: @org_stats} %> + +
+ <%== display_logo_or_name %> +
+ +
+ +
+
-
+ + <% end %>
@@ -154,7 +145,7 @@ gradient: "success", title: "Itemized Distributions", subtitle: @selected_date_range, - table: true, + type: :table, ) do %>
<%= download_button_to(itemized_breakdown_distributions_path(format: :csv, filters: { date_range: date_range_params }), {text: "Export To CSV"}) %> @@ -320,7 +311,7 @@ gradient: "warning", title: "Itemized Donations", subtitle: @selected_date_range, - table: true, + type: :table, ) do %> <%= render partial: "itemized_donations_partial", locals: { itemized_breakdown: @itemized_donation_data } %> <% end %> From e815d2504803052f31b9fcff0b211d906812fdce Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Fri, 28 Jul 2023 15:59:56 -0400 Subject: [PATCH 003/122] Github Workflows: Run rspec on all pull requests --- .github/workflows/rspec-system.yml | 2 -- .github/workflows/rspec.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/rspec-system.yml b/.github/workflows/rspec-system.yml index 36ac0fdd27..815b478150 100644 --- a/.github/workflows/rspec-system.yml +++ b/.github/workflows/rspec-system.yml @@ -5,8 +5,6 @@ on: branches: - main pull_request: - branches: - - main paths-ignore: - 'doc/**' - '*.md' diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml index ab95707a4e..8e0045163e 100644 --- a/.github/workflows/rspec.yml +++ b/.github/workflows/rspec.yml @@ -5,8 +5,6 @@ on: branches: - main pull_request: - branches: - - main paths-ignore: - 'doc/**' - '*.md' From cd08a7bd34c8329a6500bfbd4dd10c4af61e6b2a Mon Sep 17 00:00:00 2001 From: Rae Stanton Date: Sat, 29 Jul 2023 11:25:30 -0400 Subject: [PATCH 004/122] Issue #3736 - move purchases to new area Fixes #3736 These changes include: - Removing Purchase Summary card from user's dashboard - Adds new purchase summary page & item in navigation - Changes to updated card styling/formatting - Adds a shared date filter card partial in shared directory - Adds a shared card partial for use throughout in the shared directory --- app/controllers/dashboard_controller.rb | 2 - .../purchases_summary_controller.rb | 7 ++ app/views/dashboard/index.html.erb | 20 ----- app/views/layouts/_lte_sidebar.html.erb | 5 ++ app/views/purchases_summary/_card.html.erb | 76 +++++++++++++++++++ .../_purchase.html.erb | 3 +- app/views/purchases_summary/index.html.erb | 20 +++++ .../purchases_summary/index.html.orginal.erb | 19 +++++ app/views/shared/_card.html.erb | 76 +++++++++++++++++++ app/views/shared/_filtered_card.html.erb | 37 +++++++++ config/routes.rb | 1 + 11 files changed, 243 insertions(+), 23 deletions(-) create mode 100644 app/controllers/purchases_summary_controller.rb create mode 100644 app/views/purchases_summary/_card.html.erb rename app/views/{dashboard => purchases_summary}/_purchase.html.erb (98%) create mode 100644 app/views/purchases_summary/index.html.erb create mode 100644 app/views/purchases_summary/index.html.orginal.erb create mode 100644 app/views/shared/_card.html.erb create mode 100644 app/views/shared/_filtered_card.html.erb diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 45454f4ba9..9004803f9f 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -7,8 +7,6 @@ def index @donations = current_organization.donations.during(helpers.selected_range) @recent_donations = @donations.recent - @purchases = current_organization.purchases.during(helpers.selected_range) - @recent_purchases = @purchases.recent.includes(:vendor) distributions = current_organization.distributions.includes(:partner).during(helpers.selected_range) @recent_distributions = distributions.recent diff --git a/app/controllers/purchases_summary_controller.rb b/app/controllers/purchases_summary_controller.rb new file mode 100644 index 0000000000..3f81e0d5a3 --- /dev/null +++ b/app/controllers/purchases_summary_controller.rb @@ -0,0 +1,7 @@ +class PurchasesSummaryController < ApplicationController + def index + setup_date_range_picker + @purchases = current_organization.purchases.during(helpers.selected_range) + @recent_purchases = @purchases.recent.includes(:vendor) + end +end diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 185404290a..d8ae90765c 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -286,26 +286,6 @@
<% end %> - <%= render( - "card", - id: "purchases", - gradient: "secondary", - title: "Purchases", - subtitle: @selected_date_range, - footer_options: { class: "text-center" }, - footer: link_to("See more...", purchases_path), - ) do %> - <%= new_button_to new_purchase_path, {text: "New Purchase"} %> -

<%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %> - spent - <%= @selected_date_range_label %> -

-
-

Recent purchases

- <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %> -
- <% end %> - <%= render( "card", gradient: "warning", diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 0175496b56..60018a8449 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -62,6 +62,11 @@ New Purchase <% end %> +
  • + <%= link_to(purchases_summary_path(organization_id: current_user.organization), class: "nav-link #{"active" if current_page?(purchases_summary_path)}") do %> + Purchases Summary + <% end %> +
  • diff --git a/app/views/purchases_summary/_card.html.erb b/app/views/purchases_summary/_card.html.erb new file mode 100644 index 0000000000..2772f635fd --- /dev/null +++ b/app/views/purchases_summary/_card.html.erb @@ -0,0 +1,76 @@ +<% + # Allows locals to be optional + footer ||= nil + footer_div ||= nil + header_div ||= nil + id ||= nil + subtitle ||= nil + title ||= nil + type ||= :box # or :table or :plain + + options ||= {} + options.symbolize_keys! + options[:class] ||= "" + options[:class] += " card" + options[:id] = id if id +%> +<%= content_tag(:div, **options) do %> + <%= + header_div || + begin + gradient ||= "primary" + + header_options ||= {} + header_options.symbolize_keys! + header_options[:class] ||= "" + header_options[:class] += " card-header border-0 bg-gradient-#{gradient}" + + header ||= + begin + title = h title + title += " ".html_safe + content_tag(:small, subtitle) if subtitle + content_tag :h3, title, class: "card-title" + end + + content_tag(:div, **header_options) do %> + <%= header %> +
    + +
    + <% end + end + %> + <% case type.to_sym + when :box %> +
    +
    +
    + <%= yield %> +
    +
    +
    + <% when :plain %> +
    + <%= yield %> +
    + <% when :table %> +
    + <%= yield %> +
    + <% else + raise "Unknown card type: #{type}" + end %> + + <%= + footer_div || + if footer + footer_options ||= {} + footer_options.symbolize_keys! + footer_options[:class] ||= "" + footer_options[:class] += " card-footer" + content_tag(:div, footer, **footer_options) + end + %> +<% end %> diff --git a/app/views/dashboard/_purchase.html.erb b/app/views/purchases_summary/_purchase.html.erb similarity index 98% rename from app/views/dashboard/_purchase.html.erb rename to app/views/purchases_summary/_purchase.html.erb index bb13b180f7..86344a45a1 100644 --- a/app/views/dashboard/_purchase.html.erb +++ b/app/views/purchases_summary/_purchase.html.erb @@ -1,4 +1,4 @@ -
    +
    <%= link_to purchase do %> <%= number_with_delimiter purchase.line_items.total %> items from <%= purchase.purchased_from_view %> @@ -7,3 +7,4 @@
    <%= distance_of_time_in_words_to_now purchase.created_at %> ago
    + diff --git a/app/views/purchases_summary/index.html.erb b/app/views/purchases_summary/index.html.erb new file mode 100644 index 0000000000..8ce5e3cf74 --- /dev/null +++ b/app/views/purchases_summary/index.html.erb @@ -0,0 +1,20 @@ + <%= render( + "shared/filtered_card", + id: "purchases", + gradient: "secondary", + title: "Purchases", + subtitle: @selected_date_range, + footer_options: { class: "text-center" }, + footer: link_to("See more...", purchases_path), + filter_url: purchases_summary_path + ) do %> + <%= new_button_to new_purchase_path, {text: "New Purchase"} %> +

    <%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %> + spent + <%= @selected_date_range_label %> +

    +
    +

    Recent purchases

    + <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %> +
    + <% end %> diff --git a/app/views/purchases_summary/index.html.orginal.erb b/app/views/purchases_summary/index.html.orginal.erb new file mode 100644 index 0000000000..1dc3fe2387 --- /dev/null +++ b/app/views/purchases_summary/index.html.orginal.erb @@ -0,0 +1,19 @@ + <%= render( + "shared/card", + id: "purchases", + gradient: "secondary", + title: "Purchases", + subtitle: @selected_date_range, + footer_options: { class: "text-center" }, + footer: link_to("See more...", purchases_path), + ) do %> + <%= new_button_to new_purchase_path, {text: "New Purchase"} %> +

    <%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %> + spent + <%= @selected_date_range_label %> +

    +
    +

    Recent purchases

    + <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %> +
    + <% end %> diff --git a/app/views/shared/_card.html.erb b/app/views/shared/_card.html.erb new file mode 100644 index 0000000000..2772f635fd --- /dev/null +++ b/app/views/shared/_card.html.erb @@ -0,0 +1,76 @@ +<% + # Allows locals to be optional + footer ||= nil + footer_div ||= nil + header_div ||= nil + id ||= nil + subtitle ||= nil + title ||= nil + type ||= :box # or :table or :plain + + options ||= {} + options.symbolize_keys! + options[:class] ||= "" + options[:class] += " card" + options[:id] = id if id +%> +<%= content_tag(:div, **options) do %> + <%= + header_div || + begin + gradient ||= "primary" + + header_options ||= {} + header_options.symbolize_keys! + header_options[:class] ||= "" + header_options[:class] += " card-header border-0 bg-gradient-#{gradient}" + + header ||= + begin + title = h title + title += " ".html_safe + content_tag(:small, subtitle) if subtitle + content_tag :h3, title, class: "card-title" + end + + content_tag(:div, **header_options) do %> + <%= header %> +
    + +
    + <% end + end + %> + <% case type.to_sym + when :box %> +
    +
    +
    + <%= yield %> +
    +
    +
    + <% when :plain %> +
    + <%= yield %> +
    + <% when :table %> +
    + <%= yield %> +
    + <% else + raise "Unknown card type: #{type}" + end %> + + <%= + footer_div || + if footer + footer_options ||= {} + footer_options.symbolize_keys! + footer_options[:class] ||= "" + footer_options[:class] += " card-footer" + content_tag(:div, footer, **footer_options) + end + %> +<% end %> diff --git a/app/views/shared/_filtered_card.html.erb b/app/views/shared/_filtered_card.html.erb new file mode 100644 index 0000000000..48d681c912 --- /dev/null +++ b/app/views/shared/_filtered_card.html.erb @@ -0,0 +1,37 @@ +<% + id ||= nil + title ||= nil + subtitle ||= nil + footer ||= nil +%> + +
    +
    +
    +
    +
    + <%= simple_form_for :filters, url: filter_url, method: :get do |f| %> + <%= render partial: "shared/date_range_picker", locals: {css_class: "form-control"} %>
    + <%= filter_button %> + <% end %> +
    +
    +
    +
    +
    + <%= render("card", + id: id, + gradient: "secondary", + title: title, + subtitle: subtitle, + footer_options: { class: "text-center" }, + footer: footer + ) do + + yield + + end %> +
    +
    +
    +
    diff --git a/config/routes.rb b/config/routes.rb index 05e5b017f4..b673b05f0f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -216,6 +216,7 @@ def set_up_flipper get "historical_trends/distributions", to: "historical_trends/distributions#index" get "historical_trends/purchases", to: "historical_trends/purchases#index" get "historical_trends/donations", to: "historical_trends/donations#index" + get "purchases_summary", to: "purchases_summary#index" end resources :attachments, only: %i(destroy) From a7e46c6954d0bc47c67dca76e85dba833ea33965 Mon Sep 17 00:00:00 2001 From: Rae Stanton Date: Sat, 29 Jul 2023 11:45:15 -0400 Subject: [PATCH 005/122] Revert "Issue #3736 - move purchases to new area" This reverts commit cd08a7bd34c8329a6500bfbd4dd10c4af61e6b2a. :wq# --- app/controllers/dashboard_controller.rb | 2 + .../purchases_summary_controller.rb | 7 -- .../_purchase.html.erb | 3 +- app/views/dashboard/index.html.erb | 20 +++++ app/views/layouts/_lte_sidebar.html.erb | 5 -- app/views/purchases_summary/_card.html.erb | 76 ------------------- app/views/purchases_summary/index.html.erb | 20 ----- .../purchases_summary/index.html.orginal.erb | 19 ----- app/views/shared/_card.html.erb | 76 ------------------- app/views/shared/_filtered_card.html.erb | 37 --------- config/routes.rb | 1 - 11 files changed, 23 insertions(+), 243 deletions(-) delete mode 100644 app/controllers/purchases_summary_controller.rb rename app/views/{purchases_summary => dashboard}/_purchase.html.erb (98%) delete mode 100644 app/views/purchases_summary/_card.html.erb delete mode 100644 app/views/purchases_summary/index.html.erb delete mode 100644 app/views/purchases_summary/index.html.orginal.erb delete mode 100644 app/views/shared/_card.html.erb delete mode 100644 app/views/shared/_filtered_card.html.erb diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 9004803f9f..45454f4ba9 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -7,6 +7,8 @@ def index @donations = current_organization.donations.during(helpers.selected_range) @recent_donations = @donations.recent + @purchases = current_organization.purchases.during(helpers.selected_range) + @recent_purchases = @purchases.recent.includes(:vendor) distributions = current_organization.distributions.includes(:partner).during(helpers.selected_range) @recent_distributions = distributions.recent diff --git a/app/controllers/purchases_summary_controller.rb b/app/controllers/purchases_summary_controller.rb deleted file mode 100644 index 3f81e0d5a3..0000000000 --- a/app/controllers/purchases_summary_controller.rb +++ /dev/null @@ -1,7 +0,0 @@ -class PurchasesSummaryController < ApplicationController - def index - setup_date_range_picker - @purchases = current_organization.purchases.during(helpers.selected_range) - @recent_purchases = @purchases.recent.includes(:vendor) - end -end diff --git a/app/views/purchases_summary/_purchase.html.erb b/app/views/dashboard/_purchase.html.erb similarity index 98% rename from app/views/purchases_summary/_purchase.html.erb rename to app/views/dashboard/_purchase.html.erb index 86344a45a1..bb13b180f7 100644 --- a/app/views/purchases_summary/_purchase.html.erb +++ b/app/views/dashboard/_purchase.html.erb @@ -1,4 +1,4 @@ - +
    <%= link_to purchase do %> <%= number_with_delimiter purchase.line_items.total %> items from <%= purchase.purchased_from_view %> @@ -7,4 +7,3 @@
    <%= distance_of_time_in_words_to_now purchase.created_at %> ago
    - diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index d8ae90765c..185404290a 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -286,6 +286,26 @@
    <% end %> + <%= render( + "card", + id: "purchases", + gradient: "secondary", + title: "Purchases", + subtitle: @selected_date_range, + footer_options: { class: "text-center" }, + footer: link_to("See more...", purchases_path), + ) do %> + <%= new_button_to new_purchase_path, {text: "New Purchase"} %> +

    <%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %> + spent + <%= @selected_date_range_label %> +

    +
    +

    Recent purchases

    + <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %> +
    + <% end %> + <%= render( "card", gradient: "warning", diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 60018a8449..0175496b56 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -62,11 +62,6 @@ New Purchase <% end %>
    • -
  • - <%= link_to(purchases_summary_path(organization_id: current_user.organization), class: "nav-link #{"active" if current_page?(purchases_summary_path)}") do %> - Purchases Summary - <% end %> -
  • diff --git a/app/views/purchases_summary/_card.html.erb b/app/views/purchases_summary/_card.html.erb deleted file mode 100644 index 2772f635fd..0000000000 --- a/app/views/purchases_summary/_card.html.erb +++ /dev/null @@ -1,76 +0,0 @@ -<% - # Allows locals to be optional - footer ||= nil - footer_div ||= nil - header_div ||= nil - id ||= nil - subtitle ||= nil - title ||= nil - type ||= :box # or :table or :plain - - options ||= {} - options.symbolize_keys! - options[:class] ||= "" - options[:class] += " card" - options[:id] = id if id -%> -<%= content_tag(:div, **options) do %> - <%= - header_div || - begin - gradient ||= "primary" - - header_options ||= {} - header_options.symbolize_keys! - header_options[:class] ||= "" - header_options[:class] += " card-header border-0 bg-gradient-#{gradient}" - - header ||= - begin - title = h title - title += " ".html_safe + content_tag(:small, subtitle) if subtitle - content_tag :h3, title, class: "card-title" - end - - content_tag(:div, **header_options) do %> - <%= header %> -
    - -
    - <% end - end - %> - <% case type.to_sym - when :box %> -
    -
    -
    - <%= yield %> -
    -
    -
    - <% when :plain %> -
    - <%= yield %> -
    - <% when :table %> -
    - <%= yield %> -
    - <% else - raise "Unknown card type: #{type}" - end %> - - <%= - footer_div || - if footer - footer_options ||= {} - footer_options.symbolize_keys! - footer_options[:class] ||= "" - footer_options[:class] += " card-footer" - content_tag(:div, footer, **footer_options) - end - %> -<% end %> diff --git a/app/views/purchases_summary/index.html.erb b/app/views/purchases_summary/index.html.erb deleted file mode 100644 index 8ce5e3cf74..0000000000 --- a/app/views/purchases_summary/index.html.erb +++ /dev/null @@ -1,20 +0,0 @@ - <%= render( - "shared/filtered_card", - id: "purchases", - gradient: "secondary", - title: "Purchases", - subtitle: @selected_date_range, - footer_options: { class: "text-center" }, - footer: link_to("See more...", purchases_path), - filter_url: purchases_summary_path - ) do %> - <%= new_button_to new_purchase_path, {text: "New Purchase"} %> -

    <%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %> - spent - <%= @selected_date_range_label %> -

    -
    -

    Recent purchases

    - <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %> -
    - <% end %> diff --git a/app/views/purchases_summary/index.html.orginal.erb b/app/views/purchases_summary/index.html.orginal.erb deleted file mode 100644 index 1dc3fe2387..0000000000 --- a/app/views/purchases_summary/index.html.orginal.erb +++ /dev/null @@ -1,19 +0,0 @@ - <%= render( - "shared/card", - id: "purchases", - gradient: "secondary", - title: "Purchases", - subtitle: @selected_date_range, - footer_options: { class: "text-center" }, - footer: link_to("See more...", purchases_path), - ) do %> - <%= new_button_to new_purchase_path, {text: "New Purchase"} %> -

    <%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %> - spent - <%= @selected_date_range_label %> -

    -
    -

    Recent purchases

    - <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %> -
    - <% end %> diff --git a/app/views/shared/_card.html.erb b/app/views/shared/_card.html.erb deleted file mode 100644 index 2772f635fd..0000000000 --- a/app/views/shared/_card.html.erb +++ /dev/null @@ -1,76 +0,0 @@ -<% - # Allows locals to be optional - footer ||= nil - footer_div ||= nil - header_div ||= nil - id ||= nil - subtitle ||= nil - title ||= nil - type ||= :box # or :table or :plain - - options ||= {} - options.symbolize_keys! - options[:class] ||= "" - options[:class] += " card" - options[:id] = id if id -%> -<%= content_tag(:div, **options) do %> - <%= - header_div || - begin - gradient ||= "primary" - - header_options ||= {} - header_options.symbolize_keys! - header_options[:class] ||= "" - header_options[:class] += " card-header border-0 bg-gradient-#{gradient}" - - header ||= - begin - title = h title - title += " ".html_safe + content_tag(:small, subtitle) if subtitle - content_tag :h3, title, class: "card-title" - end - - content_tag(:div, **header_options) do %> - <%= header %> -
    - -
    - <% end - end - %> - <% case type.to_sym - when :box %> -
    -
    -
    - <%= yield %> -
    -
    -
    - <% when :plain %> -
    - <%= yield %> -
    - <% when :table %> -
    - <%= yield %> -
    - <% else - raise "Unknown card type: #{type}" - end %> - - <%= - footer_div || - if footer - footer_options ||= {} - footer_options.symbolize_keys! - footer_options[:class] ||= "" - footer_options[:class] += " card-footer" - content_tag(:div, footer, **footer_options) - end - %> -<% end %> diff --git a/app/views/shared/_filtered_card.html.erb b/app/views/shared/_filtered_card.html.erb deleted file mode 100644 index 48d681c912..0000000000 --- a/app/views/shared/_filtered_card.html.erb +++ /dev/null @@ -1,37 +0,0 @@ -<% - id ||= nil - title ||= nil - subtitle ||= nil - footer ||= nil -%> - -
    -
    -
    -
    -
    - <%= simple_form_for :filters, url: filter_url, method: :get do |f| %> - <%= render partial: "shared/date_range_picker", locals: {css_class: "form-control"} %>
    - <%= filter_button %> - <% end %> -
    -
    -
    -
    -
    - <%= render("card", - id: id, - gradient: "secondary", - title: title, - subtitle: subtitle, - footer_options: { class: "text-center" }, - footer: footer - ) do - - yield - - end %> -
    -
    -
    -
    diff --git a/config/routes.rb b/config/routes.rb index b673b05f0f..05e5b017f4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -216,7 +216,6 @@ def set_up_flipper get "historical_trends/distributions", to: "historical_trends/distributions#index" get "historical_trends/purchases", to: "historical_trends/purchases#index" get "historical_trends/donations", to: "historical_trends/donations#index" - get "purchases_summary", to: "purchases_summary#index" end resources :attachments, only: %i(destroy) From 3052d09fa7284f2e2a5040064c1cb3f06162b24d Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Sat, 29 Jul 2023 14:01:00 -0400 Subject: [PATCH 006/122] Add an "Outstanding Requests" card to org dashboard Lists the pending and started requests right on the main page so that the user has an idea of what they need to work on now. resolves #3669 --- app/controllers/dashboard_controller.rb | 2 + .../dashboard/_outstanding_requests.html.erb | 20 +++++ app/views/dashboard/index.html.erb | 19 +++++ .../pages/organization_dashboard_page.rb | 24 ++++++ spec/system/dashboard_system_spec.rb | 74 +++++++++++++++++++ 5 files changed, 139 insertions(+) create mode 100644 app/views/dashboard/_outstanding_requests.html.erb diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 45454f4ba9..990ff9ee2f 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -29,5 +29,7 @@ def index # passing nil here filters the announcements that didn't come from an organization @broadcast_announcements = BroadcastAnnouncement.filter_announcements(nil) + + @outstanding_requests = Request.where(status: %i[pending started]).order(:created_at) end end diff --git a/app/views/dashboard/_outstanding_requests.html.erb b/app/views/dashboard/_outstanding_requests.html.erb new file mode 100644 index 0000000000..1037e38dc1 --- /dev/null +++ b/app/views/dashboard/_outstanding_requests.html.erb @@ -0,0 +1,20 @@ + + + + + + + + + + + <% outstanding_requests.each do |item| %> + + + + + + + <% end %> + +
    DatePartnerRequestorComments
    <%= link_to item.created_at.strftime("%m/%d/%Y"), item %><%= item.partner.name %><%= item.partner_user&.name %><%= item.comments %>
    diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 185404290a..a666437f76 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -115,6 +115,25 @@
    • <% end %> + <%= + outstanding_type = @outstanding_requests.empty? ? :box : :table + render( + "card", + id: "outstanding", + gradient: "warning", + title: "Outstanding Requests", + type: outstanding_type, + footer: link_to("See more...", requests_path), + footer_options: { class: "text-center" }, + ) do + if @outstanding_requests.empty? + "No outstanding requests!" + else + render "outstanding_requests", outstanding_requests: @outstanding_requests + end + end + %> + <%= render( "card", id: "distributions", diff --git a/spec/support/pages/organization_dashboard_page.rb b/spec/support/pages/organization_dashboard_page.rb index 50fac9cc37..3e93161a4a 100644 --- a/spec/support/pages/organization_dashboard_page.rb +++ b/spec/support/pages/organization_dashboard_page.rb @@ -84,6 +84,10 @@ def has_organization_logo? has_selector? org_logo_selector end + def has_outstanding_section? + has_selector? outstanding_selector + end + def manufacturers_total_donations within manufacturers_section do parse_formatted_integer find(".total_received_donations").text @@ -164,6 +168,22 @@ def total_inventory end end + def outstanding_section + find outstanding_selector + end + + def outstanding_requests + within outstanding_section do + all('tbody > tr') + end + end + + def outstanding_requests_link + within outstanding_section do + find('.card-footer a') + end + end + private def product_drives_section @@ -201,4 +221,8 @@ def org_logo_selector def purchases_section find "#purchases" end + + def outstanding_selector + "#outstanding" + end end diff --git a/spec/system/dashboard_system_spec.rb b/spec/system/dashboard_system_spec.rb index ddd6bef210..f7ac62a91d 100644 --- a/spec/system/dashboard_system_spec.rb +++ b/spec/system/dashboard_system_spec.rb @@ -812,6 +812,80 @@ def create_next_product_drive_distribution(date_picker:) end end end + + describe "Outstanding Requests" do + it "has a card" do + org_dashboard_page.visit + expect(org_dashboard_page).to have_outstanding_section + end + + context "when empty" do + before { org_dashboard_page.visit } + + it "displays a message" do + expect(org_dashboard_page.outstanding_section).to have_content "No outstanding requests!" + end + + it "has a See More link" do + expect(org_dashboard_page.outstanding_requests_link).to have_content "See more" + end + end + + context "with a pending request" do + let!(:request) { create :request, :pending } + let!(:outstanding_request) do + org_dashboard_page.visit + requests = org_dashboard_page.outstanding_requests + expect(requests.length).to eq 1 + requests.first + end + + it "displays the date" do + date = outstanding_request.find "td.date" + expect(date.text).to eq request.created_at.strftime("%m/%d/%Y") + end + + it "displays the partner" do + expect(outstanding_request).to have_content request.partner.name + end + + it "displays the requestor" do + expect(outstanding_request).to have_content request.partner_user.name + end + + it "displays the comment" do + expect(outstanding_request).to have_content request.comments + end + + it "links to the request" do + expect { outstanding_request.find('a').click } + .to change { page.current_path } + .to "/#{org_short_name}/requests/#{request.id}" + end + + it "has a See More link" do + expect(org_dashboard_page.outstanding_requests_link).to have_content "See more" + end + end + + it "does display a started request" do + create :request, :started + org_dashboard_page.visit + expect(org_dashboard_page.outstanding_requests.length).to eq 1 + end + + it "does not display a fulfilled request" do + create :request, :fulfilled + org_dashboard_page.visit + expect(org_dashboard_page.outstanding_requests).to be_empty + end + + it "does not display a discarded request" do + create :request, :discarded + org_dashboard_page.visit + expect(org_dashboard_page.outstanding_requests).to be_empty + end + end end def valid_bracketing_dates(date_range_info) From c302248ded1092b553897800a133dcadc6e1d508 Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Sat, 29 Jul 2023 14:02:05 -0400 Subject: [PATCH 007/122] Limit Outstanding Requests to 25 A huge list of outstanding requests starts to overwhelm the page and make other things hard to find. Show 25 and a link that says how many other requests there are. --- app/views/dashboard/index.html.erb | 11 +++++++++-- spec/system/dashboard_system_spec.rb | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index a666437f76..fed9dbeb5f 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -117,19 +117,26 @@ <%= outstanding_type = @outstanding_requests.empty? ? :box : :table + outstanding_footer = + if @outstanding_requests.count > 25 + "And #{@outstanding_requests.count - 25} more..." + else + "See more..." + end render( "card", id: "outstanding", gradient: "warning", title: "Outstanding Requests", type: outstanding_type, - footer: link_to("See more...", requests_path), + footer: link_to(outstanding_footer, requests_path), footer_options: { class: "text-center" }, ) do if @outstanding_requests.empty? "No outstanding requests!" else - render "outstanding_requests", outstanding_requests: @outstanding_requests + render "outstanding_requests", + outstanding_requests: @outstanding_requests.take(25) end end %> diff --git a/spec/system/dashboard_system_spec.rb b/spec/system/dashboard_system_spec.rb index f7ac62a91d..1adb9ce7a7 100644 --- a/spec/system/dashboard_system_spec.rb +++ b/spec/system/dashboard_system_spec.rb @@ -885,6 +885,23 @@ def create_next_product_drive_distribution(date_picker:) org_dashboard_page.visit expect(org_dashboard_page.outstanding_requests).to be_empty end + + context "with many pending requests" do + let(:num_requests) { 50 } + let(:limit) { 25 } + before do + create_list :request, num_requests, :pending + org_dashboard_page.visit + end + + it "displays a limited number of requests" do + expect(org_dashboard_page.outstanding_requests.length).to eq limit + end + + it "has a link with the number of other requests" do + expect(org_dashboard_page.outstanding_requests_link).to have_content num_requests - limit + end + end end end From dd0265f62dd0da8355106174a7ac52f38e70cc43 Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Sat, 29 Jul 2023 14:12:51 -0400 Subject: [PATCH 008/122] Restore remove button to dashboard cards The +/- collapse doesn't work with the layout of the table cards. Instead, those cards had a remove button. --- app/views/dashboard/_card.html.erb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/views/dashboard/_card.html.erb b/app/views/dashboard/_card.html.erb index 2772f635fd..a590448a3b 100644 --- a/app/views/dashboard/_card.html.erb +++ b/app/views/dashboard/_card.html.erb @@ -35,9 +35,15 @@ content_tag(:div, **header_options) do %> <%= header %>
    - + <% if type == :table %> + + <% else %> + + <% end %>
    <% end end From 73deb2f0e787f718940e2be40739ff181dfa042c Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 29 Jul 2023 16:10:14 -0400 Subject: [PATCH 009/122] Initial Itemized Donations report extract from dashboard [#3733] --- .../reports/itemized_donations_controller.rb | 6 ++++ app/views/dashboard/index.html.erb | 31 ++++++------------- app/views/layouts/_lte_sidebar.html.erb | 5 +++ .../reports/itemized_donations/index.html.erb | 29 +++++++++++++++++ .../{dashboard => shared}/_card.html.erb | 0 config/routes.rb | 1 + 6 files changed, 51 insertions(+), 21 deletions(-) create mode 100644 app/controllers/reports/itemized_donations_controller.rb create mode 100644 app/views/reports/itemized_donations/index.html.erb rename app/views/{dashboard => shared}/_card.html.erb (100%) diff --git a/app/controllers/reports/itemized_donations_controller.rb b/app/controllers/reports/itemized_donations_controller.rb new file mode 100644 index 0000000000..455d47701d --- /dev/null +++ b/app/controllers/reports/itemized_donations_controller.rb @@ -0,0 +1,6 @@ +class Reports::ItemizedDonationsController < ApplicationController + def index + @donations = current_organization.donations.during(helpers.selected_range) + @itemized_donation_data = DonationItemizedBreakdownService.new(organization: current_organization, donation_ids: @donations.pluck(:id)).fetch + end +end diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index fed9dbeb5f..913b34771e 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -20,7 +20,7 @@
    <%= render( - "card", + "shared/card", id: "summary", header: content_tag(:h5, current_organization.name, class: "card-title"), footer: capture { %> @@ -83,7 +83,7 @@
    <% if @broadcast_announcements.any? %> -
    +

    Announcements from Human Essentials

    @@ -124,7 +124,7 @@ "See more..." end render( - "card", + "shared/card", id: "outstanding", gradient: "warning", title: "Outstanding Requests", @@ -142,7 +142,7 @@ %> <%= render( - "card", + "shared/card", id: "distributions", gradient: "info", title: "Distributions", @@ -167,7 +167,7 @@ <% end %> <%= render( - "card", + "shared/card", gradient: "success", title: "Itemized Distributions", subtitle: @selected_date_range, @@ -181,7 +181,7 @@ <% end %> <%= render( - "card", + "shared/card", gradient: "warning", title: "Activity", subtitle: @selected_date_range, @@ -228,7 +228,7 @@
    <%= render( - "card", + "shared/card", id: "donations", title: "Donations (All Sources)", subtitle: @selected_date_range, @@ -254,7 +254,7 @@ <% end %> <%= render( - "card", + "shared/card", id: "product_drives", gradient: "info", title: "Product Drives", @@ -284,7 +284,7 @@ <% end %> <%= render( - "card", + "shared/card", id: "manufacturers", gradient: "success", title: "Manufacturer Donations", @@ -313,7 +313,7 @@ <% end %> <%= render( - "card", + "shared/card", id: "purchases", gradient: "secondary", title: "Purchases", @@ -331,17 +331,6 @@ <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %>
    <% end %> - - <%= render( - "card", - gradient: "warning", - title: "Itemized Donations", - subtitle: @selected_date_range, - type: :table, - ) do %> - <%= render partial: "itemized_donations_partial", locals: { itemized_breakdown: @itemized_donation_data } %> - <% end %> -
    diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 0175496b56..9203e9282d 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -189,6 +189,11 @@ Annual Survey <% end %> +
  • + <%= link_to(reports_itemized_donations_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports'])}") do %> + Itemized Donations + <% end %> +
    • <% end %> diff --git a/app/views/reports/itemized_donations/index.html.erb b/app/views/reports/itemized_donations/index.html.erb new file mode 100644 index 0000000000..574693dbda --- /dev/null +++ b/app/views/reports/itemized_donations/index.html.erb @@ -0,0 +1,29 @@ +<%= render( + "shared/card", + gradient: "warning", + title: "Itemized Donations", + subtitle: @selected_date_range, + type: :table, +) do %> + + + + + + + + + + <% # Ordering from highest distributed to lowest %> + <% @itemized_donation_data.each do |item| %> + + + + + + + <% end %> + +
       ItemTotal DonatedTotal On Hand
       <%= item[:name] %><%= item[:donated] %><%= item[:current_onhand] || "Unknown" %>
    + +<% end %> diff --git a/app/views/dashboard/_card.html.erb b/app/views/shared/_card.html.erb similarity index 100% rename from app/views/dashboard/_card.html.erb rename to app/views/shared/_card.html.erb diff --git a/config/routes.rb b/config/routes.rb index 05e5b017f4..d32f9f530a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -104,6 +104,7 @@ def set_up_flipper resources :annual_reports, only: [:index, :show], param: :year do post :recalculate, on: :member end + resources :itemized_donations, only: [:index] end resources :transfers, only: %i(index create new show destroy) From 251f09c6785a567206742ef49f47249eb17b71f4 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 29 Jul 2023 16:21:11 -0400 Subject: [PATCH 010/122] Bring in date filter from other branch [#3733] --- .../reports/itemized_donations_controller.rb | 1 + .../reports/itemized_donations/index.html.erb | 32 ++++++++-------- app/views/shared/_filtered_card.html.erb | 37 +++++++++++++++++++ 3 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 app/views/shared/_filtered_card.html.erb diff --git a/app/controllers/reports/itemized_donations_controller.rb b/app/controllers/reports/itemized_donations_controller.rb index 455d47701d..fa356fcb95 100644 --- a/app/controllers/reports/itemized_donations_controller.rb +++ b/app/controllers/reports/itemized_donations_controller.rb @@ -1,5 +1,6 @@ class Reports::ItemizedDonationsController < ApplicationController def index + setup_date_range_picker @donations = current_organization.donations.during(helpers.selected_range) @itemized_donation_data = DonationItemizedBreakdownService.new(organization: current_organization, donation_ids: @donations.pluck(:id)).fetch end diff --git a/app/views/reports/itemized_donations/index.html.erb b/app/views/reports/itemized_donations/index.html.erb index 574693dbda..071b93c6f2 100644 --- a/app/views/reports/itemized_donations/index.html.erb +++ b/app/views/reports/itemized_donations/index.html.erb @@ -1,29 +1,31 @@ <%= render( - "shared/card", - gradient: "warning", + "shared/filtered_card", + id: "purchases", + gradient: "secondary", title: "Itemized Donations", subtitle: @selected_date_range, type: :table, + filter_url: reports_itemized_donations_path ) do %> - - +
    + - - <% # Ordering from highest distributed to lowest %> - <% @itemized_donation_data.each do |item| %> - - - - - - - <% end %> + + <% # Ordering from highest distributed to lowest %> + <% @itemized_donation_data.each do |item| %> + + + + + + + <% end %> -
       Item Total Donated Total On Hand
       <%= item[:name] %><%= item[:donated] %><%= item[:current_onhand] || "Unknown" %>
       <%= item[:name] %><%= item[:donated] %><%= item[:current_onhand] || "Unknown" %>
    + <% end %> diff --git a/app/views/shared/_filtered_card.html.erb b/app/views/shared/_filtered_card.html.erb new file mode 100644 index 0000000000..2c3717f721 --- /dev/null +++ b/app/views/shared/_filtered_card.html.erb @@ -0,0 +1,37 @@ +<% + id ||= nil + title ||= nil + subtitle ||= nil + footer ||= nil +%> + +
    +
    +
    +
    +
    + <%= simple_form_for :filters, url: filter_url, method: :get do |f| %> + <%= render partial: "shared/date_range_picker", locals: {css_class: "form-control"} %>
    + <%= filter_button %> + <% end %> +
    +
    +
    +
    +
    + <%= render("shared/card", + id: id, + gradient: "secondary", + title: title, + subtitle: subtitle, + footer_options: { class: "text-center" }, + footer: footer + ) do + + yield + + end %> +
    +
    +
    +
    From 59a5cfb7c6b3a9b52b1e3a2a5dd2f24d74973372 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 29 Jul 2023 16:26:00 -0400 Subject: [PATCH 011/122] Align text better [#3733] --- app/views/reports/itemized_donations/index.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/reports/itemized_donations/index.html.erb b/app/views/reports/itemized_donations/index.html.erb index 071b93c6f2..fa35de1867 100644 --- a/app/views/reports/itemized_donations/index.html.erb +++ b/app/views/reports/itemized_donations/index.html.erb @@ -8,7 +8,7 @@ filter_url: reports_itemized_donations_path ) do %> - +
    @@ -21,8 +21,8 @@ - - + + <% end %> From 914881afd0c1e46c4632f606b57655c5c2263cbf Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 29 Jul 2023 16:28:58 -0400 Subject: [PATCH 012/122] Slight alignment cleanup [#3733] --- app/views/reports/itemized_donations/index.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/reports/itemized_donations/index.html.erb b/app/views/reports/itemized_donations/index.html.erb index fa35de1867..bcbc1f5bbb 100644 --- a/app/views/reports/itemized_donations/index.html.erb +++ b/app/views/reports/itemized_donations/index.html.erb @@ -12,11 +12,11 @@ - - + + - <% # Ordering from highest distributed to lowest %> + <% @itemized_donation_data.each do |item| %> From d4e67fa2328ff9cc848a9533c732b65720c54ba8 Mon Sep 17 00:00:00 2001 From: Lee Sharma Date: Sat, 29 Jul 2023 21:14:36 +0000 Subject: [PATCH 013/122] refactor(dashboard): Move Distributions by County functionality [#3722] (#3793) * Remove old "Distributions by County" button * Add Distribution by County report to sidebar * Make reports menu visible to non-admin users --- app/views/dashboard/index.html.erb | 1 - app/views/layouts/_lte_sidebar.html.erb | 87 ++++++++++--------- .../distributions_by_county_system_spec.rb | 1 + spec/system/navigation_system_spec.rb | 14 ++- 4 files changed, 60 insertions(+), 43 deletions(-) diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index fed9dbeb5f..129fa5807f 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -151,7 +151,6 @@ footer_options: { class: "text-center" }, ) do %> <%= new_button_to new_distribution_path, {text: "New Distribution"} %> - <%= print_button_to distributions_by_county_report_path(filters: { date_range: date_range_params }), {text: "Distributions by County", size: "md"} %>

    diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 0175496b56..3a09e89e6b 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -170,52 +170,57 @@ - <% if current_user.has_role?(Role::ORG_ADMIN, current_organization) %> -
  • - - -

    Reporting & Auditing - -

    -     -
      +
    • + + +

      Reporting & Auditing + +

      +       +
        + <% if current_user.has_role?(Role::ORG_ADMIN, current_organization) %>
      • <%= link_to(audits_path(organization_id: current_user.organization), class: "nav-link #{active_class(['audits'])}") do %> Inventory Audit <% end %>
        • -
      • - <%= link_to(reports_annual_reports_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports'])}") do %> - Annual Survey - <% end %> -
        • -
      -
      • - <% end %> -
    • - - -

      Historical Trends -

      -       -
        -
      • - <%= link_to(historical_trends_donations_path, class: "nav-link #{"active" if current_page?(historical_trends_donations_path)}") do %> - Donations - <% end %> -
        • -
      • - <%= link_to(historical_trends_purchases_path, class: "nav-link #{"active" if current_page?(historical_trends_purchases_path)}") do %> - Purchases - <% end %> -
        • -
      • - <%= link_to(historical_trends_distributions_path, class: "nav-link #{"active" if current_page?(historical_trends_distributions_path)}") do %> - Distributions - <% end %> -
        • -
      -
      • + <% end %> +
    • + <%= link_to(reports_annual_reports_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports'])}") do %> + Annual Survey + <% end %> +
      • +
    • + <%= link_to(distributions_by_county_report_path(filters: { date_range: date_range_params }), class: "nav-link #{active_class(['reports'])}") do %> + Distributions by County + <% end %> +
      • +
    +
    • +
  • + + +

    Historical Trends +

    +     +
      +
    • + <%= link_to(historical_trends_donations_path, class: "nav-link #{"active" if current_page?(historical_trends_donations_path)}") do %> + Donations + <% end %> +
      • +
    • + <%= link_to(historical_trends_purchases_path, class: "nav-link #{"active" if current_page?(historical_trends_purchases_path)}") do %> + Purchases + <% end %> +
      • +
    • + <%= link_to(historical_trends_distributions_path, class: "nav-link #{"active" if current_page?(historical_trends_distributions_path)}") do %> + Distributions + <% end %> +
      • +
    +
    • <% if current_user.has_role?(Role::ORG_ADMIN, current_organization) %>
  • <%= link_to(organization_path, class: "nav-link") do %> diff --git a/spec/system/distributions_by_county_system_spec.rb b/spec/system/distributions_by_county_system_spec.rb index d953521c3f..bb7d321a91 100644 --- a/spec/system/distributions_by_county_system_spec.rb +++ b/spec/system/distributions_by_county_system_spec.rb @@ -49,6 +49,7 @@ def visit_distribution_by_county_with_specified_date_range(date_range_string) end click_on "Filter" + click_on "Reporting & Auditing" click_on "Distributions by County" end end diff --git a/spec/system/navigation_system_spec.rb b/spec/system/navigation_system_spec.rb index d94c3f61ac..842482ac71 100644 --- a/spec/system/navigation_system_spec.rb +++ b/spec/system/navigation_system_spec.rb @@ -5,7 +5,7 @@ visit "/" end - context "with organization user" do + context "with organization admin" do let(:user) { create(:organization_admin) } # 2389 Links was missing Forecasting, which is available to an organization admin let(:links) { ["Dashboard", "Donations", "Purchases", "Requests", "Product Drives", "Distributions", "Pick Ups & Deliveries", "Partner Agencies", "Inventory", "Community", "Reporting & Auditing", "Historical Trends", "My Organization"] } @@ -28,6 +28,18 @@ end end end + + describe "Reporting & Auditing submenu"do + let(:reports) { ["Inventory Audit", "Annual Survey", "Distributions by County"] } + before { click_link("Reporting & Auditing") } + + it "shows submenu navigation options" do + sidebar = page.find(".sidebar") + reports.each do |report_name| + expect(sidebar).to have_link(report_name) + end + end + end end end From 802505c88494ee1bf1976539a242d982e284473f Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 29 Jul 2023 17:16:58 -0400 Subject: [PATCH 014/122] Add a basic spec for the itemized donations report [#3733] --- spec/system/report_itemized_donations_spec.rb | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 spec/system/report_itemized_donations_spec.rb diff --git a/spec/system/report_itemized_donations_spec.rb b/spec/system/report_itemized_donations_spec.rb new file mode 100644 index 0000000000..1058e34049 --- /dev/null +++ b/spec/system/report_itemized_donations_spec.rb @@ -0,0 +1,29 @@ +RSpec.describe "Report Itemized Donations", type: :system, js: true do + context "With an existing essentials bank" do + before do + sign_in(@user) + end + + context "without any donations" do + it "can load the page" do + visit reports_itemized_donations_path(@organization) + expect(page).to have_content("Itemized Donations") + end + + it "has no items" do + visit reports_itemized_donations_path(@organization) + expect(page).to have_content("No itemized donations found for the selected date range.") + end + end + + context "with a donation" do + let(:donation) { create(:donation, :with_items, organization: @organization) } + + it "Shows an item from the donation" do + donation + visit reports_itemized_donations_path(@organization) + expect(page).to have_content(donation.items.first.name) + end + end + end +end From 54e9f130052bf2c2b21194db981e4826be26965f Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 29 Jul 2023 17:22:33 -0400 Subject: [PATCH 015/122] All the build on all the branches [#3733] --- .github/workflows/brakeman.yml | 4 ---- .github/workflows/factory-bot-lint.yml | 4 ---- .github/workflows/rspec-system.yml | 2 -- .github/workflows/rspec.yml | 2 -- .github/workflows/ruby_lint.yml | 4 ---- 5 files changed, 16 deletions(-) diff --git a/.github/workflows/brakeman.yml b/.github/workflows/brakeman.yml index 3ab38205ac..37b2596352 100644 --- a/.github/workflows/brakeman.yml +++ b/.github/workflows/brakeman.yml @@ -2,11 +2,7 @@ name: brakeman on: push: - branches: - - main pull_request: - branches: - - main paths-ignore: - 'doc/**' - '*.md' diff --git a/.github/workflows/factory-bot-lint.yml b/.github/workflows/factory-bot-lint.yml index 2b4bf887ca..0adec99afd 100644 --- a/.github/workflows/factory-bot-lint.yml +++ b/.github/workflows/factory-bot-lint.yml @@ -2,11 +2,7 @@ name: factory bot lint on: push: - branches: - - main pull_request: - branches: - - main paths-ignore: - 'doc/**' - '*.md' diff --git a/.github/workflows/rspec-system.yml b/.github/workflows/rspec-system.yml index 815b478150..ce97ea178b 100644 --- a/.github/workflows/rspec-system.yml +++ b/.github/workflows/rspec-system.yml @@ -2,8 +2,6 @@ name: rspec-system on: push: - branches: - - main pull_request: paths-ignore: - 'doc/**' diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml index 8e0045163e..94ebb9697c 100644 --- a/.github/workflows/rspec.yml +++ b/.github/workflows/rspec.yml @@ -2,8 +2,6 @@ name: rspec on: push: - branches: - - main pull_request: paths-ignore: - 'doc/**' diff --git a/.github/workflows/ruby_lint.yml b/.github/workflows/ruby_lint.yml index 7d505de75e..5023ac905a 100644 --- a/.github/workflows/ruby_lint.yml +++ b/.github/workflows/ruby_lint.yml @@ -2,15 +2,11 @@ name: rubocop lint on: push: - branches: - - main paths-ignore: - 'doc/**' - '*.md' - 'bin/*' pull_request: - branches: - - main paths-ignore: - 'doc/**' - '*.md' From be3f641e08d44401009dea7755749d594268a538 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 29 Jul 2023 17:23:06 -0400 Subject: [PATCH 016/122] Add message when there are no items [#3733] --- .../reports/itemized_donations/index.html.erb | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/app/views/reports/itemized_donations/index.html.erb b/app/views/reports/itemized_donations/index.html.erb index bcbc1f5bbb..b33fdcbbc1 100644 --- a/app/views/reports/itemized_donations/index.html.erb +++ b/app/views/reports/itemized_donations/index.html.erb @@ -8,24 +8,30 @@ filter_url: reports_itemized_donations_path ) do %> -

    •    Item
       <%= item[:name] %><%= item[:donated] %><%= item[:current_onhand] || "Unknown" %><%= item[:donated] %><%= item[:current_onhand] || "Unknown" %>
       ItemTotal DonatedTotal On HandTotal DonatedTotal On Hand
    - - - - - - - - - <% @itemized_donation_data.each do |item| %> - +<% if @itemized_donation_data.empty? %> + +<% else %> +
       ItemTotal DonatedTotal On Hand
    + - - - + + + - <% end %> - -
       <%= item[:name] %><%= item[:donated] %><%= item[:current_onhand] || "Unknown" %>   ItemTotal DonatedTotal On Hand
    + + + <% @itemized_donation_data.each do |item| %> + + +    <%= item[:name] %> + <%= item[:donated] %> + <%= item[:current_onhand] || "Unknown" %> + + <% end %> + + +<% end %> <% end %> From d85cce4139eea9d024f7761d4122ab3415601eea Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 29 Jul 2023 17:27:42 -0400 Subject: [PATCH 017/122] Satiate Rubocop! [#3733] Not sure how these got into this branch specifically, but ok. --- spec/support/pages/organization_dashboard_page.rb | 4 ++-- spec/system/navigation_system_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/support/pages/organization_dashboard_page.rb b/spec/support/pages/organization_dashboard_page.rb index 3e93161a4a..a70d5d4ce9 100644 --- a/spec/support/pages/organization_dashboard_page.rb +++ b/spec/support/pages/organization_dashboard_page.rb @@ -174,13 +174,13 @@ def outstanding_section def outstanding_requests within outstanding_section do - all('tbody > tr') + all("tbody > tr") end end def outstanding_requests_link within outstanding_section do - find('.card-footer a') + find(".card-footer a") end end diff --git a/spec/system/navigation_system_spec.rb b/spec/system/navigation_system_spec.rb index 842482ac71..7d9bad7d95 100644 --- a/spec/system/navigation_system_spec.rb +++ b/spec/system/navigation_system_spec.rb @@ -29,7 +29,7 @@ end end - describe "Reporting & Auditing submenu"do + describe "Reporting & Auditing submenu" do let(:reports) { ["Inventory Audit", "Annual Survey", "Distributions by County"] } before { click_link("Reporting & Auditing") } From 0a5b57d05420fd58884c12ee8605272156806a4d Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 29 Jul 2023 17:29:25 -0400 Subject: [PATCH 018/122] Don't github action ci on both PR and Push [#3733] --- .github/workflows/brakeman.yml | 1 - .github/workflows/factory-bot-lint.yml | 1 - .github/workflows/rspec-system.yml | 1 - .github/workflows/rspec.yml | 1 - .github/workflows/ruby_lint.yml | 5 ----- 5 files changed, 9 deletions(-) diff --git a/.github/workflows/brakeman.yml b/.github/workflows/brakeman.yml index 37b2596352..0f797c3d29 100644 --- a/.github/workflows/brakeman.yml +++ b/.github/workflows/brakeman.yml @@ -2,7 +2,6 @@ name: brakeman on: push: - pull_request: paths-ignore: - 'doc/**' - '*.md' diff --git a/.github/workflows/factory-bot-lint.yml b/.github/workflows/factory-bot-lint.yml index 0adec99afd..523d55b62a 100644 --- a/.github/workflows/factory-bot-lint.yml +++ b/.github/workflows/factory-bot-lint.yml @@ -2,7 +2,6 @@ name: factory bot lint on: push: - pull_request: paths-ignore: - 'doc/**' - '*.md' diff --git a/.github/workflows/rspec-system.yml b/.github/workflows/rspec-system.yml index ce97ea178b..cc2d8bac72 100644 --- a/.github/workflows/rspec-system.yml +++ b/.github/workflows/rspec-system.yml @@ -2,7 +2,6 @@ name: rspec-system on: push: - pull_request: paths-ignore: - 'doc/**' - '*.md' diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml index 94ebb9697c..15cb6c918b 100644 --- a/.github/workflows/rspec.yml +++ b/.github/workflows/rspec.yml @@ -2,7 +2,6 @@ name: rspec on: push: - pull_request: paths-ignore: - 'doc/**' - '*.md' diff --git a/.github/workflows/ruby_lint.yml b/.github/workflows/ruby_lint.yml index 5023ac905a..4aa094aa13 100644 --- a/.github/workflows/ruby_lint.yml +++ b/.github/workflows/ruby_lint.yml @@ -6,11 +6,6 @@ on: - 'doc/**' - '*.md' - 'bin/*' - pull_request: - paths-ignore: - - 'doc/**' - - '*.md' - - 'bin/*' jobs: ruby_lint: From 357df3a7223201fa72e7f2c1f09a68cedbfe4981 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sun, 30 Jul 2023 09:26:27 -0400 Subject: [PATCH 019/122] Remove itemized donations partial [#3733] --- .../_itemized_donations_partial.html.erb | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 app/views/dashboard/_itemized_donations_partial.html.erb diff --git a/app/views/dashboard/_itemized_donations_partial.html.erb b/app/views/dashboard/_itemized_donations_partial.html.erb deleted file mode 100644 index 0d33a68774..0000000000 --- a/app/views/dashboard/_itemized_donations_partial.html.erb +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - <% # Ordering from highest distributed to lowest %> - <% (local_assigns[:itemized_breakdown] || []).each do |item| %> - - - - - - - <% end %> - -
       ItemTotal DonatedTotal On Hand
       <%= item[:name] %><%= item[:donated] %><%= item[:current_onhand] || "Unknown" %>
    From 94f12c0a4d7ccc1b63da3e2c7e41be65eb6f2ae0 Mon Sep 17 00:00:00 2001 From: Rae Stanton Date: Sat, 29 Jul 2023 11:25:30 -0400 Subject: [PATCH 020/122] Issue #3736 - move purchases to new area Fixes #3736 These changes include: Needed to change the dashboard to not contain any information about the purchases summary - this has now been moved to the new purchases summary page within the nav bar under `reporting and auditing`. Filtering has also been added to said page, and filter partials and the card have been added to a shared area for ease of access and consistency. Page tests added for new content. --- app/controllers/dashboard_controller.rb | 2 - .../purchases_summary_controller.rb | 7 + app/views/dashboard/index.html.erb | 20 --- app/views/layouts/_lte_sidebar.html.erb | 9 +- app/views/purchases_summary/_card.html.erb | 76 +++++++++ .../_purchase.html.erb | 3 +- app/views/purchases_summary/index.html.erb | 20 +++ .../purchases_summary/index.html.orginal.erb | 19 +++ app/views/shared/_card.html.erb | 76 +++++++++ app/views/shared/_filtered_card.html.erb | 37 +++++ config/routes.rb | 1 + .../purchases_summary_requests_spec.rb | 25 +++ .../pages/organization_dashboard_page.rb | 16 -- .../organization_purchases_summary_page.rb | 48 ++++++ spec/system/dashboard_system_spec.rb | 117 -------------- spec/system/purchases_summary_system_spec.rb | 147 ++++++++++++++++++ 16 files changed, 465 insertions(+), 158 deletions(-) create mode 100644 app/controllers/purchases_summary_controller.rb create mode 100644 app/views/purchases_summary/_card.html.erb rename app/views/{dashboard => purchases_summary}/_purchase.html.erb (98%) create mode 100644 app/views/purchases_summary/index.html.erb create mode 100644 app/views/purchases_summary/index.html.orginal.erb create mode 100644 app/views/shared/_card.html.erb create mode 100644 app/views/shared/_filtered_card.html.erb create mode 100644 spec/requests/purchases_summary_requests_spec.rb create mode 100644 spec/support/pages/organization_purchases_summary_page.rb create mode 100644 spec/system/purchases_summary_system_spec.rb diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 990ff9ee2f..54706f9afc 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -7,8 +7,6 @@ def index @donations = current_organization.donations.during(helpers.selected_range) @recent_donations = @donations.recent - @purchases = current_organization.purchases.during(helpers.selected_range) - @recent_purchases = @purchases.recent.includes(:vendor) distributions = current_organization.distributions.includes(:partner).during(helpers.selected_range) @recent_distributions = distributions.recent diff --git a/app/controllers/purchases_summary_controller.rb b/app/controllers/purchases_summary_controller.rb new file mode 100644 index 0000000000..3f81e0d5a3 --- /dev/null +++ b/app/controllers/purchases_summary_controller.rb @@ -0,0 +1,7 @@ +class PurchasesSummaryController < ApplicationController + def index + setup_date_range_picker + @purchases = current_organization.purchases.during(helpers.selected_range) + @recent_purchases = @purchases.recent.includes(:vendor) + end +end diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 129fa5807f..f4559ec9f8 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -311,26 +311,6 @@
    <% end %> - <%= render( - "card", - id: "purchases", - gradient: "secondary", - title: "Purchases", - subtitle: @selected_date_range, - footer_options: { class: "text-center" }, - footer: link_to("See more...", purchases_path), - ) do %> - <%= new_button_to new_purchase_path, {text: "New Purchase"} %> -

    <%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %> - spent - <%= @selected_date_range_label %> -

    -
    -

    Recent purchases

    - <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %> -
    - <% end %> - <%= render( "card", gradient: "warning", diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 3a09e89e6b..67a4124e2f 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -170,8 +170,8 @@ -
  • - +
  • "> + ">

    Reporting & Auditing @@ -195,6 +195,11 @@ Distributions by County <% end %>

    • +
  • + <%= link_to(purchases_summary_path(organization_id: current_user.organization), class: "nav-link #{"active" if current_page?(purchases_summary_path)}") do %> + Purchases Summary + <% end %> +
  • diff --git a/app/views/purchases_summary/_card.html.erb b/app/views/purchases_summary/_card.html.erb new file mode 100644 index 0000000000..2772f635fd --- /dev/null +++ b/app/views/purchases_summary/_card.html.erb @@ -0,0 +1,76 @@ +<% + # Allows locals to be optional + footer ||= nil + footer_div ||= nil + header_div ||= nil + id ||= nil + subtitle ||= nil + title ||= nil + type ||= :box # or :table or :plain + + options ||= {} + options.symbolize_keys! + options[:class] ||= "" + options[:class] += " card" + options[:id] = id if id +%> +<%= content_tag(:div, **options) do %> + <%= + header_div || + begin + gradient ||= "primary" + + header_options ||= {} + header_options.symbolize_keys! + header_options[:class] ||= "" + header_options[:class] += " card-header border-0 bg-gradient-#{gradient}" + + header ||= + begin + title = h title + title += " ".html_safe + content_tag(:small, subtitle) if subtitle + content_tag :h3, title, class: "card-title" + end + + content_tag(:div, **header_options) do %> + <%= header %> +
    + +
    + <% end + end + %> + <% case type.to_sym + when :box %> +
    +
    +
    + <%= yield %> +
    +
    +
    + <% when :plain %> +
    + <%= yield %> +
    + <% when :table %> +
    + <%= yield %> +
    + <% else + raise "Unknown card type: #{type}" + end %> + + <%= + footer_div || + if footer + footer_options ||= {} + footer_options.symbolize_keys! + footer_options[:class] ||= "" + footer_options[:class] += " card-footer" + content_tag(:div, footer, **footer_options) + end + %> +<% end %> diff --git a/app/views/dashboard/_purchase.html.erb b/app/views/purchases_summary/_purchase.html.erb similarity index 98% rename from app/views/dashboard/_purchase.html.erb rename to app/views/purchases_summary/_purchase.html.erb index bb13b180f7..86344a45a1 100644 --- a/app/views/dashboard/_purchase.html.erb +++ b/app/views/purchases_summary/_purchase.html.erb @@ -1,4 +1,4 @@ -
    +
    <%= link_to purchase do %> <%= number_with_delimiter purchase.line_items.total %> items from <%= purchase.purchased_from_view %> @@ -7,3 +7,4 @@
    <%= distance_of_time_in_words_to_now purchase.created_at %> ago
    + diff --git a/app/views/purchases_summary/index.html.erb b/app/views/purchases_summary/index.html.erb new file mode 100644 index 0000000000..8ce5e3cf74 --- /dev/null +++ b/app/views/purchases_summary/index.html.erb @@ -0,0 +1,20 @@ + <%= render( + "shared/filtered_card", + id: "purchases", + gradient: "secondary", + title: "Purchases", + subtitle: @selected_date_range, + footer_options: { class: "text-center" }, + footer: link_to("See more...", purchases_path), + filter_url: purchases_summary_path + ) do %> + <%= new_button_to new_purchase_path, {text: "New Purchase"} %> +

    <%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %> + spent + <%= @selected_date_range_label %> +

    +
    +

    Recent purchases

    + <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %> +
    + <% end %> diff --git a/app/views/purchases_summary/index.html.orginal.erb b/app/views/purchases_summary/index.html.orginal.erb new file mode 100644 index 0000000000..1dc3fe2387 --- /dev/null +++ b/app/views/purchases_summary/index.html.orginal.erb @@ -0,0 +1,19 @@ + <%= render( + "shared/card", + id: "purchases", + gradient: "secondary", + title: "Purchases", + subtitle: @selected_date_range, + footer_options: { class: "text-center" }, + footer: link_to("See more...", purchases_path), + ) do %> + <%= new_button_to new_purchase_path, {text: "New Purchase"} %> +

    <%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %> + spent + <%= @selected_date_range_label %> +

    +
    +

    Recent purchases

    + <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %> +
    + <% end %> diff --git a/app/views/shared/_card.html.erb b/app/views/shared/_card.html.erb new file mode 100644 index 0000000000..2772f635fd --- /dev/null +++ b/app/views/shared/_card.html.erb @@ -0,0 +1,76 @@ +<% + # Allows locals to be optional + footer ||= nil + footer_div ||= nil + header_div ||= nil + id ||= nil + subtitle ||= nil + title ||= nil + type ||= :box # or :table or :plain + + options ||= {} + options.symbolize_keys! + options[:class] ||= "" + options[:class] += " card" + options[:id] = id if id +%> +<%= content_tag(:div, **options) do %> + <%= + header_div || + begin + gradient ||= "primary" + + header_options ||= {} + header_options.symbolize_keys! + header_options[:class] ||= "" + header_options[:class] += " card-header border-0 bg-gradient-#{gradient}" + + header ||= + begin + title = h title + title += " ".html_safe + content_tag(:small, subtitle) if subtitle + content_tag :h3, title, class: "card-title" + end + + content_tag(:div, **header_options) do %> + <%= header %> +
    + +
    + <% end + end + %> + <% case type.to_sym + when :box %> +
    +
    +
    + <%= yield %> +
    +
    +
    + <% when :plain %> +
    + <%= yield %> +
    + <% when :table %> +
    + <%= yield %> +
    + <% else + raise "Unknown card type: #{type}" + end %> + + <%= + footer_div || + if footer + footer_options ||= {} + footer_options.symbolize_keys! + footer_options[:class] ||= "" + footer_options[:class] += " card-footer" + content_tag(:div, footer, **footer_options) + end + %> +<% end %> diff --git a/app/views/shared/_filtered_card.html.erb b/app/views/shared/_filtered_card.html.erb new file mode 100644 index 0000000000..48d681c912 --- /dev/null +++ b/app/views/shared/_filtered_card.html.erb @@ -0,0 +1,37 @@ +<% + id ||= nil + title ||= nil + subtitle ||= nil + footer ||= nil +%> + +
    +
    +
    +
    +
    + <%= simple_form_for :filters, url: filter_url, method: :get do |f| %> + <%= render partial: "shared/date_range_picker", locals: {css_class: "form-control"} %>
    + <%= filter_button %> + <% end %> +
    +
    +
    +
    +
    + <%= render("card", + id: id, + gradient: "secondary", + title: title, + subtitle: subtitle, + footer_options: { class: "text-center" }, + footer: footer + ) do + + yield + + end %> +
    +
    +
    +
    diff --git a/config/routes.rb b/config/routes.rb index 05e5b017f4..b673b05f0f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -216,6 +216,7 @@ def set_up_flipper get "historical_trends/distributions", to: "historical_trends/distributions#index" get "historical_trends/purchases", to: "historical_trends/purchases#index" get "historical_trends/donations", to: "historical_trends/donations#index" + get "purchases_summary", to: "purchases_summary#index" end resources :attachments, only: %i(destroy) diff --git a/spec/requests/purchases_summary_requests_spec.rb b/spec/requests/purchases_summary_requests_spec.rb new file mode 100644 index 0000000000..e8d96aa2cb --- /dev/null +++ b/spec/requests/purchases_summary_requests_spec.rb @@ -0,0 +1,25 @@ +require "rails_helper" + +RSpec.describe "Purchases", type: :request do + context "while signed in" do + before do + sign_in(@user) + end + + describe "GET #index" do + it "shows a list of recent purchases" do + get purchases_summary_path(@user.organization) + expect(response.body).to include("Recent purchases") + end + end + end + + context "while not signed in" do + describe "GET #index" do + it "redirects user to sign in page" do + get purchases_summary_path(@user.organization) + expect(response).to redirect_to(new_user_session_path) + end + end + end +end diff --git a/spec/support/pages/organization_dashboard_page.rb b/spec/support/pages/organization_dashboard_page.rb index 3e93161a4a..7921d0bf5e 100644 --- a/spec/support/pages/organization_dashboard_page.rb +++ b/spec/support/pages/organization_dashboard_page.rb @@ -18,12 +18,6 @@ def create_new_donation end end - def create_new_purchase - within purchases_section do - click_link "New Purchase" - end - end - def product_drive_total_donations within product_drives_section do parse_formatted_integer find(".total_received_donations").text @@ -130,12 +124,6 @@ def top_manufacturer_donation_links end end - def recent_purchase_links - within purchases_section do - all(".purchase a").map(&:text) - end - end - def select_date_filter_range(range_name) find("#filters_date_range").click @@ -218,10 +206,6 @@ def org_logo_selector ".organization-logo" end - def purchases_section - find "#purchases" - end - def outstanding_selector "#outstanding" end diff --git a/spec/support/pages/organization_purchases_summary_page.rb b/spec/support/pages/organization_purchases_summary_page.rb new file mode 100644 index 0000000000..8e11c973fd --- /dev/null +++ b/spec/support/pages/organization_purchases_summary_page.rb @@ -0,0 +1,48 @@ +require_relative "organization_page" + +class OrganizationPurchasesSummaryPage < OrganizationPage + def org_page_path + "purchases_summary" + end + + def create_new_purchase + within purchases_section do + click_link "New Purchase" + end + end + + def recent_purchase_links + within purchases_section do + all(".purchase a").map(&:text) + end + end + + def filter_to_date_range(range_name, custom_dates = nil) + select_date_filter_range range_name + + if custom_dates.present? + fill_in :filters_date_range, with: "" + fill_in :filters_date_range, with: custom_dates + #clicking on page to ensure date picker closes + page.find(:xpath, "//*[contains(text(),'Recent purchases')]").click + end + + click_on "Filter" + end + + private + + def select_date_filter_range(range_name) + find("#filters_date_range").click + + if range_name + within ".container__predefined-ranges" do + find("button", text: range_name).click + end + end + end + + def purchases_section + find "#purchases" + end +end diff --git a/spec/system/dashboard_system_spec.rb b/spec/system/dashboard_system_spec.rb index 1adb9ce7a7..5febe48201 100644 --- a/spec/system/dashboard_system_spec.rb +++ b/spec/system/dashboard_system_spec.rb @@ -240,123 +240,6 @@ def create_next_donation(donation_date:) end end - describe "Purchases" do - it "has a link to create a new purchase" do - org_new_purchase_page = OrganizationNewPurchasePage.new org_short_name: org_short_name - - org_dashboard_page.visit - - expect { org_dashboard_page.create_new_purchase } - .to change { page.current_path } - .to org_new_purchase_page.path - end - - # as of 28 Jan 2022, the "Recent Purchases" list shows up to this many items matching the date filter - max_recent_purchase_links_count = 3 - - # Make up to this many (inclusive) purchases for each filtered period - # Keep it below (item_quantities.size - 1) so there's at least 2 values left for - # Purchases outside of the filtered period - max_purchases_in_filtered_period = max_recent_purchase_links_count + 1 - - around do |example| - # Ensure "today" doesn't change for the server side during the example run - # Note, however, that this does *not* affect the client side - # So "today" for the server still might be "yesterday" - # —possibly even "last month" or "last year"- - # for the client - # Rely on rerun via rspec-retry for those edge cases - travel_to(test_time) - example.run - travel_back - end - - [ - # rubocop:disable Layout/ExtraSpacing, Layout/SpaceAroundOperators - ["Today", test_time, test_time], - ["Yesterday", test_time.yesterday, test_time.yesterday], - ["Last 7 Days", test_time - 6.days, test_time], - ["Last 30 Days", test_time - 29.days, test_time], - ["This Month", test_time.beginning_of_month, test_time.end_of_month], - ["Last Month", test_time.last_month.beginning_of_month, test_time.last_month.end_of_month], - ["This Year", test_time.beginning_of_year, test_time.end_of_year], - - # We now can't test the lower limit of All Time, because the earliest possible date is 2000-01-01 - # ["All Time", test_time - 100.years, test_time], - [nil, test_time - 2.years, test_time - rand(180).days, :set_custom_dates] # arbitrary values - # rubocop:enable Layout/ExtraSpacing, Layout/SpaceAroundOperators - ].each do |date_range_info| - filtered_date_range_label, start_date, end_date, set_custom_dates = date_range_info - - filtered_date_range = start_date.to_date..end_date.to_date - before_filtered_date_range = start_date.yesterday.to_date - after_filtered_date_range = end_date.tomorrow.to_date - - start_date_formatted, end_date_formatted = [start_date, end_date].map { _1.to_formatted_s(:date_picker) } - - # Ideally different date ranges get different counts (incl. 0!) to test the various combinations - # w/out making a fixed pattern - num_purchases_in_filtered_period = rand(0..max_purchases_in_filtered_period) - - context "given 1 Purchase on #{before_filtered_date_range} (unless 'All Time'), " \ - "#{num_purchases_in_filtered_period} during #{filtered_date_range}, and " \ - "1 on #{after_filtered_date_range}" do - custom_dates = if set_custom_dates - "#{start_date_formatted} - #{end_date_formatted}" - end - - before do - filtered_dates = filtered_date_range.to_a - @quantities_donated_in_filtered_date_range = [] - - @item_quantity = item_quantities.to_enum - - def create_next_purchase(purchase_date:) - quantity_in_purchase = @item_quantity.next - create :purchase, :with_items, issued_at: purchase_date, item_quantity: quantity_in_purchase, storage_location: storage_location, organization: @organization - - quantity_in_purchase - end - - # days_this_year.sample in num_purchases_in_filtered_period.times loop - # rather than - # days_this_year.sample(num_purchases_in_filtered_period).each - # because Array#sample(n) on an Array with m Date: Sun, 30 Jul 2023 09:33:57 -0400 Subject: [PATCH 021/122] Fix nesting of HTML rows [#3733] --- app/views/reports/itemized_donations/index.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/reports/itemized_donations/index.html.erb b/app/views/reports/itemized_donations/index.html.erb index b33fdcbbc1..e55dc2511a 100644 --- a/app/views/reports/itemized_donations/index.html.erb +++ b/app/views/reports/itemized_donations/index.html.erb @@ -22,15 +22,15 @@ - <% @itemized_donation_data.each do |item| %> - + + <% @itemized_donation_data.each do |item| %>    <%= item[:name] %> <%= item[:donated] %> <%= item[:current_onhand] || "Unknown" %> <% end %> - + <% end %> From 020b4bb2c91d7e12f71c840799dcf99163e85dca Mon Sep 17 00:00:00 2001 From: Rae Stanton Date: Sun, 30 Jul 2023 09:49:02 -0400 Subject: [PATCH 022/122] rm extra index card for purchases summary fixed weird spacing issue, removed duplicate file --- app/views/purchases_summary/index.html.erb | 40 +++++++++---------- .../purchases_summary/index.html.orginal.erb | 19 --------- 2 files changed, 20 insertions(+), 39 deletions(-) delete mode 100644 app/views/purchases_summary/index.html.orginal.erb diff --git a/app/views/purchases_summary/index.html.erb b/app/views/purchases_summary/index.html.erb index 8ce5e3cf74..4ba5b463d3 100644 --- a/app/views/purchases_summary/index.html.erb +++ b/app/views/purchases_summary/index.html.erb @@ -1,20 +1,20 @@ - <%= render( - "shared/filtered_card", - id: "purchases", - gradient: "secondary", - title: "Purchases", - subtitle: @selected_date_range, - footer_options: { class: "text-center" }, - footer: link_to("See more...", purchases_path), - filter_url: purchases_summary_path - ) do %> - <%= new_button_to new_purchase_path, {text: "New Purchase"} %> -

    <%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %> - spent - <%= @selected_date_range_label %> -

    -
    -

    Recent purchases

    - <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %> -
    - <% end %> +<%= render( + "shared/filtered_card", + id: "purchases", + gradient: "secondary", + title: "Purchases", + subtitle: @selected_date_range, + footer_options: { class: "text-center" }, + footer: link_to("See more...", purchases_path), + filter_url: purchases_summary_path +) do %> + <%= new_button_to new_purchase_path, {text: "New Purchase"} %> +

    <%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %> + spent + <%= @selected_date_range_label %> +

    +
    +

    Recent purchases

    + <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %> +
    +<% end %> diff --git a/app/views/purchases_summary/index.html.orginal.erb b/app/views/purchases_summary/index.html.orginal.erb deleted file mode 100644 index 1dc3fe2387..0000000000 --- a/app/views/purchases_summary/index.html.orginal.erb +++ /dev/null @@ -1,19 +0,0 @@ - <%= render( - "shared/card", - id: "purchases", - gradient: "secondary", - title: "Purchases", - subtitle: @selected_date_range, - footer_options: { class: "text-center" }, - footer: link_to("See more...", purchases_path), - ) do %> - <%= new_button_to new_purchase_path, {text: "New Purchase"} %> -

    <%= dollar_presentation(@purchases.sum(&:amount_spent_in_cents)) %> - spent - <%= @selected_date_range_label %> -

    -
    -

    Recent purchases

    - <%= render partial: "purchase", collection: @recent_purchases, as: :purchase %> -
    - <% end %> From 1ca53e7ac234a527abfc82274292b4da3d484014 Mon Sep 17 00:00:00 2001 From: Rae Stanton Date: Sun, 30 Jul 2023 10:03:31 -0400 Subject: [PATCH 023/122] rm card partial under purchases summary Fixed small issue in render - duplicate partial now removed --- app/views/purchases_summary/_card.html.erb | 76 ---------------------- app/views/shared/_filtered_card.html.erb | 2 +- 2 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 app/views/purchases_summary/_card.html.erb diff --git a/app/views/purchases_summary/_card.html.erb b/app/views/purchases_summary/_card.html.erb deleted file mode 100644 index 2772f635fd..0000000000 --- a/app/views/purchases_summary/_card.html.erb +++ /dev/null @@ -1,76 +0,0 @@ -<% - # Allows locals to be optional - footer ||= nil - footer_div ||= nil - header_div ||= nil - id ||= nil - subtitle ||= nil - title ||= nil - type ||= :box # or :table or :plain - - options ||= {} - options.symbolize_keys! - options[:class] ||= "" - options[:class] += " card" - options[:id] = id if id -%> -<%= content_tag(:div, **options) do %> - <%= - header_div || - begin - gradient ||= "primary" - - header_options ||= {} - header_options.symbolize_keys! - header_options[:class] ||= "" - header_options[:class] += " card-header border-0 bg-gradient-#{gradient}" - - header ||= - begin - title = h title - title += " ".html_safe + content_tag(:small, subtitle) if subtitle - content_tag :h3, title, class: "card-title" - end - - content_tag(:div, **header_options) do %> - <%= header %> -
    - -
    - <% end - end - %> - <% case type.to_sym - when :box %> -
    -
    -
    - <%= yield %> -
    -
    -
    - <% when :plain %> -
    - <%= yield %> -
    - <% when :table %> -
    - <%= yield %> -
    - <% else - raise "Unknown card type: #{type}" - end %> - - <%= - footer_div || - if footer - footer_options ||= {} - footer_options.symbolize_keys! - footer_options[:class] ||= "" - footer_options[:class] += " card-footer" - content_tag(:div, footer, **footer_options) - end - %> -<% end %> diff --git a/app/views/shared/_filtered_card.html.erb b/app/views/shared/_filtered_card.html.erb index 48d681c912..2c3717f721 100644 --- a/app/views/shared/_filtered_card.html.erb +++ b/app/views/shared/_filtered_card.html.erb @@ -19,7 +19,7 @@
    - <%= render("card", + <%= render("shared/card", id: id, gradient: "secondary", title: title, From 27b030983b54962315dcbc20fad7b85ecf0d1104 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sun, 30 Jul 2023 10:09:38 -0400 Subject: [PATCH 024/122] Clean out some minor lint [#3733] --- spec/support/pages/organization_purchases_summary_page.rb | 2 +- spec/system/purchases_summary_system_spec.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/support/pages/organization_purchases_summary_page.rb b/spec/support/pages/organization_purchases_summary_page.rb index 8e11c973fd..727d91960c 100644 --- a/spec/support/pages/organization_purchases_summary_page.rb +++ b/spec/support/pages/organization_purchases_summary_page.rb @@ -23,7 +23,7 @@ def filter_to_date_range(range_name, custom_dates = nil) if custom_dates.present? fill_in :filters_date_range, with: "" fill_in :filters_date_range, with: custom_dates - #clicking on page to ensure date picker closes + # clicking on page to ensure date picker closes page.find(:xpath, "//*[contains(text(),'Recent purchases')]").click end diff --git a/spec/system/purchases_summary_system_spec.rb b/spec/system/purchases_summary_system_spec.rb index a736504bf4..bd68d8e52e 100644 --- a/spec/system/purchases_summary_system_spec.rb +++ b/spec/system/purchases_summary_system_spec.rb @@ -1,5 +1,4 @@ RSpec.describe "Purchases Summary", type: :system, js: true do - attr_reader :new_organization, :org_short_name, :user before do From 1a34dd7081d56cf1ad72003d7898f721a4e4f4f9 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sun, 30 Jul 2023 10:25:43 -0400 Subject: [PATCH 025/122] Move itemized distribution into a standalone report [#3731] --- .../itemized_distributions_controller.rb | 7 ++++ .../_itemized_distributions_partial.html.erb | 21 ----------- app/views/dashboard/index.html.erb | 14 ------- app/views/layouts/_lte_sidebar.html.erb | 5 +++ .../itemized_distributions/index.html.erb | 37 +++++++++++++++++++ config/routes.rb | 1 + .../report_itemized_distributions_spec.rb | 29 +++++++++++++++ 7 files changed, 79 insertions(+), 35 deletions(-) create mode 100644 app/controllers/reports/itemized_distributions_controller.rb delete mode 100644 app/views/dashboard/_itemized_distributions_partial.html.erb create mode 100644 app/views/reports/itemized_distributions/index.html.erb create mode 100644 spec/system/report_itemized_distributions_spec.rb diff --git a/app/controllers/reports/itemized_distributions_controller.rb b/app/controllers/reports/itemized_distributions_controller.rb new file mode 100644 index 0000000000..a1f1e68be1 --- /dev/null +++ b/app/controllers/reports/itemized_distributions_controller.rb @@ -0,0 +1,7 @@ +class Reports::ItemizedDistributionsController < ApplicationController + def index + setup_date_range_picker + distributions = current_organization.distributions.includes(:partner).during(helpers.selected_range) + @itemized_distribution_data = DistributionItemizedBreakdownService.new(organization: current_organization, distribution_ids: distributions.pluck(:id)).fetch + end +end diff --git a/app/views/dashboard/_itemized_distributions_partial.html.erb b/app/views/dashboard/_itemized_distributions_partial.html.erb deleted file mode 100644 index 9d4c6db004..0000000000 --- a/app/views/dashboard/_itemized_distributions_partial.html.erb +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - <% # Ordering from highest distributed to lowest %> - <% (local_assigns[:itemized_breakdown] || []).each do |item| %> - - - - - - - <% end %> - -
       ItemTotal DistributedTotal On Hand
       <%= item[:name] %><%= item[:distributed] %> - <%= item[:current_onhand] || "Unknown" %> -
    diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 0ffc832eb1..49a0ef4cdb 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -165,20 +165,6 @@
    <% end %> - <%= render( - "shared/card", - gradient: "success", - title: "Itemized Distributions", - subtitle: @selected_date_range, - type: :table, - ) do %> -
    - <%= download_button_to(itemized_breakdown_distributions_path(format: :csv, filters: { date_range: date_range_params }), {text: "Export To CSV"}) %> -
    - - <%= render partial: "itemized_distributions_partial", locals: { itemized_breakdown: @itemized_distribution_data } %> - <% end %> - <%= render( "shared/card", gradient: "warning", diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index db53913c3e..4aba0b674a 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -200,6 +200,11 @@ Itemized Donations <% end %>
    • +
  • + <%= link_to(reports_itemized_distributions_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports'])}") do %> + Itemized Distributions + <% end %> +
  • <%= link_to(purchases_summary_path(organization_id: current_user.organization), class: "nav-link #{"active" if current_page?(purchases_summary_path)}") do %> Purchases Summary diff --git a/app/views/reports/itemized_distributions/index.html.erb b/app/views/reports/itemized_distributions/index.html.erb new file mode 100644 index 0000000000..c59e301f9f --- /dev/null +++ b/app/views/reports/itemized_distributions/index.html.erb @@ -0,0 +1,37 @@ +<%= render( + "shared/filtered_card", + id: "purchases", + gradient: "secondary", + title: "Itemized Distributions", + subtitle: @selected_date_range, + type: :table, + filter_url: reports_itemized_distributions_path +) do %> + + <% if @itemized_distribution_data.empty? %> + + <% else %> + + + + + + + + + + <% @itemized_distribution_data.each do |item| %> + + + + + + <% end %> + +
       ItemTotal DistributedTotal On Hand
       <%= item[:name] %><%= item[:distributed] %> + <%= item[:current_onhand] || "Unknown" %> +
    + <% end %> +<% end %> diff --git a/config/routes.rb b/config/routes.rb index f74f745608..7fe65dec5a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -105,6 +105,7 @@ def set_up_flipper post :recalculate, on: :member end resources :itemized_donations, only: [:index] + resources :itemized_distributions, only: [:index] end resources :transfers, only: %i(index create new show destroy) diff --git a/spec/system/report_itemized_distributions_spec.rb b/spec/system/report_itemized_distributions_spec.rb new file mode 100644 index 0000000000..ca51e6b41b --- /dev/null +++ b/spec/system/report_itemized_distributions_spec.rb @@ -0,0 +1,29 @@ +RSpec.describe "Report Itemized Distributions", type: :system, js: true do + context "With an existing essentials bank" do + before do + sign_in(@user) + end + + context "without any distributions" do + it "can load the page" do + visit reports_itemized_distributions_path(@organization) + expect(page).to have_content("Itemized Distributions") + end + + it "has no items" do + visit reports_itemized_distributions_path(@organization) + expect(page).to have_content("No itemized distributions found for the selected date range.") + end + end + + context "with a distribution" do + let(:distribution) { create(:distribution, :with_items, organization: @organization) } + + it "Shows an item from the distribution" do + distribution + visit reports_itemized_distributions_path(@organization) + expect(page).to have_content(distribution.items.first.name) + end + end + end +end From 48d0ebbaae0fdaaebafd3a1ae9dfbc2f658db50e Mon Sep 17 00:00:00 2001 From: "Howard M. Miller" Date: Sun, 30 Jul 2023 09:40:55 -0400 Subject: [PATCH 026/122] add a partners approval table to the dashboard --- app/controllers/dashboard_controller.rb | 1 + app/views/dashboard/index.html.erb | 35 ++++++++++++- spec/factories/partners/profile.rb | 2 + .../pages/organization_dashboard_page.rb | 8 +++ spec/system/dashboard_system_spec.rb | 51 +++++++++++++++++++ 5 files changed, 96 insertions(+), 1 deletion(-) diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 54706f9afc..28e34280cb 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -25,6 +25,7 @@ def index @distribution_data = helpers.received_distributed_data(helpers.selected_range) + @partners_awaiting_review = current_organization.partners.awaiting_review # passing nil here filters the announcements that didn't come from an organization @broadcast_announcements = BroadcastAnnouncement.filter_announcements(nil) diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 49a0ef4cdb..b71f87b35c 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -211,7 +211,40 @@
    • - + <%= render( + "shared/card", + id: "partner_approvals", + title: "Partner Approvals", + class: "wide-table", + type: @partners_awaiting_review.blank? ? :box : :table + ) do %> + <% if @partners_awaiting_review.present? %> + + + + + + + + + + + <% @partners_awaiting_review.each do |partner| %> + + + + + + + + <%end%> +
    Partner NamePrimary Contact NamePrimary Contact EmailReview RequestedAction
    <%= partner.name %><%= partner.profile.primary_contact_name %><%= partner.profile.primary_contact_email %><%= partner.updated_at.strftime("%B %d %Y") %> + <%= view_button_to partner_path(partner) + "#partner-information", { text: "Review Application", icon: "check", type: "warning", class: 'badge' } %> +
    + <% else %> + No partners waiting for approval + <% end %> + <% end %> <%= render( "shared/card", id: "donations", diff --git a/spec/factories/partners/profile.rb b/spec/factories/partners/profile.rb index 396787bc57..292100cb50 100644 --- a/spec/factories/partners/profile.rb +++ b/spec/factories/partners/profile.rb @@ -3,5 +3,7 @@ partner { Partner.first || create(:partner) } essentials_bank_id { Organization.try(:first).id || create(:organization).id } website { "http://some-site.org" } + primary_contact_email { Faker::Internet.email } + primary_contact_name { Faker::Name.name } end end diff --git a/spec/support/pages/organization_dashboard_page.rb b/spec/support/pages/organization_dashboard_page.rb index bc1c9003c9..186079fb9d 100644 --- a/spec/support/pages/organization_dashboard_page.rb +++ b/spec/support/pages/organization_dashboard_page.rb @@ -172,6 +172,14 @@ def outstanding_requests_link end end + def has_partner_approvals_section? + has_selector? "#partner_approvals.card" + end + + def partner_approvals_section + find "#partner_approvals.card" + end + private def product_drives_section diff --git a/spec/system/dashboard_system_spec.rb b/spec/system/dashboard_system_spec.rb index 5febe48201..022f9d250d 100644 --- a/spec/system/dashboard_system_spec.rb +++ b/spec/system/dashboard_system_spec.rb @@ -786,6 +786,57 @@ def create_next_product_drive_distribution(date_picker:) end end end + + describe "Partner Approvals" do + it "has a card" do + org_dashboard_page.visit + expect(org_dashboard_page).to have_partner_approvals_section + end + + context "when empty" do + it "displays a message" do + org_dashboard_page.visit + expect(org_dashboard_page.partner_approvals_section).to have_content "No partners waiting for approval" + end + end + + context "with no awaiting partners" do + let!(:partner) { create :partner, :approved } + + it "still displays the simple message" do + org_dashboard_page.visit + expect(org_dashboard_page.partner_approvals_section).to have_content "No partners waiting for approval" + end + end + + context "with awaiting partners" do + let!(:org) { create :organization } + let!(:user) { create :user, organization: org } + let!(:partner_to_see1) { create :partner, status: :awaiting_review, organization: org } + let!(:partner_to_see2) { create :partner, status: :awaiting_review, organization: org } + let!(:partner_hidden1) { create :partner, status: :approved, organization: org } + let!(:partner_hidden2) { create :partner, status: :invited, organization: org } + + it "only displays awaiting partners" do + sign_in user + org_dashboard_page.visit + within(org_dashboard_page.partner_approvals_section) do + [partner_to_see1, partner_to_see2].each do |partner| + expect(page).to have_content partner.name + expect(page).to have_content partner.profile.primary_contact_email + expect(page).to have_content partner.profile.primary_contact_name + expect(page).to have_link "Review Application", href: partner_path(organization_id: org, id: partner) + "#partner-information" + end + [partner_hidden1, partner_hidden2].each do |hidden_partner| + expect(page).to_not have_content hidden_partner.name + expect(page).to_not have_content hidden_partner.profile.primary_contact_email + expect(page).to_not have_content hidden_partner.profile.primary_contact_name + expect(page).to_not have_link "Review Application", href: partner_path(organization_id: org, id: hidden_partner) + "#partner-information" + end + end + end + end + end end def valid_bracketing_dates(date_range_info) From 5ed4e7e8d0e2da9a8c38c8d22db6659cec070607 Mon Sep 17 00:00:00 2001 From: Rae Stanton Date: Sun, 30 Jul 2023 11:18:24 -0400 Subject: [PATCH 027/122] Distributions summary Fixes issue #3723 Changes made: This creates a new area for distributions summary to live under audits, adds system, page, and request spec for testing. sidebar - we also fixed the weird issue with the sidebar for the annual reports, distributions by county, and itemized donations & distributions that were not staying selected. --- app/controllers/dashboard_controller.rb | 3 - .../distributions_summary_controller.rb | 8 + app/views/dashboard/index.html.erb | 24 --- .../_distribution.html.erb | 0 .../distributions_summary/index.html.erb | 24 +++ app/views/layouts/_lte_sidebar.html.erb | 25 +-- config/routes.rb | 1 + .../distributions_summary_requests_spec.rb | 25 +++ .../pages/organization_dashboard_page.rb | 30 ---- ...organization_distributions_summary_page.rb | 62 +++++++ spec/system/dashboard_system_spec.rb | 125 -------------- .../distributions_summary_system_spec.rb | 155 ++++++++++++++++++ 12 files changed, 290 insertions(+), 192 deletions(-) create mode 100644 app/controllers/distributions_summary_controller.rb rename app/views/{dashboard => distributions_summary}/_distribution.html.erb (100%) create mode 100644 app/views/distributions_summary/index.html.erb create mode 100644 spec/requests/distributions_summary_requests_spec.rb create mode 100644 spec/support/pages/organization_distributions_summary_page.rb create mode 100644 spec/system/distributions_summary_system_spec.rb diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 28e34280cb..11bfb2eff4 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -9,9 +9,6 @@ def index @recent_donations = @donations.recent distributions = current_organization.distributions.includes(:partner).during(helpers.selected_range) - @recent_distributions = distributions.recent - - @itemized_donation_data = DonationItemizedBreakdownService.new(organization: current_organization, donation_ids: @donations.pluck(:id)).fetch @itemized_distribution_data = DistributionItemizedBreakdownService.new(organization: current_organization, distribution_ids: distributions.pluck(:id)).fetch @total_inventory = current_organization.total_inventory diff --git a/app/controllers/distributions_summary_controller.rb b/app/controllers/distributions_summary_controller.rb new file mode 100644 index 0000000000..c956f8e50c --- /dev/null +++ b/app/controllers/distributions_summary_controller.rb @@ -0,0 +1,8 @@ +class DistributionsSummaryController < ApplicationController + def index + setup_date_range_picker + + distributions = current_organization.distributions.includes(:partner).during(helpers.selected_range) + @recent_distributions = distributions.recent + end +end diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index b71f87b35c..34d10dc04d 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -141,30 +141,6 @@ end %> - <%= render( - "shared/card", - id: "distributions", - gradient: "info", - title: "Distributions", - subtitle: @selected_date_range, - footer: link_to("See more...", distributions_path), - footer_options: { class: "text-center" }, - ) do %> - <%= new_button_to new_distribution_path, {text: "New Distribution"} %> - -

    - - <%= total_distributed %> - - items distributed <%= @selected_date_range_label %> -

    -

    (<%= future_distributed %> items scheduled for future distribution)

    -
    -

    Recent distributions

    - <%= render partial: "distribution", collection: @recent_distributions, as: :distribution %> -
    - <% end %> - <%= render( "shared/card", gradient: "warning", diff --git a/app/views/dashboard/_distribution.html.erb b/app/views/distributions_summary/_distribution.html.erb similarity index 100% rename from app/views/dashboard/_distribution.html.erb rename to app/views/distributions_summary/_distribution.html.erb diff --git a/app/views/distributions_summary/index.html.erb b/app/views/distributions_summary/index.html.erb new file mode 100644 index 0000000000..38daa0fb5d --- /dev/null +++ b/app/views/distributions_summary/index.html.erb @@ -0,0 +1,24 @@ +<%= render( + "shared/filtered_card", + id: "distributions", + gradient: "secondary", + title: "Distributions", + subtitle: @selected_date_range, + footer_options: { class: "text-center" }, + footer: link_to("See more...", distributions_path), + filter_url: distributions_summary_path +) do %> + <%= new_button_to new_distribution_path, {text: "New Distribution"} %> + +

    + + <%= total_distributed %> + + items distributed <%= @selected_date_range_label %> +

    +

    (<%= future_distributed %> items scheduled for future distribution)

    +
    +

    Recent distributions

    + <%= render partial: "distribution", collection: @recent_distributions, as: :distribution %> +
    +<% end %> diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 4aba0b674a..5f3a3a89bc 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -170,8 +170,8 @@ -
  • "> - "> +
  • "> + ">

    Reporting & Auditing @@ -185,23 +185,23 @@ <% end %>

    • <% end %> -
  • - <%= link_to(reports_annual_reports_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports'])}") do %> +
  • + <%= link_to(reports_annual_reports_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/annual_reports'])}") do %> Annual Survey <% end %>
    • -
  • - <%= link_to(distributions_by_county_report_path(filters: { date_range: date_range_params }), class: "nav-link #{active_class(['reports'])}") do %> +
  • + <%= link_to(distributions_by_county_report_path(filters: { date_range: date_range_params }), class: "nav-link #{active_class(['distributions_by_county'])}") do %> Distributions by County <% end %>
    • -
  • - <%= link_to(reports_itemized_donations_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports'])}") do %> +
  • + <%= link_to(reports_itemized_donations_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/itemized_donations'])}") do %> Itemized Donations <% end %>
    • -
  • - <%= link_to(reports_itemized_distributions_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports'])}") do %> +
  • + <%= link_to(reports_itemized_distributions_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/itemized_distributions'])}") do %> Itemized Distributions <% end %>
    • @@ -210,6 +210,11 @@ Purchases Summary <% end %> +
  • + <%= link_to(distributions_summary_path(organization_id: current_user.organization), class: "nav-link #{"active" if current_page?(distributions_summary_path)}") do %> + Distributions Summary + <% end %> +
  • diff --git a/config/routes.rb b/config/routes.rb index 7fe65dec5a..20f41925d6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -219,6 +219,7 @@ def set_up_flipper get "historical_trends/purchases", to: "historical_trends/purchases#index" get "historical_trends/donations", to: "historical_trends/donations#index" get "purchases_summary", to: "purchases_summary#index" + get "distributions_summary", to: "distributions_summary#index" end resources :attachments, only: %i(destroy) diff --git a/spec/requests/distributions_summary_requests_spec.rb b/spec/requests/distributions_summary_requests_spec.rb new file mode 100644 index 0000000000..9f71e3ef13 --- /dev/null +++ b/spec/requests/distributions_summary_requests_spec.rb @@ -0,0 +1,25 @@ +require "rails_helper" + +RSpec.describe "Distributions", type: :request do + context "while signed in" do + before do + sign_in(@user) + end + + describe "GET #index" do + it "shows a list of recent distributions" do + get distributions_summary_path(@user.organization) + expect(response.body).to include("Recent distributions") + end + end + end + + context "while not signed in" do + describe "GET #index" do + it "redirects user to sign in page" do + get distributions_summary_path(@user.organization) + expect(response).to redirect_to(new_user_session_path) + end + end + end +end diff --git a/spec/support/pages/organization_dashboard_page.rb b/spec/support/pages/organization_dashboard_page.rb index 186079fb9d..1178c6792b 100644 --- a/spec/support/pages/organization_dashboard_page.rb +++ b/spec/support/pages/organization_dashboard_page.rb @@ -6,12 +6,6 @@ def org_page_path "dashboard" end - def create_new_distribution - within distributions_section do - click_link "New Distribution" - end - end - def create_new_donation within donations_section do click_link "New Donation" @@ -62,10 +56,6 @@ def has_product_drives_section? has_selector? product_drives_selector end - def has_distributions_section? - has_selector? distributions_section_selector - end - def has_getting_started_guide? has_selector? "#getting-started-guide" end @@ -106,12 +96,6 @@ def recent_product_drive_donation_links end end - def recent_distribution_links - within distributions_section do - all(".distribution a").map(&:text) - end - end - def recent_donation_links within donations_section do all(".donation a").map(&:text) @@ -138,12 +122,6 @@ def summary_section find "#summary" end - def total_distributed - within distributions_section do - parse_formatted_integer find(".total_distributed").text - end - end - def total_donations within donations_section do parse_formatted_integer find(".total_received_donations").text @@ -190,14 +168,6 @@ def product_drives_selector "#product_drives" end - def distributions_section_selector - "#distributions" - end - - def distributions_section - find distributions_section_selector - end - def donations_section find "#donations" end diff --git a/spec/support/pages/organization_distributions_summary_page.rb b/spec/support/pages/organization_distributions_summary_page.rb new file mode 100644 index 0000000000..3e87fc589c --- /dev/null +++ b/spec/support/pages/organization_distributions_summary_page.rb @@ -0,0 +1,62 @@ +require_relative "organization_page" + +class OrganizationDistributionsSummaryPage < OrganizationPage + def org_page_path + "distributions_summary" + end + + def total_distributed + within distributions_section do + parse_formatted_integer find(".total_distributed").text + end + end + + def filter_to_date_range(range_name, custom_dates = nil) + select_date_filter_range range_name + + if custom_dates.present? + fill_in :filters_date_range, with: "" + fill_in :filters_date_range, with: custom_dates + # clicking on page to ensure date picker closes + page.find(:xpath, "//*[contains(text(),'Recent distributions')]").click + end + + click_on "Filter" + end + + def recent_distribution_links + within distributions_section do + all(".distribution a").map(&:text) + end + end + + def has_distributions_section? + has_selector? distributions_section_selector + end + + def create_new_distribution + within distributions_section do + click_link "New Distribution" + end + end + + private + + def select_date_filter_range(range_name) + find("#filters_date_range").click + + if range_name + within ".container__predefined-ranges" do + find("button", text: range_name).click + end + end + end + + def distributions_section + find distributions_section_selector + end + + def distributions_section_selector + "#distributions" + end +end diff --git a/spec/system/dashboard_system_spec.rb b/spec/system/dashboard_system_spec.rb index 022f9d250d..462bf2a70d 100644 --- a/spec/system/dashboard_system_spec.rb +++ b/spec/system/dashboard_system_spec.rb @@ -571,131 +571,6 @@ def create_next_manufacturer_donation(manufacturer:, donation_date:) end end - describe "Distributions" do - around do |example| - travel_to(test_time) - example.run - travel_back - end - - it "has a link to create a new distribution" do - org_new_distribution_page = OrganizationNewDistributionPage.new org_short_name: org_short_name - - expect(org_dashboard_page.visit).to have_distributions_section - - expect { org_dashboard_page.create_new_distribution } - .to change { page.current_path } - .to org_new_distribution_page.path - end - - # as of 28 Jan 2022, the "Recent Donations" list shows up to this many items matching the date filter - max_recent_distribution_links_count = 3 - - # Make up to this many (inclusive) donations for each filtered period - # Keep it below (item_quantities.size - 1) so there's at least 2 values left for - # Donations outside of the filtered period - max_distributions_in_filtered_period = max_recent_distribution_links_count + 1 - - [ - # rubocop:disable Layout/ExtraSpacing, Layout/SpaceAroundOperators - ["Today", test_time, test_time], - ["Yesterday", test_time.yesterday, test_time.yesterday], - ["Last 7 Days", test_time - 6.days, test_time], - ["Last 30 Days", test_time - 29.days, test_time], - ["This Month", test_time.beginning_of_month, test_time.end_of_month], - ["Last Month", test_time.last_month.beginning_of_month, test_time.last_month.end_of_month], - ["This Year", test_time.beginning_of_year, test_time.end_of_year], - ["All Time", Time.zone.parse("2000-01-01"), test_time], - [nil, test_time - 2.years, test_time - rand(180).days, :set_custom_dates] # arbitrary values - # rubocop:enable Layout/ExtraSpacing, Layout/SpaceAroundOperators - ].each do |date_range_info| - filtered_date_range_label, start_date, end_date, set_custom_dates = date_range_info - - filtered_date_range = start_date.to_date..end_date.to_date - before_filtered_date_range = start_date.yesterday.to_date - after_filtered_date_range = end_date.tomorrow.to_date - - start_date_formatted, end_date_formatted = [start_date, end_date].map { _1.to_formatted_s(:date_picker) } - - # Ideally different date ranges get different counts (incl. 0!) to test the various combinations - # w/out making a fixed pattern - num_distributions_in_filtered_period = rand(0..max_distributions_in_filtered_period) - - context "given 1 Distribution on #{before_filtered_date_range} (unless 'All Time'), " \ - "#{num_distributions_in_filtered_period} during #{filtered_date_range}, and " \ - "1 on #{after_filtered_date_range}" do - custom_dates = if set_custom_dates - "#{start_date_formatted} - #{end_date_formatted}" - end - - before do - filtered_dates = filtered_date_range.to_a - - @item_quantity = item_quantities.to_enum - - # Create some number of Partners - # Keep local copy of names so examples can create expected values - # without relying on fetching info from production code - @partners = (1..rand(2..5)).map do - name = "Partner #{_1}" - OpenStruct.new name: name, partner: create(:partner, name: name, organization: @organization) - end - - def create_next_product_drive_distribution(date_picker:) - quantity_in_distribution = @item_quantity.next - partner = @partners.sample - - create :distribution, :with_items, partner: partner.partner, issued_at: date_picker, item_quantity: quantity_in_distribution, storage_location: storage_location, organization: @organization - - OpenStruct.new partner_name: partner.name, quantity: quantity_in_distribution - end - - # days_this_year.sample in num_distributions_in_filtered_period.times loop - # rather than - # days_this_year.sample(num_distributions_in_filtered_period).each - # because Array#sample(n) on an Array with m Date: Sun, 30 Jul 2023 12:47:55 -0400 Subject: [PATCH 028/122] Clean out some lint! [#3723] --- spec/system/distributions_summary_system_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/system/distributions_summary_system_spec.rb b/spec/system/distributions_summary_system_spec.rb index 886e63e9b8..d135777bd6 100644 --- a/spec/system/distributions_summary_system_spec.rb +++ b/spec/system/distributions_summary_system_spec.rb @@ -1,7 +1,6 @@ require "rails_helper" RSpec.describe "Distributions Summary", type: :system, js: true do - test_time = Time.zone.now before do From 60a0515bab828adee342051ebb220004ff6df538 Mon Sep 17 00:00:00 2001 From: ChaelCodes Date: Sun, 30 Jul 2023 14:08:23 +0000 Subject: [PATCH 029/122] Extract all helper methods related to donations into a DonationsHelper. --- app/helpers/dashboard_helper.rb | 24 ------------------------ app/helpers/donations_helper.rb | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 app/helpers/donations_helper.rb diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb index f5e34473ba..a2909f7c1a 100644 --- a/app/helpers/dashboard_helper.rb +++ b/app/helpers/dashboard_helper.rb @@ -12,22 +12,6 @@ def total_on_hand(total = nil) number_with_delimiter(total || "-1") end - def total_received_money_donations(range = selected_range) - current_organization.donations.during(range).sum { |d| d.money_raised || 0 } - end - - def total_received_money_donations_from_product_drives(range: selected_range) - current_organization.donations.by_source(:product_drive).during(range).sum { |d| d.money_raised || 0 } - end - - def total_received_donations(range = selected_range) - number_with_delimiter total_received_donations_unformatted(range) - end - - def total_received_from_product_drives(range = selected_range) - number_with_delimiter total_received_from_product_drives_unformatted(range) - end - def total_purchased(range = selected_range) number_with_delimiter total_purchased_unformatted(range) end @@ -46,14 +30,6 @@ def recently_added_user_display_text(user) private - def total_received_donations_unformatted(range = selected_range) - LineItem.active.where(itemizable: current_organization.donations.during(range)).sum(:quantity) - end - - 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 total_purchased_unformatted(range = selected_range) LineItem.active.where(itemizable: current_organization.purchases.during(range)).sum(:quantity) end diff --git a/app/helpers/donations_helper.rb b/app/helpers/donations_helper.rb new file mode 100644 index 0000000000..7082e7ccf0 --- /dev/null +++ b/app/helpers/donations_helper.rb @@ -0,0 +1,28 @@ +# Encapsulates business logic related to displaying Donations +module DonationsHelper + def total_received_donations(range = selected_range) + number_with_delimiter total_received_donations_unformatted(range) + end + + def total_received_money_donations(range = selected_range) + current_organization.donations.during(range).sum { |d| d.money_raised || 0 } + end + + def total_received_money_donations_from_product_drives(range: selected_range) + current_organization.donations.by_source(:product_drive).during(range).sum { |d| d.money_raised || 0 } + end + + def total_received_from_product_drives(range = selected_range) + number_with_delimiter total_received_from_product_drives_unformatted(range) + end + + private + + def total_received_donations_unformatted(range = selected_range) + LineItem.active.where(itemizable: current_organization.donations.during(range)).sum(:quantity) + end + + 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 +end \ No newline at end of file From d3098fe1eee348f911574ac6ef19c664662c5780 Mon Sep 17 00:00:00 2001 From: ChaelCodes Date: Sun, 30 Jul 2023 14:16:04 +0000 Subject: [PATCH 030/122] Migrate Donations Summary (All Sources) from the Dashboard to Reporting Create new route/controller for Reports::DonationsSummary that presents all information that was previously available on the Dashboard under Reporting & Auditing instead. --- .../reports/donations_summary_controller.rb | 8 ++ app/views/dashboard/index.html.erb | 25 ---- app/views/layouts/_lte_sidebar.html.erb | 5 + .../donations_summary}/_donation.html.erb | 0 .../reports/donations_summary/index.html.erb | 27 ++++ config/routes.rb | 1 + .../reports/donations_summary_spec.rb | 36 ++++++ spec/system/donation_system_spec.rb | 118 ++++++++++++++++++ 8 files changed, 195 insertions(+), 25 deletions(-) create mode 100644 app/controllers/reports/donations_summary_controller.rb rename app/views/{dashboard => reports/donations_summary}/_donation.html.erb (100%) create mode 100644 app/views/reports/donations_summary/index.html.erb create mode 100644 spec/requests/reports/donations_summary_spec.rb diff --git a/app/controllers/reports/donations_summary_controller.rb b/app/controllers/reports/donations_summary_controller.rb new file mode 100644 index 0000000000..692916bc50 --- /dev/null +++ b/app/controllers/reports/donations_summary_controller.rb @@ -0,0 +1,8 @@ +class Reports::DonationsSummaryController < ApplicationController + def index + setup_date_range_picker + + @donations = current_organization.donations.during(helpers.selected_range) + @recent_donations = @donations.recent + end +end diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 34d10dc04d..c9ecd31a11 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -221,31 +221,6 @@ No partners waiting for approval <% end %> <% end %> - <%= render( - "shared/card", - id: "donations", - title: "Donations (All Sources)", - subtitle: @selected_date_range, - footer_options: { class: "text-center" }, - footer: link_to("See more...", donations_path), - ) do %> - <%= new_button_to new_donation_path, {text: "New Donation"} %> -

    - - <%= total_received_donations %> - - items - received <%= @selected_date_range_label %> -

    -

    - <%= dollar_presentation(total_received_money_donations) %> - raised <%= @selected_date_range_label %> -

    -
    -

    Recent Donations

    - <%= render partial: "donation", collection: @recent_donations, as: :donation %> -
    - <% end %> <%= render( "shared/card", diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 5f3a3a89bc..bb680fb56a 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -205,6 +205,11 @@ Itemized Distributions <% end %>
    • +
  • + <%= link_to(donations_path(organization_id: current_user.organization, action: "summary"), class: "nav-link #{active_class(['reports'])}") do %> + Donations Summary + <% end %> +
  • <%= link_to(purchases_summary_path(organization_id: current_user.organization), class: "nav-link #{"active" if current_page?(purchases_summary_path)}") do %> Purchases Summary diff --git a/app/views/dashboard/_donation.html.erb b/app/views/reports/donations_summary/_donation.html.erb similarity index 100% rename from app/views/dashboard/_donation.html.erb rename to app/views/reports/donations_summary/_donation.html.erb diff --git a/app/views/reports/donations_summary/index.html.erb b/app/views/reports/donations_summary/index.html.erb new file mode 100644 index 0000000000..ac3c2ca6c1 --- /dev/null +++ b/app/views/reports/donations_summary/index.html.erb @@ -0,0 +1,27 @@ + <%= render( + "shared/filtered_card", + id: "donations", + title: "Donations (All Sources)", + subtitle: @selected_date_range, + footer_options: { class: "text-center" }, + footer: link_to("See more...", donations_path), + filter_url: reports_donations_summary_index_path + ) do %> + <%= new_button_to new_donation_path, {text: "New Donation"} %> +

    + + <%= total_received_donations %> + + items + received <%= @selected_date_range_label %> +

    +

    + <%= dollar_presentation(total_received_money_donations) %> + raised <%= @selected_date_range_label %> +

    +
    +

    Recent Donations

    + <%= render partial: "reports/donations_summary/donation", collection: @recent_donations, as: :donation %> +
    + <% end %> + diff --git a/config/routes.rb b/config/routes.rb index 20f41925d6..0facded37f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -104,6 +104,7 @@ def set_up_flipper resources :annual_reports, only: [:index, :show], param: :year do post :recalculate, on: :member end + resources :donations_summary, only: [:index] resources :itemized_donations, only: [:index] resources :itemized_distributions, only: [:index] end diff --git a/spec/requests/reports/donations_summary_spec.rb b/spec/requests/reports/donations_summary_spec.rb new file mode 100644 index 0000000000..f6810db25d --- /dev/null +++ b/spec/requests/reports/donations_summary_spec.rb @@ -0,0 +1,36 @@ +require 'rails_helper' + +RSpec.describe "Reports::DonationsSummary", type: :request do + let(:default_params) do + { organization_id: @organization.to_param } + end + + describe "while signed in" do + before do + sign_in @user + end + + describe "GET #index" do + subject do + get reports_donations_summary_index_path(default_params.merge(format: response_format)) + response + end + let(:response_format) { 'html' } + + it { is_expected.to have_http_status(:success) } + end + end + + describe "while not signed in" do + describe "GET /index" do + subject do + get reports_donations_summary_index_path(default_params) + response + end + + it "redirect to login" do + is_expected.to redirect_to(new_user_session_path) + end + end + end +end diff --git a/spec/system/donation_system_spec.rb b/spec/system/donation_system_spec.rb index 85baacb78d..002d3762d4 100644 --- a/spec/system/donation_system_spec.rb +++ b/spec/system/donation_system_spec.rb @@ -638,6 +638,124 @@ end end end + + context "when visiting the summary page" do + it "has a link to create a new donation" do + org_new_donation_page = OrganizationNewDonationPage.new org_short_name: org_short_name + + org_dashboard_page.visit + + expect { org_dashboard_page.create_new_donation } + .to change { page.current_path } + .to org_new_donation_page.path + end + + # as of 28 Jan 2022, the "Recent Donations" list shows up to this many items matching the date filter + max_recent_donation_links_count = 3 + + # Make up to this many (inclusive) donations for each filtered period + # Keep it below (item_quantities.size - 1) so there's at least 2 values left for + # Donations outside of the filtered period + max_donations_in_filtered_period = max_recent_donation_links_count + 1 + + around do |example| + # Ensure "today" doesn't change for the server side during the example run + # Note, however, that this does *not* affect the client side + # So "today" for the server still might be "yesterday" + # —possibly even "last month" or "last year"- + # for the client + # Rely on rerun via rspec-retry for those edge cases + travel_to(test_time) + example.run + travel_back + end + + [ + # rubocop:disable Layout/ExtraSpacing, Layout/SpaceAroundOperators + [nil, test_time - 2.years, test_time - rand(180).days, :set_custom_dates], # arbitrary values + ["Today", test_time, test_time], + ["Yesterday", test_time.yesterday, test_time.yesterday], + ["Last 7 Days", test_time - 6.days, test_time], + ["Last 30 Days", test_time - 29.days, test_time], + ["This Month", test_time.beginning_of_month, test_time.end_of_month], + ["Last Month", test_time.last_month.beginning_of_month, test_time.last_month.end_of_month], + ["This Year", test_time.beginning_of_year, test_time.end_of_year] + # We now can't test the lower limit of All Time, because the earliest possible date is 2000-01-01 + # ["All Time", test_time - 100.years, test_time] + # rubocop:enable Layout/ExtraSpacing, Layout/SpaceAroundOperators + ].each do |date_range_info| + filtered_date_range_label, start_date, end_date, set_custom_dates = date_range_info + + filtered_date_range = start_date.to_date..end_date.to_date + before_filtered_date_range = start_date.yesterday.to_date + after_filtered_date_range = end_date.tomorrow.to_date + + start_date_formatted, end_date_formatted = [start_date, end_date].map { _1.to_formatted_s(:date_picker) } + + # Ideally different date ranges get different counts (incl. 0!) to test the various combinations + # w/out making a fixed pattern + num_donations_in_filtered_period = rand(0..max_donations_in_filtered_period) + + context "given 1 Donation on #{before_filtered_date_range} (only if a valid date), " \ + "#{num_donations_in_filtered_period} during #{filtered_date_range}, and " \ + "1 on #{after_filtered_date_range}" do + custom_dates = if set_custom_dates + "#{start_date_formatted} - #{end_date_formatted}" + end + + before do + filtered_dates = filtered_date_range.to_a + @quantities_donated_in_filtered_date_range = [] + + @item_quantity = item_quantities.to_enum + + def create_next_donation(donation_date:) + quantity_in_donation = @item_quantity.next + create :donation, :with_items, issued_at: donation_date, item_quantity: quantity_in_donation, storage_location: storage_location, organization: @organization + + quantity_in_donation + end + + # days_this_year.sample in num_donations_in_filtered_period.times loop + # rather than + # days_this_year.sample(num_donations_in_filtered_period).each + # because Array#sample(n) on an Array with m Date: Thu, 3 Aug 2023 16:43:41 +0000 Subject: [PATCH 031/122] Fix active styling for Reporting & Auditing in the sidebar. Reporting & Auditing was not expanding for most of the navigation items in the list. In addition, the currently selected report was not highlighted. active_class and menu_open? now check if the listed path is in the controller_path instead of doing an exact match on controller_path. In addition, the report nav items have been updated to reference their own path, so all reports aren't listed as active when one is selected. --- app/helpers/application_helper.rb | 4 ++-- app/views/layouts/_lte_sidebar.html.erb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index cb0a15ca7f..f234be0bc5 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -15,11 +15,11 @@ def default_title_content end def active_class(name) - name.include?(controller_path) ? "active" : controller_path + name.any? { |path_name| controller_path.include? path_name } ? "active" : controller_path end def menu_open?(name) - name.include?(controller_path) ? 'menu-open' : '' + name.any? { |path_name| controller_path.include? path_name } ? 'menu-open' : '' end def can_administrate? diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index bb680fb56a..749653a8fa 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -170,8 +170,8 @@
    • -
  • "> - "> +
  • "> + ">

    Reporting & Auditing @@ -206,7 +206,7 @@ <% end %>

  • - <%= link_to(donations_path(organization_id: current_user.organization, action: "summary"), class: "nav-link #{active_class(['reports'])}") do %> + <%= link_to(reports_donations_summary_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/donations_summary'])}") do %> Donations Summary <% end %>
    • From 1dd2d537244ce8eefd336e43bf460764057a4966 Mon Sep 17 00:00:00 2001 From: Rachael Wright-Munn Date: Thu, 3 Aug 2023 20:36:24 +0000 Subject: [PATCH 032/122] Working System Spec --- .../reports/donations_summary/index.html.erb | 52 +++--- spec/system/donation_system_spec.rb | 118 ------------- spec/system/reports/donations_summary_spec.rb | 166 ++++++++++++++++++ 3 files changed, 192 insertions(+), 144 deletions(-) create mode 100644 spec/system/reports/donations_summary_spec.rb diff --git a/app/views/reports/donations_summary/index.html.erb b/app/views/reports/donations_summary/index.html.erb index ac3c2ca6c1..4343938bfd 100644 --- a/app/views/reports/donations_summary/index.html.erb +++ b/app/views/reports/donations_summary/index.html.erb @@ -1,27 +1,27 @@ - <%= render( - "shared/filtered_card", - id: "donations", - title: "Donations (All Sources)", - subtitle: @selected_date_range, - footer_options: { class: "text-center" }, - footer: link_to("See more...", donations_path), - filter_url: reports_donations_summary_index_path - ) do %> - <%= new_button_to new_donation_path, {text: "New Donation"} %> -

    - - <%= total_received_donations %> - - items - received <%= @selected_date_range_label %> -

    -

    - <%= dollar_presentation(total_received_money_donations) %> - raised <%= @selected_date_range_label %> -

    -
    -

    Recent Donations

    - <%= render partial: "reports/donations_summary/donation", collection: @recent_donations, as: :donation %> -
    - <% end %> +<%= render( + "shared/filtered_card", + id: "donations", + title: "Donations (All Sources)", + subtitle: @selected_date_range, + footer_options: { class: "text-center" }, + footer: link_to("See more...", donations_path), + filter_url: reports_donations_summary_index_path +) do %> + <%= new_button_to new_donation_path, {text: "New Donation"} %> +

    + + <%= total_received_donations %> + + items + received <%= @selected_date_range_label %> +

    +

    + <%= dollar_presentation(total_received_money_donations) %> + raised <%= @selected_date_range_label %> +

    +
    +

    Recent Donations

    + <%= render partial: "reports/donations_summary/donation", collection: @recent_donations, as: :donation %> +
    +<% end %> diff --git a/spec/system/donation_system_spec.rb b/spec/system/donation_system_spec.rb index 002d3762d4..85baacb78d 100644 --- a/spec/system/donation_system_spec.rb +++ b/spec/system/donation_system_spec.rb @@ -638,124 +638,6 @@ end end end - - context "when visiting the summary page" do - it "has a link to create a new donation" do - org_new_donation_page = OrganizationNewDonationPage.new org_short_name: org_short_name - - org_dashboard_page.visit - - expect { org_dashboard_page.create_new_donation } - .to change { page.current_path } - .to org_new_donation_page.path - end - - # as of 28 Jan 2022, the "Recent Donations" list shows up to this many items matching the date filter - max_recent_donation_links_count = 3 - - # Make up to this many (inclusive) donations for each filtered period - # Keep it below (item_quantities.size - 1) so there's at least 2 values left for - # Donations outside of the filtered period - max_donations_in_filtered_period = max_recent_donation_links_count + 1 - - around do |example| - # Ensure "today" doesn't change for the server side during the example run - # Note, however, that this does *not* affect the client side - # So "today" for the server still might be "yesterday" - # —possibly even "last month" or "last year"- - # for the client - # Rely on rerun via rspec-retry for those edge cases - travel_to(test_time) - example.run - travel_back - end - - [ - # rubocop:disable Layout/ExtraSpacing, Layout/SpaceAroundOperators - [nil, test_time - 2.years, test_time - rand(180).days, :set_custom_dates], # arbitrary values - ["Today", test_time, test_time], - ["Yesterday", test_time.yesterday, test_time.yesterday], - ["Last 7 Days", test_time - 6.days, test_time], - ["Last 30 Days", test_time - 29.days, test_time], - ["This Month", test_time.beginning_of_month, test_time.end_of_month], - ["Last Month", test_time.last_month.beginning_of_month, test_time.last_month.end_of_month], - ["This Year", test_time.beginning_of_year, test_time.end_of_year] - # We now can't test the lower limit of All Time, because the earliest possible date is 2000-01-01 - # ["All Time", test_time - 100.years, test_time] - # rubocop:enable Layout/ExtraSpacing, Layout/SpaceAroundOperators - ].each do |date_range_info| - filtered_date_range_label, start_date, end_date, set_custom_dates = date_range_info - - filtered_date_range = start_date.to_date..end_date.to_date - before_filtered_date_range = start_date.yesterday.to_date - after_filtered_date_range = end_date.tomorrow.to_date - - start_date_formatted, end_date_formatted = [start_date, end_date].map { _1.to_formatted_s(:date_picker) } - - # Ideally different date ranges get different counts (incl. 0!) to test the various combinations - # w/out making a fixed pattern - num_donations_in_filtered_period = rand(0..max_donations_in_filtered_period) - - context "given 1 Donation on #{before_filtered_date_range} (only if a valid date), " \ - "#{num_donations_in_filtered_period} during #{filtered_date_range}, and " \ - "1 on #{after_filtered_date_range}" do - custom_dates = if set_custom_dates - "#{start_date_formatted} - #{end_date_formatted}" - end - - before do - filtered_dates = filtered_date_range.to_a - @quantities_donated_in_filtered_date_range = [] - - @item_quantity = item_quantities.to_enum - - def create_next_donation(donation_date:) - quantity_in_donation = @item_quantity.next - create :donation, :with_items, issued_at: donation_date, item_quantity: quantity_in_donation, storage_location: storage_location, organization: @organization - - quantity_in_donation - end - - # days_this_year.sample in num_donations_in_filtered_period.times loop - # rather than - # days_this_year.sample(num_donations_in_filtered_period).each - # because Array#sample(n) on an Array with m Date: Sat, 5 Aug 2023 10:46:38 -0400 Subject: [PATCH 033/122] Move activity graph to a standalone report [#3798] --- app/controllers/dashboard_controller.rb | 2 - .../reports/activity_graph_controller.rb | 29 +++++++++++ app/helpers/dashboard_helper.rb | 16 ------ app/views/dashboard/index.html.erb | 43 ---------------- app/views/layouts/_lte_sidebar.html.erb | 7 ++- .../reports/activity_graph/index.html.erb | 51 +++++++++++++++++++ config/routes.rb | 1 + 7 files changed, 87 insertions(+), 62 deletions(-) create mode 100644 app/controllers/reports/activity_graph_controller.rb create mode 100644 app/views/reports/activity_graph/index.html.erb diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 11bfb2eff4..d8448efa47 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -20,8 +20,6 @@ def index @recent_donations_from_manufacturers = current_organization.donations.during(helpers.selected_range).by_source(:manufacturer) @top_manufacturers = current_organization.manufacturers.by_donation_count - @distribution_data = helpers.received_distributed_data(helpers.selected_range) - @partners_awaiting_review = current_organization.partners.awaiting_review # passing nil here filters the announcements that didn't come from an organization @broadcast_announcements = BroadcastAnnouncement.filter_announcements(nil) diff --git a/app/controllers/reports/activity_graph_controller.rb b/app/controllers/reports/activity_graph_controller.rb new file mode 100644 index 0000000000..e2ff7a6dcc --- /dev/null +++ b/app/controllers/reports/activity_graph_controller.rb @@ -0,0 +1,29 @@ +class Reports::ActivityGraphController < ApplicationController + def index + setup_date_range_picker + @distribution_data = received_distributed_data(helpers.selected_range) + end + + private + + def total_purchased_unformatted(range = selected_range) + LineItem.active.where(itemizable: current_organization.purchases.during(range)).sum(:quantity) + end + + def total_distributed_unformatted(range = selected_range) + LineItem.active.where(itemizable: current_organization.distributions.during(range)).sum(:quantity) + end + + def total_received_donations_unformatted(range = selected_range) + LineItem.active.where(itemizable: current_organization.donations.during(range)).sum(:quantity) + end + + def received_distributed_data(range = selected_range) + { + "Received donations" => total_received_donations_unformatted(range), + "Purchased" => total_purchased_unformatted(range), + "Distributed" => total_distributed_unformatted(range) + } + end + +end diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb index a2909f7c1a..b434f79cdd 100644 --- a/app/helpers/dashboard_helper.rb +++ b/app/helpers/dashboard_helper.rb @@ -1,21 +1,9 @@ # Encapsulates methods used on the Dashboard that need some business logic module DashboardHelper - def received_distributed_data(range = selected_range) - { - "Received donations" => total_received_donations_unformatted(range), - "Purchased" => total_purchased_unformatted(range), - "Distributed" => total_distributed_unformatted(range) - } - end - def total_on_hand(total = nil) number_with_delimiter(total || "-1") end - def total_purchased(range = selected_range) - number_with_delimiter total_purchased_unformatted(range) - end - def total_distributed(range = selected_range) number_with_delimiter total_distributed_unformatted(range) end @@ -30,10 +18,6 @@ def recently_added_user_display_text(user) private - def total_purchased_unformatted(range = selected_range) - LineItem.active.where(itemizable: current_organization.purchases.during(range)).sum(:quantity) - end - def total_distributed_unformatted(range = selected_range) LineItem.active.where(itemizable: current_organization.distributions.during(range)).sum(:quantity) end diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index c9ecd31a11..21224e00a3 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -141,49 +141,6 @@ end %> - <%= render( - "shared/card", - gradient: "warning", - title: "Activity", - subtitle: @selected_date_range, - ) do %> -
    -
    -
    - <% - activity_chart_config = { - chart: { - type: "bar" - }, - title: "", - xAxis: { - categories: @distribution_data.keys, - title: { - text: nil - } - }, - yAxis: { - title: { - text: nil - } - }, - legend: { - enabled: false - }, - series: [ - { - data: @distribution_data.values - } - ] - }.to_json - %> -
    -
    -
    - -
    -
    - <% end %>
    diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 749653a8fa..721bbe2970 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -205,11 +205,16 @@ Itemized Distributions <% end %> -
  • +
  • <%= link_to(reports_donations_summary_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/donations_summary'])}") do %> Donations Summary <% end %>
    • +
  • + <%= link_to(reports_activity_graph_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/activity_graph'])}") do %> + Activity Graph + <% end %> +
  • <%= link_to(purchases_summary_path(organization_id: current_user.organization), class: "nav-link #{"active" if current_page?(purchases_summary_path)}") do %> Purchases Summary diff --git a/app/views/reports/activity_graph/index.html.erb b/app/views/reports/activity_graph/index.html.erb new file mode 100644 index 0000000000..88c4535826 --- /dev/null +++ b/app/views/reports/activity_graph/index.html.erb @@ -0,0 +1,51 @@ +<%= render( + "shared/filtered_card", + id: "activity_graph", + gradient: "secondary", + title: "Activity Graph", + subtitle: @selected_date_range, + type: :table, + filter_url: reports_activity_graph_index_path +) do %> + <% if @distribution_data.empty? %> + + <% else %> +
    +
    +
    + <% + activity_chart_config = { + chart: { + type: "bar" + }, + title: "", + xAxis: { + categories: @distribution_data.keys, + title: { + text: nil + } + }, + yAxis: { + title: { + text: nil + } + }, + legend: { + enabled: false + }, + series: [ + { + data: @distribution_data.values + } + ] + }.to_json + %> +
    +
    +
    +
    +
    + <% end %> +<% end %> diff --git a/config/routes.rb b/config/routes.rb index 0facded37f..254b170258 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -107,6 +107,7 @@ def set_up_flipper resources :donations_summary, only: [:index] resources :itemized_donations, only: [:index] resources :itemized_distributions, only: [:index] + resources :activity_graph, only: [:index] end resources :transfers, only: %i(index create new show destroy) From 2f75591ec2974d09f758b5ea0fd3cbfb4922e70c Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 5 Aug 2023 11:04:13 -0400 Subject: [PATCH 034/122] Satiate Rubocop! [#3798] --- app/controllers/reports/activity_graph_controller.rb | 1 - app/helpers/application_helper.rb | 4 ++-- app/helpers/donations_helper.rb | 2 +- spec/requests/reports/donations_summary_spec.rb | 6 +++--- spec/system/reports/donations_summary_spec.rb | 6 +++--- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/controllers/reports/activity_graph_controller.rb b/app/controllers/reports/activity_graph_controller.rb index e2ff7a6dcc..356290853e 100644 --- a/app/controllers/reports/activity_graph_controller.rb +++ b/app/controllers/reports/activity_graph_controller.rb @@ -25,5 +25,4 @@ def received_distributed_data(range = selected_range) "Distributed" => total_distributed_unformatted(range) } end - end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f234be0bc5..e848fb7f85 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -15,11 +15,11 @@ def default_title_content end def active_class(name) - name.any? { |path_name| controller_path.include? path_name } ? "active" : controller_path + (name.any? { |path_name| controller_path.include? path_name }) ? "active" : controller_path end def menu_open?(name) - name.any? { |path_name| controller_path.include? path_name } ? 'menu-open' : '' + (name.any? { |path_name| controller_path.include? path_name }) ? 'menu-open' : '' end def can_administrate? diff --git a/app/helpers/donations_helper.rb b/app/helpers/donations_helper.rb index 7082e7ccf0..ed07d514ea 100644 --- a/app/helpers/donations_helper.rb +++ b/app/helpers/donations_helper.rb @@ -25,4 +25,4 @@ 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 -end \ No newline at end of file +end diff --git a/spec/requests/reports/donations_summary_spec.rb b/spec/requests/reports/donations_summary_spec.rb index f6810db25d..bd85a39c52 100644 --- a/spec/requests/reports/donations_summary_spec.rb +++ b/spec/requests/reports/donations_summary_spec.rb @@ -1,8 +1,8 @@ -require 'rails_helper' +require "rails_helper" RSpec.describe "Reports::DonationsSummary", type: :request do let(:default_params) do - { organization_id: @organization.to_param } + {organization_id: @organization.to_param} end describe "while signed in" do @@ -15,7 +15,7 @@ get reports_donations_summary_index_path(default_params.merge(format: response_format)) response end - let(:response_format) { 'html' } + let(:response_format) { "html" } it { is_expected.to have_http_status(:success) } end diff --git a/spec/system/reports/donations_summary_spec.rb b/spec/system/reports/donations_summary_spec.rb index c70f8802ec..55e17ce697 100644 --- a/spec/system/reports/donations_summary_spec.rb +++ b/spec/system/reports/donations_summary_spec.rb @@ -20,7 +20,7 @@ context "when visiting the summary page" do it "has a link to create a new donation" do - visit @url_prefix + "/reports/donations_summary" + visit @url_prefix + "/reports/donations_summary" expect(page).to have_link "New Donation", href: "#{@url_prefix}/donations/new" end @@ -103,7 +103,7 @@ def create_next_donation(donation_date:) describe("filtering to '#{filtered_date_range_label}'" + (set_custom_dates ? " (#{custom_dates})" : "")) do before do - visit @url_prefix + "/reports/donations_summary" + visit @url_prefix + "/reports/donations_summary" filter_to_date_range(filtered_date_range_label, custom_dates) end @@ -163,4 +163,4 @@ def valid_bracketing_dates(date_range_info) [before_filtered_date_range, after_filtered_date_range] end end -end \ No newline at end of file +end From a6e84ce8eed5a75dcbdc06769e89bd8e8713a67e Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 5 Aug 2023 11:18:44 -0400 Subject: [PATCH 035/122] Switch back to more tedious active-menu setup [#3798] There is another PR that streamlines all of this. --- app/helpers/application_helper.rb | 4 ++-- app/views/layouts/_lte_sidebar.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e848fb7f85..cb0a15ca7f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -15,11 +15,11 @@ def default_title_content end def active_class(name) - (name.any? { |path_name| controller_path.include? path_name }) ? "active" : controller_path + name.include?(controller_path) ? "active" : controller_path end def menu_open?(name) - (name.any? { |path_name| controller_path.include? path_name }) ? 'menu-open' : '' + name.include?(controller_path) ? 'menu-open' : '' end def can_administrate? diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 721bbe2970..0c8f9c6760 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -170,8 +170,8 @@
    • -
  • "> - "> +
  • "> + ">

    Reporting & Auditing From ae90f1a45533ffd2ba256c4345b14c557d41d7e9 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 5 Aug 2023 11:20:39 -0400 Subject: [PATCH 036/122] Make quotes consistent [#3798] --- app/views/layouts/_lte_sidebar.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 0c8f9c6760..8fe0b380df 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -170,8 +170,8 @@

    • -
  • "> - "> +
  • '> + '>

    Reporting & Auditing From 4b0dc7a0be8c8dc5bde7e90198031654dbeee795 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 5 Aug 2023 11:32:15 -0400 Subject: [PATCH 037/122] Remove that that has been extracted into another report [#3798] --- spec/system/dashboard_system_spec.rb | 118 --------------------------- 1 file changed, 118 deletions(-) diff --git a/spec/system/dashboard_system_spec.rb b/spec/system/dashboard_system_spec.rb index 462bf2a70d..966ee7ffec 100644 --- a/spec/system/dashboard_system_spec.rb +++ b/spec/system/dashboard_system_spec.rb @@ -122,124 +122,6 @@ # legal indices are in -8..8 (i.e., inclusive) item_quantities = (1..9).map { |i| i * 10**(i - 1) } - describe "Donations" do - it "has a link to create a new donation" do - org_new_donation_page = OrganizationNewDonationPage.new org_short_name: org_short_name - - org_dashboard_page.visit - - expect { org_dashboard_page.create_new_donation } - .to change { page.current_path } - .to org_new_donation_page.path - end - - # as of 28 Jan 2022, the "Recent Donations" list shows up to this many items matching the date filter - max_recent_donation_links_count = 3 - - # Make up to this many (inclusive) donations for each filtered period - # Keep it below (item_quantities.size - 1) so there's at least 2 values left for - # Donations outside of the filtered period - max_donations_in_filtered_period = max_recent_donation_links_count + 1 - - around do |example| - # Ensure "today" doesn't change for the server side during the example run - # Note, however, that this does *not* affect the client side - # So "today" for the server still might be "yesterday" - # —possibly even "last month" or "last year"- - # for the client - # Rely on rerun via rspec-retry for those edge cases - travel_to(test_time) - example.run - travel_back - end - - [ - # rubocop:disable Layout/ExtraSpacing, Layout/SpaceAroundOperators - [nil, test_time - 2.years, test_time - rand(180).days, :set_custom_dates], # arbitrary values - ["Today", test_time, test_time], - ["Yesterday", test_time.yesterday, test_time.yesterday], - ["Last 7 Days", test_time - 6.days, test_time], - ["Last 30 Days", test_time - 29.days, test_time], - ["This Month", test_time.beginning_of_month, test_time.end_of_month], - ["Last Month", test_time.last_month.beginning_of_month, test_time.last_month.end_of_month], - ["This Year", test_time.beginning_of_year, test_time.end_of_year] - # We now can't test the lower limit of All Time, because the earliest possible date is 2000-01-01 - # ["All Time", test_time - 100.years, test_time] - # rubocop:enable Layout/ExtraSpacing, Layout/SpaceAroundOperators - ].each do |date_range_info| - filtered_date_range_label, start_date, end_date, set_custom_dates = date_range_info - - filtered_date_range = start_date.to_date..end_date.to_date - before_filtered_date_range = start_date.yesterday.to_date - after_filtered_date_range = end_date.tomorrow.to_date - - start_date_formatted, end_date_formatted = [start_date, end_date].map { _1.to_formatted_s(:date_picker) } - - # Ideally different date ranges get different counts (incl. 0!) to test the various combinations - # w/out making a fixed pattern - num_donations_in_filtered_period = rand(0..max_donations_in_filtered_period) - - context "given 1 Donation on #{before_filtered_date_range} (only if a valid date), " \ - "#{num_donations_in_filtered_period} during #{filtered_date_range}, and " \ - "1 on #{after_filtered_date_range}" do - custom_dates = if set_custom_dates - "#{start_date_formatted} - #{end_date_formatted}" - end - - before do - filtered_dates = filtered_date_range.to_a - @quantities_donated_in_filtered_date_range = [] - - @item_quantity = item_quantities.to_enum - - def create_next_donation(donation_date:) - quantity_in_donation = @item_quantity.next - create :donation, :with_items, issued_at: donation_date, item_quantity: quantity_in_donation, storage_location: storage_location, organization: @organization - - quantity_in_donation - end - - # days_this_year.sample in num_donations_in_filtered_period.times loop - # rather than - # days_this_year.sample(num_donations_in_filtered_period).each - # because Array#sample(n) on an Array with m Date: Sat, 5 Aug 2023 12:33:23 -0400 Subject: [PATCH 038/122] Add very basic request spec for activity graph report [#3798] --- spec/requests/reports/activity_graph_spec.rb | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 spec/requests/reports/activity_graph_spec.rb diff --git a/spec/requests/reports/activity_graph_spec.rb b/spec/requests/reports/activity_graph_spec.rb new file mode 100644 index 0000000000..98ad81e0df --- /dev/null +++ b/spec/requests/reports/activity_graph_spec.rb @@ -0,0 +1,36 @@ +require "rails_helper" + +RSpec.describe "Reports::ActivityGraph", type: :request do + let(:default_params) do + {organization_id: @organization.to_param} + end + + describe "while signed in" do + before do + sign_in @user + end + + describe "GET #index" do + subject do + get reports_activity_graph_index_path(default_params.merge(format: response_format)) + response + end + let(:response_format) { "html" } + + it { is_expected.to have_http_status(:success) } + end + end + + describe "while not signed in" do + describe "GET /index" do + subject do + get reports_activity_graph_index_path(default_params) + response + end + + it "redirect to login" do + is_expected.to redirect_to(new_user_session_path) + end + end + end +end From b2df7b14ca341e5c9d48d5b84c2466e4782454f8 Mon Sep 17 00:00:00 2001 From: Shawn Mallon <95663040+lokisk1155@users.noreply.github.com> Date: Mon, 7 Aug 2023 13:09:50 -0400 Subject: [PATCH 039/122] boiler plate added --- Gemfile.lock | 2 +- ...nufacturer_donations_summary_controller.rb | 5 ++++ app/helpers/application_helper.rb | 4 +-- app/helpers/donations_helper.rb | 2 +- app/views/dashboard/index.html.erb | 30 ------------------- app/views/layouts/_lte_sidebar.html.erb | 5 ++++ .../_manufacturer.html.erb | 0 .../index.html.erb | 28 +++++++++++++++++ config/routes.rb | 1 + .../reports/donations_summary_spec.rb | 6 ++-- spec/system/reports/donations_summary_spec.rb | 6 ++-- 11 files changed, 49 insertions(+), 40 deletions(-) create mode 100644 app/controllers/reports/manufacturer_donations_summary_controller.rb rename app/views/{dashboard => reports/manufacturer_donations_summary}/_manufacturer.html.erb (100%) create mode 100644 app/views/reports/manufacturer_donations_summary/index.html.erb diff --git a/Gemfile.lock b/Gemfile.lock index 9627d69d9f..94e5cf8968 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -709,4 +709,4 @@ RUBY VERSION ruby 3.1.2p20 BUNDLED WITH - 2.4.17 + 2.4.18 diff --git a/app/controllers/reports/manufacturer_donations_summary_controller.rb b/app/controllers/reports/manufacturer_donations_summary_controller.rb new file mode 100644 index 0000000000..d0b47786c5 --- /dev/null +++ b/app/controllers/reports/manufacturer_donations_summary_controller.rb @@ -0,0 +1,5 @@ +class Reports::ManufacturerDonationsSummaryController < ApplicationController + def index + @recent_donations_from_manufacturers = current_organization.donations.during(helpers.selected_range).by_source(:manufacturer) + end +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f234be0bc5..e848fb7f85 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -15,11 +15,11 @@ def default_title_content end def active_class(name) - name.any? { |path_name| controller_path.include? path_name } ? "active" : controller_path + (name.any? { |path_name| controller_path.include? path_name }) ? "active" : controller_path end def menu_open?(name) - name.any? { |path_name| controller_path.include? path_name } ? 'menu-open' : '' + (name.any? { |path_name| controller_path.include? path_name }) ? 'menu-open' : '' end def can_administrate? diff --git a/app/helpers/donations_helper.rb b/app/helpers/donations_helper.rb index 7082e7ccf0..ed07d514ea 100644 --- a/app/helpers/donations_helper.rb +++ b/app/helpers/donations_helper.rb @@ -25,4 +25,4 @@ 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 -end \ No newline at end of file +end diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index c9ecd31a11..f2843e279d 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -251,36 +251,6 @@ <%= render partial: "product_drive", collection: @recent_donations.by_source(:product_drive), as: :donation %>

    • <% end %> - - <%= render( - "shared/card", - id: "manufacturers", - gradient: "success", - title: "Manufacturer Donations", - subtitle: @selected_date_range, - footer_options: { class: "text-center" }, - footer: link_to("See more...", donations_path( - filters: { - by_source: "Manufacturer" - } - )), - ) do %> -

    - - <%= number_with_delimiter(@recent_donations_from_manufacturers.sum { |d| d.line_items.total }) %> - - items donated <%= @selected_date_range_label %> - by - - <%= pluralize(@recent_donations_from_manufacturers.group_by(&:manufacturer).count, 'Manufacturer') %> - -

    -
    -

    Top Manufacturer Donations

    - <%= render partial: "manufacturer", collection: @top_manufacturers, as: :manufacturer %> -
    - <% end %> -
    diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 749653a8fa..3eb150aac7 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -209,6 +209,11 @@ <%= link_to(reports_donations_summary_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/donations_summary'])}") do %> Donations Summary <% end %> + +
  • + <%= link_to(reports_manufacturer_donations_summary_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/donations_summary'])}") do %> + Manufacturer Donations + <% end %>
  • <%= link_to(purchases_summary_path(organization_id: current_user.organization), class: "nav-link #{"active" if current_page?(purchases_summary_path)}") do %> diff --git a/app/views/dashboard/_manufacturer.html.erb b/app/views/reports/manufacturer_donations_summary/_manufacturer.html.erb similarity index 100% rename from app/views/dashboard/_manufacturer.html.erb rename to app/views/reports/manufacturer_donations_summary/_manufacturer.html.erb diff --git a/app/views/reports/manufacturer_donations_summary/index.html.erb b/app/views/reports/manufacturer_donations_summary/index.html.erb new file mode 100644 index 0000000000..9a7889275c --- /dev/null +++ b/app/views/reports/manufacturer_donations_summary/index.html.erb @@ -0,0 +1,28 @@ + <%= render( + "shared/card", + id: "manufacturers", + gradient: "success", + title: "Manufacturer Donations", + subtitle: @selected_date_range, + footer_options: { class: "text-center" }, + footer: link_to("See more...", donations_path( + filters: { + by_source: "Manufacturer" + } + )), + ) do %> +

    + + <%= number_with_delimiter(@recent_donations_from_manufacturers.sum { |d| d.line_items.total }) %> + + items donated <%= @selected_date_range_label %> + by + + <%= pluralize(@recent_donations_from_manufacturers.group_by(&:manufacturer).count, 'Manufacturer') %> + +

    +
    +

    Top Manufacturer Donations

    + <%= render partial: "manufacturer", collection: @top_manufacturers, as: :manufacturer %> +
    + <% end %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 0facded37f..7e45fc4400 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -105,6 +105,7 @@ def set_up_flipper post :recalculate, on: :member end resources :donations_summary, only: [:index] + resources :manufacturer_donations_summary, only: [:index] resources :itemized_donations, only: [:index] resources :itemized_distributions, only: [:index] end diff --git a/spec/requests/reports/donations_summary_spec.rb b/spec/requests/reports/donations_summary_spec.rb index f6810db25d..bd85a39c52 100644 --- a/spec/requests/reports/donations_summary_spec.rb +++ b/spec/requests/reports/donations_summary_spec.rb @@ -1,8 +1,8 @@ -require 'rails_helper' +require "rails_helper" RSpec.describe "Reports::DonationsSummary", type: :request do let(:default_params) do - { organization_id: @organization.to_param } + {organization_id: @organization.to_param} end describe "while signed in" do @@ -15,7 +15,7 @@ get reports_donations_summary_index_path(default_params.merge(format: response_format)) response end - let(:response_format) { 'html' } + let(:response_format) { "html" } it { is_expected.to have_http_status(:success) } end diff --git a/spec/system/reports/donations_summary_spec.rb b/spec/system/reports/donations_summary_spec.rb index c70f8802ec..55e17ce697 100644 --- a/spec/system/reports/donations_summary_spec.rb +++ b/spec/system/reports/donations_summary_spec.rb @@ -20,7 +20,7 @@ context "when visiting the summary page" do it "has a link to create a new donation" do - visit @url_prefix + "/reports/donations_summary" + visit @url_prefix + "/reports/donations_summary" expect(page).to have_link "New Donation", href: "#{@url_prefix}/donations/new" end @@ -103,7 +103,7 @@ def create_next_donation(donation_date:) describe("filtering to '#{filtered_date_range_label}'" + (set_custom_dates ? " (#{custom_dates})" : "")) do before do - visit @url_prefix + "/reports/donations_summary" + visit @url_prefix + "/reports/donations_summary" filter_to_date_range(filtered_date_range_label, custom_dates) end @@ -163,4 +163,4 @@ def valid_bracketing_dates(date_range_info) [before_filtered_date_range, after_filtered_date_range] end end -end \ No newline at end of file +end From 0834a0d7e2671f0211be92d72c71b2bcd5ad2107 Mon Sep 17 00:00:00 2001 From: Shawn Mallon <95663040+lokisk1155@users.noreply.github.com> Date: Mon, 7 Aug 2023 13:33:06 -0400 Subject: [PATCH 040/122] try thisg --- .../reports/manufacturer_donations_summary_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/reports/manufacturer_donations_summary_controller.rb b/app/controllers/reports/manufacturer_donations_summary_controller.rb index d0b47786c5..868a89be5e 100644 --- a/app/controllers/reports/manufacturer_donations_summary_controller.rb +++ b/app/controllers/reports/manufacturer_donations_summary_controller.rb @@ -1,5 +1,6 @@ class Reports::ManufacturerDonationsSummaryController < ApplicationController def index @recent_donations_from_manufacturers = current_organization.donations.during(helpers.selected_range).by_source(:manufacturer) + puts 'try' end end From 955d9b9441eef889471227be0b9942100c83d57a Mon Sep 17 00:00:00 2001 From: Shawn Mallon <95663040+lokisk1155@users.noreply.github.com> Date: Mon, 7 Aug 2023 13:35:30 -0400 Subject: [PATCH 041/122] add top manufactuers --- .../reports/manufacturer_donations_summary_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/reports/manufacturer_donations_summary_controller.rb b/app/controllers/reports/manufacturer_donations_summary_controller.rb index 868a89be5e..f1fcec2f81 100644 --- a/app/controllers/reports/manufacturer_donations_summary_controller.rb +++ b/app/controllers/reports/manufacturer_donations_summary_controller.rb @@ -1,6 +1,6 @@ class Reports::ManufacturerDonationsSummaryController < ApplicationController def index @recent_donations_from_manufacturers = current_organization.donations.during(helpers.selected_range).by_source(:manufacturer) - puts 'try' + @top_manufacturers = current_organization.manufacturers.by_donation_count end end From 41aac223001ccd58acee6ab17b81796893dc312e Mon Sep 17 00:00:00 2001 From: Shawn Mallon <95663040+lokisk1155@users.noreply.github.com> Date: Mon, 7 Aug 2023 13:47:29 -0400 Subject: [PATCH 042/122] dates + new donation button --- .../reports/manufacturer_donations_summary_controller.rb | 4 ++++ .../reports/manufacturer_donations_summary/index.html.erb | 1 + 2 files changed, 5 insertions(+) diff --git a/app/controllers/reports/manufacturer_donations_summary_controller.rb b/app/controllers/reports/manufacturer_donations_summary_controller.rb index f1fcec2f81..d7a6828cad 100644 --- a/app/controllers/reports/manufacturer_donations_summary_controller.rb +++ b/app/controllers/reports/manufacturer_donations_summary_controller.rb @@ -1,6 +1,10 @@ class Reports::ManufacturerDonationsSummaryController < ApplicationController def index + setup_date_range_picker + @recent_donations_from_manufacturers = current_organization.donations.during(helpers.selected_range).by_source(:manufacturer) @top_manufacturers = current_organization.manufacturers.by_donation_count + @donations = current_organization.donations.during(helpers.selected_range) + @recent_donations = @donations.recent end end diff --git a/app/views/reports/manufacturer_donations_summary/index.html.erb b/app/views/reports/manufacturer_donations_summary/index.html.erb index 9a7889275c..561bd1740b 100644 --- a/app/views/reports/manufacturer_donations_summary/index.html.erb +++ b/app/views/reports/manufacturer_donations_summary/index.html.erb @@ -11,6 +11,7 @@ } )), ) do %> + <%= new_button_to new_donation_path, {text: "New Donation"} %>

    <%= number_with_delimiter(@recent_donations_from_manufacturers.sum { |d| d.line_items.total }) %> From 3b42cf0655d226673ff5e47aa6fec8283c8a0952 Mon Sep 17 00:00:00 2001 From: Rachael Wright-Munn Date: Wed, 16 Aug 2023 21:13:05 +0000 Subject: [PATCH 043/122] Remove Feature specs for sections that are no longer on the dashboard. --- spec/system/dashboard_system_spec.rb | 266 --------------------------- 1 file changed, 266 deletions(-) diff --git a/spec/system/dashboard_system_spec.rb b/spec/system/dashboard_system_spec.rb index 462bf2a70d..dedb455b9b 100644 --- a/spec/system/dashboard_system_spec.rb +++ b/spec/system/dashboard_system_spec.rb @@ -122,124 +122,6 @@ # legal indices are in -8..8 (i.e., inclusive) item_quantities = (1..9).map { |i| i * 10**(i - 1) } - describe "Donations" do - it "has a link to create a new donation" do - org_new_donation_page = OrganizationNewDonationPage.new org_short_name: org_short_name - - org_dashboard_page.visit - - expect { org_dashboard_page.create_new_donation } - .to change { page.current_path } - .to org_new_donation_page.path - end - - # as of 28 Jan 2022, the "Recent Donations" list shows up to this many items matching the date filter - max_recent_donation_links_count = 3 - - # Make up to this many (inclusive) donations for each filtered period - # Keep it below (item_quantities.size - 1) so there's at least 2 values left for - # Donations outside of the filtered period - max_donations_in_filtered_period = max_recent_donation_links_count + 1 - - around do |example| - # Ensure "today" doesn't change for the server side during the example run - # Note, however, that this does *not* affect the client side - # So "today" for the server still might be "yesterday" - # —possibly even "last month" or "last year"- - # for the client - # Rely on rerun via rspec-retry for those edge cases - travel_to(test_time) - example.run - travel_back - end - - [ - # rubocop:disable Layout/ExtraSpacing, Layout/SpaceAroundOperators - [nil, test_time - 2.years, test_time - rand(180).days, :set_custom_dates], # arbitrary values - ["Today", test_time, test_time], - ["Yesterday", test_time.yesterday, test_time.yesterday], - ["Last 7 Days", test_time - 6.days, test_time], - ["Last 30 Days", test_time - 29.days, test_time], - ["This Month", test_time.beginning_of_month, test_time.end_of_month], - ["Last Month", test_time.last_month.beginning_of_month, test_time.last_month.end_of_month], - ["This Year", test_time.beginning_of_year, test_time.end_of_year] - # We now can't test the lower limit of All Time, because the earliest possible date is 2000-01-01 - # ["All Time", test_time - 100.years, test_time] - # rubocop:enable Layout/ExtraSpacing, Layout/SpaceAroundOperators - ].each do |date_range_info| - filtered_date_range_label, start_date, end_date, set_custom_dates = date_range_info - - filtered_date_range = start_date.to_date..end_date.to_date - before_filtered_date_range = start_date.yesterday.to_date - after_filtered_date_range = end_date.tomorrow.to_date - - start_date_formatted, end_date_formatted = [start_date, end_date].map { _1.to_formatted_s(:date_picker) } - - # Ideally different date ranges get different counts (incl. 0!) to test the various combinations - # w/out making a fixed pattern - num_donations_in_filtered_period = rand(0..max_donations_in_filtered_period) - - context "given 1 Donation on #{before_filtered_date_range} (only if a valid date), " \ - "#{num_donations_in_filtered_period} during #{filtered_date_range}, and " \ - "1 on #{after_filtered_date_range}" do - custom_dates = if set_custom_dates - "#{start_date_formatted} - #{end_date_formatted}" - end - - before do - filtered_dates = filtered_date_range.to_a - @quantities_donated_in_filtered_date_range = [] - - @item_quantity = item_quantities.to_enum - - def create_next_donation(donation_date:) - quantity_in_donation = @item_quantity.next - create :donation, :with_items, issued_at: donation_date, item_quantity: quantity_in_donation, storage_location: storage_location, organization: @organization - - quantity_in_donation - end - - # days_this_year.sample in num_donations_in_filtered_period.times loop - # rather than - # days_this_year.sample(num_donations_in_filtered_period).each - # because Array#sample(n) on an Array with m Date: Wed, 23 Aug 2023 21:50:02 +0000 Subject: [PATCH 044/122] Add new Bank-wide low inventory report to Dashboard --- app/controllers/dashboard_controller.rb | 2 + app/queries/low_inventory_query.rb | 14 ++++ .../dashboard/_low_inventory_report.html.erb | 30 +++++++++ app/views/dashboard/index.html.erb | 2 + spec/queries/low_inventory_query_spec.rb | 67 +++++++++++++++++++ 5 files changed, 115 insertions(+) create mode 100644 app/queries/low_inventory_query.rb create mode 100644 app/views/dashboard/_low_inventory_report.html.erb create mode 100644 spec/queries/low_inventory_query_spec.rb diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 11bfb2eff4..5cb07fd182 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -27,5 +27,7 @@ def index @broadcast_announcements = BroadcastAnnouncement.filter_announcements(nil) @outstanding_requests = Request.where(status: %i[pending started]).order(:created_at) + + @low_inventory_report = LowInventoryQuery.new(organization: current_organization).call end end diff --git a/app/queries/low_inventory_query.rb b/app/queries/low_inventory_query.rb new file mode 100644 index 0000000000..02394b45e3 --- /dev/null +++ b/app/queries/low_inventory_query.rb @@ -0,0 +1,14 @@ +class LowInventoryQuery + attr_reader :organization + + def initialize(organization:) + @organization = organization + end + + def call + scope = organization.inventory_items + scope.where("inventory_items.quantity <= items.on_hand_minimum_quantity") + .or(scope.where("inventory_items.quantity <= items.on_hand_recommended_quantity")) + .includes(:item, :storage_location) + end +end diff --git a/app/views/dashboard/_low_inventory_report.html.erb b/app/views/dashboard/_low_inventory_report.html.erb new file mode 100644 index 0000000000..0b4895cafa --- /dev/null +++ b/app/views/dashboard/_low_inventory_report.html.erb @@ -0,0 +1,30 @@ + +<%= render( + "shared/card", + id: "low_inventory", + gradient: "info", + title: "Bank-wide Low inventory" +) do %> + + + + + + + + + + + + <% @low_inventory_report.each do |inventory_item| %> + + + + + + + + <% end %> + +
    Storage LocationItem NameQuantityMinimum QuantityRecommended Quantity
    <%= inventory_item.storage_location.name %><%= inventory_item.item.name %><%= inventory_item.quantity %><%= inventory_item.item.on_hand_minimum_quantity %><%= inventory_item.item.on_hand_recommended_quantity %>
    +<% end %> \ No newline at end of file diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index f2843e279d..6cd296090c 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -115,6 +115,8 @@

    • <% end %> + <%= render partial: "low_inventory_report" %> + <%= outstanding_type = @outstanding_requests.empty? ? :box : :table outstanding_footer = diff --git a/spec/queries/low_inventory_query_spec.rb b/spec/queries/low_inventory_query_spec.rb new file mode 100644 index 0000000000..9517300959 --- /dev/null +++ b/spec/queries/low_inventory_query_spec.rb @@ -0,0 +1,67 @@ +RSpec.describe LowInventoryQuery do + subject { LowInventoryQuery.new(organization: organization).call } + + let(:organization) { create :organization } + + it { is_expected.to eq [] } + + context "with inventory items" do + let(:storage_location) { create :storage_location, organization: organization } + let(:minimum_quantity) { 0 } + let(:recommended_quantity) { 0 } + let!(:inventory_item) { create :inventory_item, item: item, storage_location: storage_location, quantity: 100 } + + let(:item) do + create :item, + organization: organization, + on_hand_minimum_quantity: minimum_quantity, + on_hand_recommended_quantity: recommended_quantity + end + + it { is_expected.to eq [] } + + context "when minimum_quantity and recommended_quantity is nil" do + let(:item) { create :item, organization: organization } + + it { is_expected.to eq [] } + end + + context "when inventory quantity is over minimum quantity" do + let(:minimum_quantity) { 50 } + + it { is_expected.to eq [] } + end + + context "when minimum_quantity is equal to quantity" do + let(:minimum_quantity) { 100 } + + it "returns the inventory item" do + is_expected.to include inventory_item + end + end + + context "when inventory quantity drops below minimum quantity" do + let(:minimum_quantity) { 200 } + + it "returns the inventory item" do + is_expected.to include inventory_item + end + end + + context "when inventory quantity equals recommended quantity" do + let(:recommended_quantity) { 100 } + + it "returns the inventory item" do + is_expected.to include inventory_item + end + end + + context "when inventory quantity drops below recommended quantity" do + let(:recommended_quantity) { 200 } + + it "returns the inventory item" do + is_expected.to include inventory_item + end + end + end +end \ No newline at end of file From ef0b29416432335176bf8c31e485c93cac537fe2 Mon Sep 17 00:00:00 2001 From: Rachael Wright-Munn Date: Thu, 28 Sep 2023 17:07:44 +0000 Subject: [PATCH 045/122] Only return if inventory levels are lower than minimum or recommended. If there is a minimum of 0 and amount of 0, the equality check used to return that inventory item, which we don't want. The cleanest way to handle this is to only return if the inventory levels are lower. --- app/queries/low_inventory_query.rb | 4 ++-- spec/queries/low_inventory_query_spec.rb | 27 ++++++++++++------------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/queries/low_inventory_query.rb b/app/queries/low_inventory_query.rb index 02394b45e3..2ef4a25f06 100644 --- a/app/queries/low_inventory_query.rb +++ b/app/queries/low_inventory_query.rb @@ -7,8 +7,8 @@ def initialize(organization:) def call scope = organization.inventory_items - scope.where("inventory_items.quantity <= items.on_hand_minimum_quantity") - .or(scope.where("inventory_items.quantity <= items.on_hand_recommended_quantity")) + scope.where("inventory_items.quantity < items.on_hand_minimum_quantity") + .or(scope.where("inventory_items.quantity < items.on_hand_recommended_quantity")) .includes(:item, :storage_location) end end diff --git a/spec/queries/low_inventory_query_spec.rb b/spec/queries/low_inventory_query_spec.rb index 9517300959..630fbbc57a 100644 --- a/spec/queries/low_inventory_query_spec.rb +++ b/spec/queries/low_inventory_query_spec.rb @@ -9,7 +9,8 @@ let(:storage_location) { create :storage_location, organization: organization } let(:minimum_quantity) { 0 } let(:recommended_quantity) { 0 } - let!(:inventory_item) { create :inventory_item, item: item, storage_location: storage_location, quantity: 100 } + let!(:inventory_item) { create :inventory_item, item: item, storage_location: storage_location, quantity: inventory_item_quantity } + let(:inventory_item_quantity) { 100 } let(:item) do create :item, @@ -26,6 +27,14 @@ it { is_expected.to eq [] } end + context "when minimum_quantity is 0 and recommended_quantity is nil and item quantity is 0" do + let(:item) { create :item, organization: organization } + let(:minimum_quantity) { 0 } + let(:inventory_item_quantity) { 0 } + + it { is_expected.to eq [] } + end + context "when inventory quantity is over minimum quantity" do let(:minimum_quantity) { 50 } @@ -35,33 +44,25 @@ context "when minimum_quantity is equal to quantity" do let(:minimum_quantity) { 100 } - it "returns the inventory item" do - is_expected.to include inventory_item - end + it { is_expected.to eq [] } end context "when inventory quantity drops below minimum quantity" do let(:minimum_quantity) { 200 } - it "returns the inventory item" do - is_expected.to include inventory_item - end + it { is_expected.to include inventory_item } end context "when inventory quantity equals recommended quantity" do let(:recommended_quantity) { 100 } - it "returns the inventory item" do - is_expected.to include inventory_item - end + it { is_expected.to eq [] } end context "when inventory quantity drops below recommended quantity" do let(:recommended_quantity) { 200 } - it "returns the inventory item" do - is_expected.to include inventory_item - end + it { is_expected.to include inventory_item } end end end \ No newline at end of file From 9f2ac37b8d4d5155f4cfa9b11138b692c714b593 Mon Sep 17 00:00:00 2001 From: Rachael Wright-Munn Date: Thu, 28 Sep 2023 17:36:12 +0000 Subject: [PATCH 046/122] Setup system specs and setup sufficient inventory levels message --- .../dashboard/_low_inventory_report.html.erb | 48 ++++++++++--------- .../pages/organization_dashboard_page.rb | 18 +++++++ spec/system/dashboard_system_spec.rb | 27 +++++++++++ 3 files changed, 71 insertions(+), 22 deletions(-) diff --git a/app/views/dashboard/_low_inventory_report.html.erb b/app/views/dashboard/_low_inventory_report.html.erb index 0b4895cafa..229a1fed28 100644 --- a/app/views/dashboard/_low_inventory_report.html.erb +++ b/app/views/dashboard/_low_inventory_report.html.erb @@ -5,26 +5,30 @@ gradient: "info", title: "Bank-wide Low inventory" ) do %> - - - - - - - - - - - - <% @low_inventory_report.each do |inventory_item| %> - - - - - - - - <% end %> - -
    Storage LocationItem NameQuantityMinimum QuantityRecommended Quantity
    <%= inventory_item.storage_location.name %><%= inventory_item.item.name %><%= inventory_item.quantity %><%= inventory_item.item.on_hand_minimum_quantity %><%= inventory_item.item.on_hand_recommended_quantity %>
    + <% if @low_inventory_report.count == 0 %> +

    Inventory is at recommended levels (minimum and recommended levels can be set on each item)

    + <% else %> + + + + + + + + + + + + <% @low_inventory_report.each do |inventory_item| %> + + + + + + + + <% end %> + +
    Storage LocationItem NameQuantityMinimum QuantityRecommended Quantity
    <%= inventory_item.storage_location.name %><%= inventory_item.item.name %><%= inventory_item.quantity %><%= inventory_item.item.on_hand_minimum_quantity %><%= inventory_item.item.on_hand_recommended_quantity %>
    + <% end %> <% end %> \ No newline at end of file diff --git a/spec/support/pages/organization_dashboard_page.rb b/spec/support/pages/organization_dashboard_page.rb index 1178c6792b..5b2f97a039 100644 --- a/spec/support/pages/organization_dashboard_page.rb +++ b/spec/support/pages/organization_dashboard_page.rb @@ -60,6 +60,10 @@ def has_getting_started_guide? has_selector? "#getting-started-guide" end + def has_low_inventory_section? + has_selector? low_inventory_selector + end + def has_manufacturers_section? has_selector? manufacturers_section_selector end @@ -134,6 +138,16 @@ def total_inventory end end + def low_inventory_section + find low_inventory_selector + end + + def low_inventories + within low_inventory_section do + all("tbody > tr").map(&:text) + end + end + def outstanding_section find outstanding_selector end @@ -160,6 +174,10 @@ def partner_approvals_section private + def low_inventory_selector + "#low_inventory" + end + def product_drives_section find product_drives_selector end diff --git a/spec/system/dashboard_system_spec.rb b/spec/system/dashboard_system_spec.rb index dedb455b9b..f1398c404c 100644 --- a/spec/system/dashboard_system_spec.rb +++ b/spec/system/dashboard_system_spec.rb @@ -446,6 +446,33 @@ def create_next_product_drive_donation(donation_date:) end end end + + describe "Bank-wide Low inventory" do + it "displays no low inventory message" do + org_dashboard_page.visit + expect(org_dashboard_page).to have_low_inventory_section + expect(org_dashboard_page.low_inventory_section).to have_text "Inventory is at recommended levels (minimum and recommended levels can be set on each item)" + end + + context "with low inventory" do + let(:below_recommended_item) { create :item, organization: @organization, on_hand_minimum_quantity: 0, on_hand_recommended_quantity: 200 } + let(:below_minimum_item) { create :item, organization: @organization, on_hand_minimum_quantity: 150, on_hand_recommended_quantity: 200 } + + let!(:below_recommended_inventory_item) { create :inventory_item, item: below_recommended_item, storage_location: storage_location, quantity: 100 } + let!(:below_minimum_inventory_item) { create :inventory_item, item: below_minimum_item, storage_location: storage_location, quantity: 100 } + + it "displays low inventory report" do + org_dashboard_page.visit + expect(org_dashboard_page).to have_low_inventory_section + inventories = org_dashboard_page.low_inventories + minimum_item = "#{storage_location.name} #{below_minimum_item.name} 100 150 200" + recommended_item = "#{storage_location.name} #{below_recommended_item.name} 100 0 200" + expect(inventories.count).to eq 2 + expect(inventories).to include minimum_item + expect(inventories).to include recommended_item + end + end + end end def valid_bracketing_dates(date_range_info) From f5bc55a50dd81408799055fd6d6220f64111dddf Mon Sep 17 00:00:00 2001 From: Rachael Wright-Munn Date: Thu, 28 Sep 2023 18:11:27 +0000 Subject: [PATCH 047/122] Highlight quantities below minumum in low inventory report --- app/views/dashboard/_low_inventory_report.html.erb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/dashboard/_low_inventory_report.html.erb b/app/views/dashboard/_low_inventory_report.html.erb index 229a1fed28..2234d91187 100644 --- a/app/views/dashboard/_low_inventory_report.html.erb +++ b/app/views/dashboard/_low_inventory_report.html.erb @@ -23,7 +23,13 @@ <%= inventory_item.storage_location.name %> <%= inventory_item.item.name %> - <%= inventory_item.quantity %> + + <% if inventory_item.quantity < inventory_item.item.on_hand_minimum_quantity %> + <%= inventory_item.quantity %> + <% else %> + <%= inventory_item.quantity %> + <% end %> + <%= inventory_item.item.on_hand_minimum_quantity %> <%= inventory_item.item.on_hand_recommended_quantity %> From 5a73788872c5ce0f6ffb80e44d98bdf3e9ef9961 Mon Sep 17 00:00:00 2001 From: Rachael Wright-Munn Date: Sun, 8 Oct 2023 14:56:11 +0000 Subject: [PATCH 048/122] Move from using a QueryObject to a class method. --- app/controllers/dashboard_controller.rb | 2 +- app/queries/low_inventory_query.rb | 8 +------- spec/queries/low_inventory_query_spec.rb | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 5cb07fd182..e2ed10d706 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -28,6 +28,6 @@ def index @outstanding_requests = Request.where(status: %i[pending started]).order(:created_at) - @low_inventory_report = LowInventoryQuery.new(organization: current_organization).call + @low_inventory_report = LowInventoryQuery.call(current_organization) end end diff --git a/app/queries/low_inventory_query.rb b/app/queries/low_inventory_query.rb index 2ef4a25f06..b86490c4b7 100644 --- a/app/queries/low_inventory_query.rb +++ b/app/queries/low_inventory_query.rb @@ -1,11 +1,5 @@ class LowInventoryQuery - attr_reader :organization - - def initialize(organization:) - @organization = organization - end - - def call + def self.call(organization) scope = organization.inventory_items scope.where("inventory_items.quantity < items.on_hand_minimum_quantity") .or(scope.where("inventory_items.quantity < items.on_hand_recommended_quantity")) diff --git a/spec/queries/low_inventory_query_spec.rb b/spec/queries/low_inventory_query_spec.rb index 630fbbc57a..3a06e7532c 100644 --- a/spec/queries/low_inventory_query_spec.rb +++ b/spec/queries/low_inventory_query_spec.rb @@ -1,5 +1,5 @@ RSpec.describe LowInventoryQuery do - subject { LowInventoryQuery.new(organization: organization).call } + subject { LowInventoryQuery.call(organization) } let(:organization) { create :organization } From 7ec14dc46898929da362fbf8192ee30500a8d36a Mon Sep 17 00:00:00 2001 From: Rachael Wright-Munn Date: Sun, 8 Oct 2023 14:56:46 +0000 Subject: [PATCH 049/122] Add title tooltip to records below the minimum quantity. --- app/views/dashboard/_low_inventory_report.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/dashboard/_low_inventory_report.html.erb b/app/views/dashboard/_low_inventory_report.html.erb index 2234d91187..f01eab8642 100644 --- a/app/views/dashboard/_low_inventory_report.html.erb +++ b/app/views/dashboard/_low_inventory_report.html.erb @@ -25,7 +25,7 @@ <%= inventory_item.item.name %> <% if inventory_item.quantity < inventory_item.item.on_hand_minimum_quantity %> - <%= inventory_item.quantity %> + <%= inventory_item.quantity %> <% else %> <%= inventory_item.quantity %> <% end %> From 9e92a985a537d8041af775d14413c0bfe022b19b Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 11 Nov 2023 22:42:24 -0500 Subject: [PATCH 050/122] Fix unrelated lint isue [#3798] --- spec/queries/low_inventory_query_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/queries/low_inventory_query_spec.rb b/spec/queries/low_inventory_query_spec.rb index 3a06e7532c..36cd771989 100644 --- a/spec/queries/low_inventory_query_spec.rb +++ b/spec/queries/low_inventory_query_spec.rb @@ -14,9 +14,9 @@ let(:item) do create :item, - organization: organization, - on_hand_minimum_quantity: minimum_quantity, - on_hand_recommended_quantity: recommended_quantity + organization: organization, + on_hand_minimum_quantity: minimum_quantity, + on_hand_recommended_quantity: recommended_quantity end it { is_expected.to eq [] } @@ -65,4 +65,4 @@ it { is_expected.to include inventory_item } end end -end \ No newline at end of file +end From 17aa91cfb8e965934d847d7d6f6b38725ed93529 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 11 Nov 2023 22:55:13 -0500 Subject: [PATCH 051/122] Fix navigation items [#3798] --- app/views/layouts/_lte_sidebar.html.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 55d41ac35d..0ea5c75c3b 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -170,8 +170,8 @@ -
  • '> - '> +
  • '> + '>

    Reporting & Auditing @@ -215,18 +215,18 @@ Activity Graph <% end %>

    • -
  • - <%= link_to(reports_manufacturer_donations_summary_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/donations_summary'])}") do %> +
  • + <%= link_to(reports_manufacturer_donations_summary_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/manufacturer_donations_summary'])}") do %> Manufacturer Donations <% end %>
  • - <%= link_to(purchases_summary_path(organization_id: current_user.organization), class: "nav-link #{"active" if current_page?(purchases_summary_path)}") do %> + <%= link_to(purchases_summary_path(organization_id: current_user.organization), class: "nav-link #{active_class(['purchases_summary'])}") do %> Purchases Summary <% end %>
  • - <%= link_to(distributions_summary_path(organization_id: current_user.organization), class: "nav-link #{"active" if current_page?(distributions_summary_path)}") do %> + <%= link_to(distributions_summary_path(organization_id: current_user.organization), class: "nav-link #{active_class(['distributions_summary'])}") do %> Distributions Summary <% end %>
    • From b25e320c2995797e093539b30f441aed6a4097ed Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 11 Nov 2023 22:59:16 -0500 Subject: [PATCH 052/122] Re-organize reports list [#3798] --- app/views/layouts/_lte_sidebar.html.erb | 40 ++++++++++++------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 0ea5c75c3b..a50de56485 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -178,6 +178,11 @@

      +
    • + <%= link_to(reports_activity_graph_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/activity_graph'])}") do %> + Activity Graph + <% end %> +
      • <% if current_user.has_role?(Role::ORG_ADMIN, current_organization) %>
    • <%= link_to(audits_path(organization_id: current_user.organization), class: "nav-link #{active_class(['audits'])}") do %> @@ -190,36 +195,21 @@ Annual Survey <% end %>
      • -
    • - <%= link_to(distributions_by_county_report_path(filters: { date_range: date_range_params }), class: "nav-link #{active_class(['distributions_by_county'])}") do %> - Distributions by County - <% end %> -
      • -
    • - <%= link_to(reports_itemized_donations_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/itemized_donations'])}") do %> - Itemized Donations - <% end %> -
      • -
    • - <%= link_to(reports_itemized_distributions_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/itemized_distributions'])}") do %> - Itemized Distributions - <% end %> -
    • <%= link_to(reports_donations_summary_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/donations_summary'])}") do %> Donations Summary <% end %> -
      • -
    • - <%= link_to(reports_activity_graph_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/activity_graph'])}") do %> - Activity Graph - <% end %>
    • <%= link_to(reports_manufacturer_donations_summary_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/manufacturer_donations_summary'])}") do %> Manufacturer Donations <% end %>
      • +
    • + <%= link_to(reports_itemized_donations_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/itemized_donations'])}") do %> + Itemized Donations + <% end %> +
    • <%= link_to(purchases_summary_path(organization_id: current_user.organization), class: "nav-link #{active_class(['purchases_summary'])}") do %> Purchases Summary @@ -230,6 +220,16 @@ Distributions Summary <% end %>
      • +
    • + <%= link_to(reports_itemized_distributions_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/itemized_distributions'])}") do %> + Itemized Distributions + <% end %> +
      • +
    • + <%= link_to(distributions_by_county_report_path(filters: { date_range: date_range_params }), class: "nav-link #{active_class(['distributions_by_county'])}") do %> + Distributions by County + <% end %> +
  • From 75cd62ee6543293fb089d980d30102d21122e191 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 23 Dec 2023 13:10:47 -0500 Subject: [PATCH 053/122] Extract product drives card to separate report [#3734] --- app/controllers/dashboard_controller.rb | 2 - .../reports/product_drives_controller.rb | 7 + app/views/dashboard/_product_drive.html.erb | 5 - app/views/dashboard/index.html.erb | 32 --- app/views/layouts/_lte_sidebar.html.erb | 9 +- .../product_drives/_product_drive.html.erb | 5 + .../reports/product_drives/index.html.erb | 33 +++ config/routes.rb | 1 + spec/requests/reports/product_drives_spec.rb | 36 +++ .../pages/organization_dashboard_page.rb | 30 --- ...rganization_reports_product_drives_page.rb | 37 ++++ spec/system/dashboard_system_spec.rb | 191 ---------------- spec/system/reports/product_drives_spec.rb | 206 ++++++++++++++++++ 13 files changed, 332 insertions(+), 262 deletions(-) create mode 100644 app/controllers/reports/product_drives_controller.rb delete mode 100644 app/views/dashboard/_product_drive.html.erb create mode 100644 app/views/reports/product_drives/_product_drive.html.erb create mode 100644 app/views/reports/product_drives/index.html.erb create mode 100644 spec/requests/reports/product_drives_spec.rb create mode 100644 spec/support/pages/organization_reports_product_drives_page.rb create mode 100644 spec/system/reports/product_drives_spec.rb diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 8b93ef00f3..69eaab808e 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -5,8 +5,6 @@ class DashboardController < ApplicationController def index setup_date_range_picker - @donations = current_organization.donations.during(helpers.selected_range) - @recent_donations = @donations.recent distributions = current_organization.distributions.includes(:partner).during(helpers.selected_range) @itemized_distribution_data = DistributionItemizedBreakdownService.new(organization: current_organization, distribution_ids: distributions.pluck(:id)).fetch diff --git a/app/controllers/reports/product_drives_controller.rb b/app/controllers/reports/product_drives_controller.rb new file mode 100644 index 0000000000..577a0981e8 --- /dev/null +++ b/app/controllers/reports/product_drives_controller.rb @@ -0,0 +1,7 @@ +class Reports::ProductDrivesController < ApplicationController + def index + setup_date_range_picker + @donations = current_organization.donations.during(helpers.selected_range) + @recent_donations = @donations.recent + end +end diff --git a/app/views/dashboard/_product_drive.html.erb b/app/views/dashboard/_product_drive.html.erb deleted file mode 100644 index 6bdb592bdb..0000000000 --- a/app/views/dashboard/_product_drive.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -
    - <%= link_to donation do %> - <%= number_with_delimiter donation.line_items.total %> from <%= donation.product_drive&.name || donation.product_drive_participant.business_name %> - <% end %> -
    diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 712d189d08..949d84ac08 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -142,8 +142,6 @@ end end %> - -
    • <%= render( @@ -180,36 +178,6 @@ No partners waiting for approval <% end %> <% end %> - - <%= render( - "shared/card", - id: "product_drives", - gradient: "info", - title: "Product Drives", - subtitle: @selected_date_range, - footer_options: { class: "text-center" }, - footer: link_to("See more...", donations_path( - filters: { - by_source: "Product Drive" - } - )), - ) do %> -

    - - <%= total_received_from_product_drives %> - items - received <%= @selected_date_range_label %> -

    -

    - - <%= dollar_presentation( total_received_money_donations_from_product_drives) %> - raised <%= @selected_date_range_label %> -

    -
    -

    Recent Donations from Product Drives

    - <%= render partial: "product_drive", collection: @recent_donations.by_source(:product_drive), as: :donation %> -
    - <% end %>
    diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index a50de56485..0bc4027948 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -170,8 +170,8 @@ -
  • '> - '> +
  • '> + '>

    Reporting & Auditing @@ -205,6 +205,11 @@ Manufacturer Donations <% end %>

    • +
  • + <%= link_to(reports_product_drives_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/product_drives'])}") do %> + Product Drives + <% end %> +
  • <%= link_to(reports_itemized_donations_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/itemized_donations'])}") do %> Itemized Donations diff --git a/app/views/reports/product_drives/_product_drive.html.erb b/app/views/reports/product_drives/_product_drive.html.erb new file mode 100644 index 0000000000..77644ff2be --- /dev/null +++ b/app/views/reports/product_drives/_product_drive.html.erb @@ -0,0 +1,5 @@ +
    + <%= link_to donation do %> + <%= number_with_delimiter donation.line_items.total %> from <%= donation.product_drive&.name || donation.product_drive_participant.business_name %> + <% end %> +
    diff --git a/app/views/reports/product_drives/index.html.erb b/app/views/reports/product_drives/index.html.erb new file mode 100644 index 0000000000..e451492158 --- /dev/null +++ b/app/views/reports/product_drives/index.html.erb @@ -0,0 +1,33 @@ +<%= render( + "shared/filtered_card", + id: "product_drives", + gradient: "secondary", + title: "Product Drives", + subtitle: @selected_date_range, + type: :table, + filter_url: reports_product_drives_path, + footer_options: { class: "text-center" }, + footer: link_to("See more...", donations_path( + filters: { + by_source: "Product Drive" + } + )), +) do %> + +

    + + <%= total_received_from_product_drives %> + items + received <%= @selected_date_range_label %> +

    +

    + + <%= dollar_presentation( total_received_money_donations_from_product_drives) %> + raised <%= @selected_date_range_label %> +

    +
    +

    Recent Donations from Product Drives

    + <%= render partial: "product_drive", collection: @recent_donations.by_source(:product_drive), as: :donation %> +
    + +<% end %> diff --git a/config/routes.rb b/config/routes.rb index 5a58e8d860..3e86ecc371 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -106,6 +106,7 @@ def set_up_flipper end resources :donations_summary, only: [:index] resources :manufacturer_donations_summary, only: [:index] + resources :product_drives, only: [:index] resources :itemized_donations, only: [:index] resources :itemized_distributions, only: [:index] resources :activity_graph, only: [:index] diff --git a/spec/requests/reports/product_drives_spec.rb b/spec/requests/reports/product_drives_spec.rb new file mode 100644 index 0000000000..c96bb897c8 --- /dev/null +++ b/spec/requests/reports/product_drives_spec.rb @@ -0,0 +1,36 @@ +require "rails_helper" + +RSpec.describe "Reports::ProductDrives", type: :request do + let(:default_params) do + {organization_id: @organization.to_param} + end + + describe "while signed in" do + before do + sign_in @user + end + + describe "GET #index" do + subject do + get reports_product_drives_path(default_params.merge(format: response_format)) + response + end + let(:response_format) { "html" } + + it { is_expected.to have_http_status(:success) } + end + end + + describe "while not signed in" do + describe "GET /index" do + subject do + get reports_product_drives_path(default_params) + response + end + + it "redirect to login" do + is_expected.to redirect_to(new_user_session_path) + end + end + end +end diff --git a/spec/support/pages/organization_dashboard_page.rb b/spec/support/pages/organization_dashboard_page.rb index 5b2f97a039..b72f910626 100644 --- a/spec/support/pages/organization_dashboard_page.rb +++ b/spec/support/pages/organization_dashboard_page.rb @@ -12,18 +12,6 @@ def create_new_donation end end - def product_drive_total_donations - within product_drives_section do - parse_formatted_integer find(".total_received_donations").text - end - end - - def product_drive_total_money_raised - within product_drives_section do - parse_formatted_currency find(".total_money_raised").text - end - end - def filter_to_date_range(range_name, custom_dates = nil) select_date_filter_range range_name @@ -52,10 +40,6 @@ def has_add_storage_location_call_to_action? has_selector? "#org-stats-call-to-action-storage-locations" end - def has_product_drives_section? - has_selector? product_drives_selector - end - def has_getting_started_guide? has_selector? "#getting-started-guide" end @@ -94,12 +78,6 @@ def organization_logo_filepath find(org_logo_selector).native[:src] end - def recent_product_drive_donation_links - within product_drives_section do - all(".donation a").map(&:text) - end - end - def recent_donation_links within donations_section do all(".donation a").map(&:text) @@ -178,14 +156,6 @@ def low_inventory_selector "#low_inventory" end - def product_drives_section - find product_drives_selector - end - - def product_drives_selector - "#product_drives" - end - def donations_section find "#donations" end diff --git a/spec/support/pages/organization_reports_product_drives_page.rb b/spec/support/pages/organization_reports_product_drives_page.rb new file mode 100644 index 0000000000..43f82afb6c --- /dev/null +++ b/spec/support/pages/organization_reports_product_drives_page.rb @@ -0,0 +1,37 @@ +require_relative "organization_page" + +class OrganizationReportsProductDrivesPage < OrganizationPage + def org_page_path + "reports/product_drives" + end + + def product_drive_total_donations + within product_drives_section do + parse_formatted_integer find(".total_received_donations").text + end + end + + def product_drive_total_money_raised + within product_drives_section do + parse_formatted_currency find(".total_money_raised").text + end + end + + def has_product_drives_section? + has_selector? product_drives_selector + end + + def recent_product_drive_donation_links + within product_drives_section do + all(".donation a").map(&:text) + end + end + + def product_drives_section + find product_drives_selector + end + + def product_drives_selector + "#product_drives" + end +end diff --git a/spec/system/dashboard_system_spec.rb b/spec/system/dashboard_system_spec.rb index f1398c404c..0b3edffbec 100644 --- a/spec/system/dashboard_system_spec.rb +++ b/spec/system/dashboard_system_spec.rb @@ -114,197 +114,6 @@ end end - test_time = Time.zone.now - - # 1, 20, 300, ..., 900000000 - # assuming each value is used once, summing these values makes easily recognizable totals - # .fetch() from it so too-high indices raise IndexError - # legal indices are in -8..8 (i.e., inclusive) - item_quantities = (1..9).map { |i| i * 10**(i - 1) } - - describe "Product Drives" do - around do |example| - travel_to(test_time) - example.run - travel_back - end - - it "has a widget for product drive summary data" do - org_dashboard_page.visit - - expect(org_dashboard_page).to have_product_drives_section - end - - # as of 28 Jan 2022, the "Recent Donations" list shows up to this many items matching the date filter - max_recent_donation_links_count = 3 - - # Make up to this many (inclusive) donations for each filtered period - # Keep it below (item_quantities.size - 1) so there's at least 2 values left for - # Donations outside of the filtered period - max_donations_in_filtered_period = max_recent_donation_links_count + 1 - - def create_next_product_drive_donation(donation_date:) - quantity_in_donation = @item_quantity.next - drive = @product_drives.sample - - create :product_drive_donation, :with_items, product_drive: drive.drive, product_drive_participant: @product_drive_participant, issued_at: donation_date, item_quantity: quantity_in_donation, storage_location: storage_location, organization: @organization, - money_raised: @money_raised_on_each_product_drive - - OpenStruct.new drive_name: drive.name, quantity: quantity_in_donation, money_raised: @money_raised_on_each_product_drive - end - - [ - # rubocop:disable Layout/ExtraSpacing, Layout/SpaceAroundOperators - ["Today", test_time, test_time], - ["Yesterday", test_time.yesterday, test_time.yesterday], - ["Last 7 Days", test_time - 6.days, test_time], - ["Last 30 Days", test_time - 29.days, test_time], - ["This Month", test_time.beginning_of_month, test_time.end_of_month], - ["Last Month", test_time.last_month.beginning_of_month, test_time.last_month.end_of_month], - ["This Year", test_time.beginning_of_year, test_time.end_of_year], - - # We now can't test the lower limit of All Time, because the earliest possible date is 2000-01-01 - # ["All Time", test_time - 100.years, test_time], - [nil, test_time - 2.years, test_time - rand(180).days, :set_custom_dates] # arbitrary values - # rubocop:enable Layout/ExtraSpacing, Layout/SpaceAroundOperators - ].each do |date_range_info| - filtered_date_range_label, start_date, end_date, set_custom_dates = date_range_info - - filtered_date_range = start_date.to_date..end_date.to_date - before_filtered_date_range = start_date.yesterday.to_date - after_filtered_date_range = end_date.tomorrow.to_date - - start_date_formatted, end_date_formatted = [start_date, end_date].map { _1.to_formatted_s(:date_picker) } - - # Ideally different date ranges get different counts (incl. 0!) to test the various combinations - # w/out making a fixed pattern - num_donations_in_filtered_period = rand(0..max_donations_in_filtered_period) - - context "given 1 Product Drive Donation on #{before_filtered_date_range} (unless 'All Time'), " \ - "#{num_donations_in_filtered_period} during #{filtered_date_range}, and " \ - "1 on #{after_filtered_date_range}" do - custom_dates = if set_custom_dates - "#{start_date_formatted} - #{end_date_formatted}" - end - - before do - filtered_dates = filtered_date_range.to_a - - @item_quantity = item_quantities.to_enum - @money_raised_on_each_product_drive = 123 # This is arbitrary, but needs to be different than other donations - - # Create some number of Product Drives - # Keep local copy of names so examples can create expected values - # without relying on fetching info from production code - @product_drives = (1..rand(2..5)).map do - name = "Product Drive #{_1}" - OpenStruct.new name: name, drive: create(:product_drive, name: name) - end - - # days_this_year.sample in num_donations_in_filtered_period.times loop - # rather than - # days_this_year.sample(num_donations_in_filtered_period).each - # because Array#sample(n) on an Array with m Date: Sat, 23 Dec 2023 13:16:04 -0500 Subject: [PATCH 054/122] Clean out some lint [#3734] --- app/controllers/dashboard_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 69eaab808e..14b24ce30c 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -5,7 +5,6 @@ class DashboardController < ApplicationController def index setup_date_range_picker - distributions = current_organization.distributions.includes(:partner).during(helpers.selected_range) @itemized_distribution_data = DistributionItemizedBreakdownService.new(organization: current_organization, distribution_ids: distributions.pluck(:id)).fetch From 517d0fbdd01c99b7ae596dd0fe67b33d812dae84 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 23 Dec 2023 15:45:04 -0500 Subject: [PATCH 055/122] Fix page helper for product drive report spec [#3734] --- spec/system/reports/product_drives_spec.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/spec/system/reports/product_drives_spec.rb b/spec/system/reports/product_drives_spec.rb index 48fef5ea3c..1d6ee1f630 100644 --- a/spec/system/reports/product_drives_spec.rb +++ b/spec/system/reports/product_drives_spec.rb @@ -28,9 +28,9 @@ end it "has a widget for product drive summary data" do - product_drives_report_page.visit + org_reports_product_drives_page.visit - expect(product_drives_report_page).to have_product_drives_section + expect(org_reports_product_drives_page).to have_product_drives_section end # as of 28 Jan 2022, the "Recent Donations" list shows up to this many items matching the date filter @@ -113,7 +113,7 @@ def create_next_product_drive_donation(donation_date:) describe("filtering to '#{filtered_date_range_label}'" + (set_custom_dates ? " (#{custom_dates})" : "")) do before do - product_drives_report_page + org_reports_product_drives_page .visit .filter_to_date_range(filtered_date_range_label, custom_dates) end @@ -121,15 +121,15 @@ def create_next_product_drive_donation(donation_date:) expected_recent_donation_links_count = [max_recent_donation_links_count, num_donations_in_filtered_period].min it "shows the correct total donations" do - expect(product_drives_report_page.product_drive_total_donations).to eq @donations_in_filtered_date_range.map(&:quantity).sum + expect(org_reports_product_drives_page.product_drive_total_donations).to eq @donations_in_filtered_date_range.map(&:quantity).sum end it "shows the correct total money raised" do - expect(product_drives_report_page.product_drive_total_money_raised).to eq @donations_in_filtered_date_range.map(&:money_raised).sum + expect(org_reports_product_drives_page.product_drive_total_money_raised).to eq @donations_in_filtered_date_range.map(&:money_raised).sum end it "shows #{expected_recent_donation_links_count} Recent Donation link(s)" do - recent_donation_links = product_drives_report_page.recent_product_drive_donation_links + recent_donation_links = org_reports_product_drives_page.recent_product_drive_donation_links expect(recent_donation_links.count).to eq expected_recent_donation_links_count @@ -173,19 +173,19 @@ def create_next_product_drive_donation(donation_date:) manufacturer = create :manufacturer, name: "Manufacturer for product drive test", organization: @organization create :manufacturer_donation, :with_items, manufacturer: manufacturer, issued_at: test_time, item_quantity: quantity_in_donation, storage_location: storage_location, organization: @organization, money_raised: @money_raised_on_each_manufacturer_donation - product_drives_report_page.visit + org_reports_product_drives_page.visit end it "only counts product drive donations for product drive" do - expect(product_drives_report_page.product_drive_total_donations).to eq @product_drive_donations.map(&:quantity).sum + expect(org_reports_product_drives_page.product_drive_total_donations).to eq @product_drive_donations.map(&:quantity).sum end it "only counts product drive money raised" do - expect(product_drives_report_page.product_drive_total_money_raised).to eq @product_drive_donations.map(&:money_raised).sum + expect(org_reports_product_drives_page.product_drive_total_money_raised).to eq @product_drive_donations.map(&:money_raised).sum end it "only shows product drive donations as product drive donations" do - recent_donation_links = product_drives_report_page.recent_product_drive_donation_links + recent_donation_links = org_reports_product_drives_page.recent_product_drive_donation_links expect(recent_donation_links.count).to eq @product_drive_donations.count From afd8c644c021a67963f1dc19b9d5dd297a64f76f Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sun, 24 Dec 2023 07:40:14 -0500 Subject: [PATCH 056/122] Move helper method to the correct spec [#3734] --- spec/system/dashboard_system_spec.rb | 12 ------------ spec/system/reports/product_drives_spec.rb | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/spec/system/dashboard_system_spec.rb b/spec/system/dashboard_system_spec.rb index 0b3edffbec..f2e90db002 100644 --- a/spec/system/dashboard_system_spec.rb +++ b/spec/system/dashboard_system_spec.rb @@ -283,16 +283,4 @@ end end end - - def valid_bracketing_dates(date_range_info) - filtered_date_range_label, start_date, end_date, _set_custom_dates = date_range_info - before_filtered_date_range = start_date.yesterday.to_date - after_filtered_date_range = end_date.tomorrow.to_date - - if filtered_date_range_label == "All Time" - [after_filtered_date_range] - else - [before_filtered_date_range, after_filtered_date_range] - end - end end diff --git a/spec/system/reports/product_drives_spec.rb b/spec/system/reports/product_drives_spec.rb index 1d6ee1f630..44fdb57eac 100644 --- a/spec/system/reports/product_drives_spec.rb +++ b/spec/system/reports/product_drives_spec.rb @@ -203,4 +203,16 @@ def create_next_product_drive_donation(donation_date:) end end end + + def valid_bracketing_dates(date_range_info) + filtered_date_range_label, start_date, end_date, _set_custom_dates = date_range_info + before_filtered_date_range = start_date.yesterday.to_date + after_filtered_date_range = end_date.tomorrow.to_date + + if filtered_date_range_label == "All Time" + [after_filtered_date_range] + else + [before_filtered_date_range, after_filtered_date_range] + end + end end From c20401c4271393dccf2af63d254db56de59ea7ac Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sun, 24 Dec 2023 07:57:54 -0500 Subject: [PATCH 057/122] Copy page helper [#3734] --- .../organization_reports_product_drives_page.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spec/support/pages/organization_reports_product_drives_page.rb b/spec/support/pages/organization_reports_product_drives_page.rb index 43f82afb6c..e84c678191 100644 --- a/spec/support/pages/organization_reports_product_drives_page.rb +++ b/spec/support/pages/organization_reports_product_drives_page.rb @@ -34,4 +34,16 @@ def product_drives_section def product_drives_selector "#product_drives" end + + def filter_to_date_range(range_name, custom_dates = nil) + select_date_filter_range range_name + + if custom_dates.present? + fill_in :filters_date_range, with: "" + fill_in :filters_date_range, with: custom_dates + page.find(:xpath, "//*[contains(text(),'- Dashboard')]").click + end + + click_on "Filter" + end end From 6e0b771aca51256e8a118d3b534c04b97d2a8779 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sun, 24 Dec 2023 11:09:12 -0500 Subject: [PATCH 058/122] Copy helper from dashboard page [#3734] --- .../pages/organization_reports_product_drives_page.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spec/support/pages/organization_reports_product_drives_page.rb b/spec/support/pages/organization_reports_product_drives_page.rb index e84c678191..e3bbea2d20 100644 --- a/spec/support/pages/organization_reports_product_drives_page.rb +++ b/spec/support/pages/organization_reports_product_drives_page.rb @@ -35,6 +35,16 @@ def product_drives_selector "#product_drives" end + def select_date_filter_range(range_name) + find("#filters_date_range").click + + if range_name + within ".container__predefined-ranges" do + find("button", text: range_name).click + end + end + end + def filter_to_date_range(range_name, custom_dates = nil) select_date_filter_range range_name From 0919c223c8714fd462fc07ef9645ed0b1cf08f2a Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 13 Jan 2024 14:38:08 -0500 Subject: [PATCH 059/122] Click on correct header [#3734] --- spec/support/pages/organization_reports_product_drives_page.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/support/pages/organization_reports_product_drives_page.rb b/spec/support/pages/organization_reports_product_drives_page.rb index e3bbea2d20..491f90d7b9 100644 --- a/spec/support/pages/organization_reports_product_drives_page.rb +++ b/spec/support/pages/organization_reports_product_drives_page.rb @@ -51,7 +51,8 @@ def filter_to_date_range(range_name, custom_dates = nil) if custom_dates.present? fill_in :filters_date_range, with: "" fill_in :filters_date_range, with: custom_dates - page.find(:xpath, "//*[contains(text(),'- Dashboard')]").click + # clicking on page to ensure date picker closes + page.find(:xpath, "//*[contains(text(),'Product Drives')]").click end click_on "Filter" From 90389b21282a7af92ff70ec32c6dccdcb9fefbeb Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 13 Jan 2024 15:36:29 -0500 Subject: [PATCH 060/122] Remove clicking off of date range, it isn't needed [#3734] --- spec/support/pages/organization_reports_product_drives_page.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/support/pages/organization_reports_product_drives_page.rb b/spec/support/pages/organization_reports_product_drives_page.rb index 491f90d7b9..46a5e3a0e8 100644 --- a/spec/support/pages/organization_reports_product_drives_page.rb +++ b/spec/support/pages/organization_reports_product_drives_page.rb @@ -51,8 +51,6 @@ def filter_to_date_range(range_name, custom_dates = nil) if custom_dates.present? fill_in :filters_date_range, with: "" fill_in :filters_date_range, with: custom_dates - # clicking on page to ensure date picker closes - page.find(:xpath, "//*[contains(text(),'Product Drives')]").click end click_on "Filter" From dbff0afc722a5419952486dc99da524071562421 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 13 Jan 2024 16:12:24 -0500 Subject: [PATCH 061/122] Rename to include summary [#3734] --- ...troller.rb => product_drives_summary_controller.rb} | 2 +- app/views/layouts/_lte_sidebar.html.erb | 10 +++++----- .../_product_drive.html.erb | 0 .../index.html.erb | 8 ++------ config/routes.rb | 2 +- ...t_drives_spec.rb => product_drives_summary_spec.rb} | 8 ++++---- 6 files changed, 13 insertions(+), 17 deletions(-) rename app/controllers/reports/{product_drives_controller.rb => product_drives_summary_controller.rb} (70%) rename app/views/reports/{product_drives => product_drives_summary}/_product_drive.html.erb (100%) rename app/views/reports/{product_drives => product_drives_summary}/index.html.erb (83%) rename spec/requests/reports/{product_drives_spec.rb => product_drives_summary_spec.rb} (63%) diff --git a/app/controllers/reports/product_drives_controller.rb b/app/controllers/reports/product_drives_summary_controller.rb similarity index 70% rename from app/controllers/reports/product_drives_controller.rb rename to app/controllers/reports/product_drives_summary_controller.rb index 577a0981e8..82163411a4 100644 --- a/app/controllers/reports/product_drives_controller.rb +++ b/app/controllers/reports/product_drives_summary_controller.rb @@ -1,4 +1,4 @@ -class Reports::ProductDrivesController < ApplicationController +class Reports::ProductDrivesSummaryController < ApplicationController def index setup_date_range_picker @donations = current_organization.donations.during(helpers.selected_range) diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 0bc4027948..20ba188ae1 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -170,8 +170,8 @@
    • -
  • '> - '> +
  • '> + '>

    Reporting & Auditing @@ -205,9 +205,9 @@ Manufacturer Donations <% end %>

    • -
  • - <%= link_to(reports_product_drives_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/product_drives'])}") do %> - Product Drives +
  • + <%= link_to(reports_product_drives_summary_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/product_drives_summary'])}") do %> + Product Drives Summary <% end %>
  • diff --git a/app/views/reports/product_drives/_product_drive.html.erb b/app/views/reports/product_drives_summary/_product_drive.html.erb similarity index 100% rename from app/views/reports/product_drives/_product_drive.html.erb rename to app/views/reports/product_drives_summary/_product_drive.html.erb diff --git a/app/views/reports/product_drives/index.html.erb b/app/views/reports/product_drives_summary/index.html.erb similarity index 83% rename from app/views/reports/product_drives/index.html.erb rename to app/views/reports/product_drives_summary/index.html.erb index e451492158..5d3198384e 100644 --- a/app/views/reports/product_drives/index.html.erb +++ b/app/views/reports/product_drives_summary/index.html.erb @@ -5,13 +5,9 @@ title: "Product Drives", subtitle: @selected_date_range, type: :table, - filter_url: reports_product_drives_path, + filter_url: reports_product_drives_summary_index_path, footer_options: { class: "text-center" }, - footer: link_to("See more...", donations_path( - filters: { - by_source: "Product Drive" - } - )), + footer: link_to("See more...", product_drives_path), ) do %>

    diff --git a/config/routes.rb b/config/routes.rb index 3e86ecc371..e1ab32bf3f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -106,7 +106,7 @@ def set_up_flipper end resources :donations_summary, only: [:index] resources :manufacturer_donations_summary, only: [:index] - resources :product_drives, only: [:index] + resources :product_drives_summary, only: [:index] resources :itemized_donations, only: [:index] resources :itemized_distributions, only: [:index] resources :activity_graph, only: [:index] diff --git a/spec/requests/reports/product_drives_spec.rb b/spec/requests/reports/product_drives_summary_spec.rb similarity index 63% rename from spec/requests/reports/product_drives_spec.rb rename to spec/requests/reports/product_drives_summary_spec.rb index c96bb897c8..2d3e7458f2 100644 --- a/spec/requests/reports/product_drives_spec.rb +++ b/spec/requests/reports/product_drives_summary_spec.rb @@ -1,6 +1,6 @@ require "rails_helper" -RSpec.describe "Reports::ProductDrives", type: :request do +RSpec.describe "Reports::ProductDrivesSummary", type: :request do let(:default_params) do {organization_id: @organization.to_param} end @@ -12,7 +12,7 @@ describe "GET #index" do subject do - get reports_product_drives_path(default_params.merge(format: response_format)) + get reports_product_drives_summary_index_path(default_params.merge(format: response_format)) response end let(:response_format) { "html" } @@ -24,12 +24,12 @@ describe "while not signed in" do describe "GET /index" do subject do - get reports_product_drives_path(default_params) + get reports_product_drives_summary_index_path(default_params) response end it "redirect to login" do - is_expected.to redirect_to(new_user_session_path) + is_expected.to redirect_to(new_user_session_summary_index_path) end end end From a216b66bf49bae3eb80ea0dffc238983d5b5d99a Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 13 Jan 2024 16:19:24 -0500 Subject: [PATCH 062/122] Update tests to have Summary in the name [#3734] --- ...rb => organization_reports_product_drives_summary_page.rb} | 4 ++-- ...{product_drives_spec.rb => product_drives_summary_spec.rb} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename spec/support/pages/{organization_reports_product_drives_page.rb => organization_reports_product_drives_summary_page.rb} (91%) rename spec/system/reports/{product_drives_spec.rb => product_drives_summary_spec.rb} (98%) diff --git a/spec/support/pages/organization_reports_product_drives_page.rb b/spec/support/pages/organization_reports_product_drives_summary_page.rb similarity index 91% rename from spec/support/pages/organization_reports_product_drives_page.rb rename to spec/support/pages/organization_reports_product_drives_summary_page.rb index 46a5e3a0e8..cf55af34cc 100644 --- a/spec/support/pages/organization_reports_product_drives_page.rb +++ b/spec/support/pages/organization_reports_product_drives_summary_page.rb @@ -1,8 +1,8 @@ require_relative "organization_page" -class OrganizationReportsProductDrivesPage < OrganizationPage +class OrganizationReportsProductDrivesSummaryPage < OrganizationPage def org_page_path - "reports/product_drives" + "reports/product_drives_summary" end def product_drive_total_donations diff --git a/spec/system/reports/product_drives_spec.rb b/spec/system/reports/product_drives_summary_spec.rb similarity index 98% rename from spec/system/reports/product_drives_spec.rb rename to spec/system/reports/product_drives_summary_spec.rb index 44fdb57eac..565d654dbd 100644 --- a/spec/system/reports/product_drives_spec.rb +++ b/spec/system/reports/product_drives_summary_spec.rb @@ -1,7 +1,7 @@ -RSpec.describe "ProductDrives Report", type: :system, js: true do +RSpec.describe "Product Drives Summary Report", type: :system, js: true do let!(:storage_location) { create(:storage_location, :with_items, item_quantity: 0, organization: @organization) } let(:org_short_name) { @organization.short_name } - let(:org_reports_product_drives_page) { OrganizationReportsProductDrivesPage.new org_short_name: org_short_name } + let(:org_reports_product_drives_page) { OrganizationReportsProductDrivesSummaryPage.new org_short_name: org_short_name } before do @url_prefix = "/#{@organization.short_name}" From 444aa490e959d32fed61a462cccad640a68f7390 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 13 Jan 2024 16:27:01 -0500 Subject: [PATCH 063/122] Revert accidental path change [#3734] --- spec/requests/reports/product_drives_summary_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/requests/reports/product_drives_summary_spec.rb b/spec/requests/reports/product_drives_summary_spec.rb index 2d3e7458f2..80bd26da9b 100644 --- a/spec/requests/reports/product_drives_summary_spec.rb +++ b/spec/requests/reports/product_drives_summary_spec.rb @@ -29,7 +29,7 @@ end it "redirect to login" do - is_expected.to redirect_to(new_user_session_summary_index_path) + is_expected.to redirect_to(new_user_session_path) end end end From 9c738a2097edd40fc4dc2f358b2b340f79f6007f Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 13 Jan 2024 17:50:10 -0500 Subject: [PATCH 064/122] Add filter to mfg donation report and tune style [#3735] --- .../index.html.erb | 62 ++++++++++--------- app/views/shared/_filtered_card.html.erb | 6 +- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/app/views/reports/manufacturer_donations_summary/index.html.erb b/app/views/reports/manufacturer_donations_summary/index.html.erb index 561bd1740b..68343a7818 100644 --- a/app/views/reports/manufacturer_donations_summary/index.html.erb +++ b/app/views/reports/manufacturer_donations_summary/index.html.erb @@ -1,29 +1,33 @@ - <%= render( - "shared/card", - id: "manufacturers", - gradient: "success", - title: "Manufacturer Donations", - subtitle: @selected_date_range, - footer_options: { class: "text-center" }, - footer: link_to("See more...", donations_path( - filters: { - by_source: "Manufacturer" - } - )), - ) do %> - <%= new_button_to new_donation_path, {text: "New Donation"} %> -

    - - <%= number_with_delimiter(@recent_donations_from_manufacturers.sum { |d| d.line_items.total }) %> - - items donated <%= @selected_date_range_label %> - by - - <%= pluralize(@recent_donations_from_manufacturers.group_by(&:manufacturer).count, 'Manufacturer') %> - -

    -
    -

    Top Manufacturer Donations

    - <%= render partial: "manufacturer", collection: @top_manufacturers, as: :manufacturer %> -
    - <% end %> \ No newline at end of file + +<%= render( + "shared/filtered_card", + id: "manufacturers", + gradient: "success", + title: "Manufacturer Donations", + subtitle: @selected_date_range, + filter_url: reports_manufacturer_donations_summary_index_path, + footer_options: { class: "text-center" }, + footer: link_to("See more...", donations_path( + filters: { + by_source: "Manufacturer" + } + )), +) do %> + + <%= new_button_to new_donation_path, {text: "New Donation"} %> +

    + + <%= number_with_delimiter(@recent_donations_from_manufacturers.sum { |d| d.line_items.total }) %> + + items donated <%= @selected_date_range_label %> + by + + <%= pluralize(@recent_donations_from_manufacturers.group_by(&:manufacturer).count, 'Manufacturer') %> + +

    +
    +

    Top Manufacturer Donations

    + <%= render partial: "manufacturer", collection: @top_manufacturers, as: :manufacturer %> +
    + +<% end %> diff --git a/app/views/shared/_filtered_card.html.erb b/app/views/shared/_filtered_card.html.erb index 2c3717f721..8fb5a9694d 100644 --- a/app/views/shared/_filtered_card.html.erb +++ b/app/views/shared/_filtered_card.html.erb @@ -10,9 +10,9 @@
    - <%= simple_form_for :filters, url: filter_url, method: :get do |f| %> - <%= render partial: "shared/date_range_picker", locals: {css_class: "form-control"} %>
    - <%= filter_button %> + <%= simple_form_for :filters, url: filter_url, method: :get, html: {class: 'd-flex'} do |f| %> + <%= render partial: "shared/date_range_picker", locals: {css_class: "form-control col-10"} %>
    + <%= filter_button class: 'col-2' %> <% end %>
    From 831d4b0e68a272f9e8827b6a672b97dd8e2c3efa Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 13 Jan 2024 19:25:56 -0500 Subject: [PATCH 065/122] Add basic request specs for some reports [#4029] --- .../reports/itemized_distributions_spec.rb | 36 +++++++++++++++++++ .../manufacturer_donations_summary_spec.rb | 36 +++++++++++++++++++ .../itemized_distributions_spec.rb} | 0 .../itemized_donations_spec.rb} | 0 4 files changed, 72 insertions(+) create mode 100644 spec/requests/reports/itemized_distributions_spec.rb create mode 100644 spec/requests/reports/manufacturer_donations_summary_spec.rb rename spec/system/{report_itemized_distributions_spec.rb => reports/itemized_distributions_spec.rb} (100%) rename spec/system/{report_itemized_donations_spec.rb => reports/itemized_donations_spec.rb} (100%) diff --git a/spec/requests/reports/itemized_distributions_spec.rb b/spec/requests/reports/itemized_distributions_spec.rb new file mode 100644 index 0000000000..4427fdc4bc --- /dev/null +++ b/spec/requests/reports/itemized_distributions_spec.rb @@ -0,0 +1,36 @@ +require "rails_helper" + +RSpec.describe "Reports::ItemizedDistributions", type: :request do + let(:default_params) do + {organization_id: @organization.to_param} + end + + describe "while signed in" do + before do + sign_in @user + end + + describe "GET #index" do + subject do + get reports_itemized_distributions_path(default_params.merge(format: response_format)) + response + end + let(:response_format) { "html" } + + it { is_expected.to have_http_status(:success) } + end + end + + describe "while not signed in" do + describe "GET /index" do + subject do + get reports_itemized_distributions_path(default_params) + response + end + + it "redirect to login" do + is_expected.to redirect_to(new_user_session_path) + end + end + end +end diff --git a/spec/requests/reports/manufacturer_donations_summary_spec.rb b/spec/requests/reports/manufacturer_donations_summary_spec.rb new file mode 100644 index 0000000000..c9a9b7c26a --- /dev/null +++ b/spec/requests/reports/manufacturer_donations_summary_spec.rb @@ -0,0 +1,36 @@ +require "rails_helper" + +RSpec.describe "Reports::ManufacturerDonationsSummary", type: :request do + let(:default_params) do + {organization_id: @organization.to_param} + end + + describe "while signed in" do + before do + sign_in @user + end + + describe "GET #index" do + subject do + get reports_manufacturer_donations_summary_index_path(default_params.merge(format: response_format)) + response + end + let(:response_format) { "html" } + + it { is_expected.to have_http_status(:success) } + end + end + + describe "while not signed in" do + describe "GET /index" do + subject do + get reports_manufacturer_donations_summary_index_path(default_params) + response + end + + it "redirect to login" do + is_expected.to redirect_to(new_user_session_path) + end + end + end +end diff --git a/spec/system/report_itemized_distributions_spec.rb b/spec/system/reports/itemized_distributions_spec.rb similarity index 100% rename from spec/system/report_itemized_distributions_spec.rb rename to spec/system/reports/itemized_distributions_spec.rb diff --git a/spec/system/report_itemized_donations_spec.rb b/spec/system/reports/itemized_donations_spec.rb similarity index 100% rename from spec/system/report_itemized_donations_spec.rb rename to spec/system/reports/itemized_donations_spec.rb From 36c0704a239ef9db3d3ac5d1cf44f8a65add4f41 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 13 Jan 2024 23:15:55 -0500 Subject: [PATCH 066/122] Remove date-filter, other unused queries, and obey Bullet [#3724] --- app/controllers/dashboard_controller.rb | 21 ++++-------------- app/views/dashboard/index.html.erb | 10 --------- .../pages/organization_dashboard_page.rb | 22 ------------------- spec/system/dashboard_system_spec.rb | 8 ------- 4 files changed, 4 insertions(+), 57 deletions(-) diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 14b24ce30c..7474ad8dfa 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -3,26 +3,13 @@ class DashboardController < ApplicationController respond_to :html, :js def index - setup_date_range_picker - - distributions = current_organization.distributions.includes(:partner).during(helpers.selected_range) - @itemized_distribution_data = DistributionItemizedBreakdownService.new(organization: current_organization, distribution_ids: distributions.pluck(:id)).fetch - - @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.during(helpers.selected_range).by_source(:manufacturer) - @top_manufacturers = current_organization.manufacturers.by_donation_count - + @total_inventory = current_organization.total_inventory @partners_awaiting_review = current_organization.partners.awaiting_review + @outstanding_requests = Request.includes([:partner, :partner_user]).where(status: %i[pending started]).order(:created_at) + @low_inventory_report = LowInventoryQuery.call(current_organization) + # passing nil here filters the announcements that didn't come from an organization @broadcast_announcements = BroadcastAnnouncement.filter_announcements(nil) - - @outstanding_requests = Request.where(status: %i[pending started]).order(:created_at) - - @low_inventory_report = LowInventoryQuery.call(current_organization) end end diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 949d84ac08..258f44f5a3 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -25,16 +25,6 @@ header: content_tag(:h5, current_organization.name, class: "card-title"), footer: capture { %>
    -
    -
    - <%= simple_form_for :filters, url: dashboard_path(current_organization), method: :get do |f| %> - <%= render partial: "shared/date_range_picker", locals: {css_class: "form-control"} %>
    - <%= filter_button %> - <% end %> -
    - -
    -

    Items on-hand:

    diff --git a/spec/support/pages/organization_dashboard_page.rb b/spec/support/pages/organization_dashboard_page.rb index b72f910626..0b8e96720d 100644 --- a/spec/support/pages/organization_dashboard_page.rb +++ b/spec/support/pages/organization_dashboard_page.rb @@ -12,18 +12,6 @@ def create_new_donation end end - def filter_to_date_range(range_name, custom_dates = nil) - select_date_filter_range range_name - - if custom_dates.present? - fill_in :filters_date_range, with: "" - fill_in :filters_date_range, with: custom_dates - page.find(:xpath, "//*[contains(text(),'- Dashboard')]").click - end - - click_on "Filter" - end - def has_add_donation_site_call_to_action? has_selector? "#org-stats-call-to-action-donation-sites" end @@ -90,16 +78,6 @@ def top_manufacturer_donation_links end end - def select_date_filter_range(range_name) - find("#filters_date_range").click - - if range_name - within ".container__predefined-ranges" do - find("button", text: range_name).click - end - end - end - def summary_section find "#summary" end diff --git a/spec/system/dashboard_system_spec.rb b/spec/system/dashboard_system_spec.rb index f2e90db002..d8a6a0eaca 100644 --- a/spec/system/dashboard_system_spec.rb +++ b/spec/system/dashboard_system_spec.rb @@ -103,14 +103,6 @@ it "displays the on-hand totals" do expect(org_dashboard_page.summary_section.text).to include "on-hand" end - - context "when constrained to date range" do - it "does not change" do - expect { org_dashboard_page.select_date_filter_range "Last Month" } - .not_to change { org_dashboard_page.total_inventory } - .from 333 - end - end end end From b272b9132a0ca7a99afddba2c6a35f79d26d2367 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 13 Jan 2024 23:27:42 -0500 Subject: [PATCH 067/122] Filter on counties report directly [#3724] --- spec/system/distributions_by_county_system_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spec/system/distributions_by_county_system_spec.rb b/spec/system/distributions_by_county_system_spec.rb index bb7d321a91..200263ffeb 100644 --- a/spec/system/distributions_by_county_system_spec.rb +++ b/spec/system/distributions_by_county_system_spec.rb @@ -42,6 +42,10 @@ def visit_distribution_by_county_with_specified_date_range(date_range_string) visit dashboard_path(default_params) + + click_on "Reporting & Auditing" + click_on "Distributions by County" + find("#filters_date_range").click within ".container__predefined-ranges" do @@ -49,7 +53,5 @@ def visit_distribution_by_county_with_specified_date_range(date_range_string) end click_on "Filter" - click_on "Reporting & Auditing" - click_on "Distributions by County" end end From 55d36e4d91127e9df4ea8d44890be95c1d29e812 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 10 Feb 2024 14:31:27 -0500 Subject: [PATCH 068/122] Clean out erb lint --- app/views/dashboard/_low_inventory_report.html.erb | 2 +- app/views/dashboard/index.html.erb | 2 +- app/views/purchases_summary/_purchase.html.erb | 1 - app/views/reports/activity_graph/index.html.erb | 4 ++-- app/views/shared/_card.html.erb | 6 +++--- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/views/dashboard/_low_inventory_report.html.erb b/app/views/dashboard/_low_inventory_report.html.erb index f01eab8642..805dc09f42 100644 --- a/app/views/dashboard/_low_inventory_report.html.erb +++ b/app/views/dashboard/_low_inventory_report.html.erb @@ -37,4 +37,4 @@ <% end %> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 3cdca62530..a162cc6d89 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -162,7 +162,7 @@ <%= view_button_to partner_path(partner) + "#partner-information", { text: "Review Application", icon: "check", type: "warning", class: 'badge' } %> - <%end%> + <% end %> <% else %> No partners waiting for approval diff --git a/app/views/purchases_summary/_purchase.html.erb b/app/views/purchases_summary/_purchase.html.erb index 86344a45a1..dfa4b79ddb 100644 --- a/app/views/purchases_summary/_purchase.html.erb +++ b/app/views/purchases_summary/_purchase.html.erb @@ -7,4 +7,3 @@
    <%= distance_of_time_in_words_to_now purchase.created_at %> ago
    - diff --git a/app/views/reports/activity_graph/index.html.erb b/app/views/reports/activity_graph/index.html.erb index 88c4535826..de410b0b1a 100644 --- a/app/views/reports/activity_graph/index.html.erb +++ b/app/views/reports/activity_graph/index.html.erb @@ -41,8 +41,8 @@ } ] }.to_json - %> -
    + %> +
    diff --git a/app/views/shared/_card.html.erb b/app/views/shared/_card.html.erb index a590448a3b..539a9da4a3 100644 --- a/app/views/shared/_card.html.erb +++ b/app/views/shared/_card.html.erb @@ -32,7 +32,8 @@ content_tag :h3, title, class: "card-title" end - content_tag(:div, **header_options) do %> + content_tag(:div, **header_options) do + %> <%= header %>
    <% if type == :table %> @@ -46,8 +47,7 @@ <% end %>
    <% end - end - %> + end %> <% case type.to_sym when :box %>
    From a6371f79ade7662e2b433c8b2add380c1289a43d Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 10 Feb 2024 15:37:06 -0500 Subject: [PATCH 069/122] Fix expectations to work with cuprite --- spec/system/dashboard_system_spec.rb | 4 ++-- spec/system/distribution_system_spec.rb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/system/dashboard_system_spec.rb b/spec/system/dashboard_system_spec.rb index d8a6a0eaca..8f427123ce 100644 --- a/spec/system/dashboard_system_spec.rb +++ b/spec/system/dashboard_system_spec.rb @@ -266,8 +266,8 @@ org_dashboard_page.visit expect(org_dashboard_page).to have_low_inventory_section inventories = org_dashboard_page.low_inventories - minimum_item = "#{storage_location.name} #{below_minimum_item.name} 100 150 200" - recommended_item = "#{storage_location.name} #{below_recommended_item.name} 100 0 200" + minimum_item = "#{storage_location.name}\t#{below_minimum_item.name}\t100\t150\t200" + recommended_item = "#{storage_location.name}\t#{below_recommended_item.name}\t100\t0\t200" expect(inventories.count).to eq 2 expect(inventories).to include minimum_item expect(inventories).to include recommended_item diff --git a/spec/system/distribution_system_spec.rb b/spec/system/distribution_system_spec.rb index be932bd95c..e28c2a5616 100644 --- a/spec/system/distribution_system_spec.rb +++ b/spec/system/distribution_system_spec.rb @@ -113,6 +113,7 @@ visit @url_prefix + "/distributions/new" select @partner.name, from: "Partner" select @storage_location.name, from: "From storage location" + page.driver.wait_for_network_idle select item.name, from: "distribution_line_items_attributes_0_item_id" select @storage_location.name, from: "distribution_storage_location_id" fill_in "distribution_line_items_attributes_0_quantity", with: 18 From b5dcff00b3259545f84f49192c333fba00e88eb2 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 10 Feb 2024 20:38:10 -0500 Subject: [PATCH 070/122] Wait for submenu to show before clicking through --- spec/system/distributions_by_county_system_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/system/distributions_by_county_system_spec.rb b/spec/system/distributions_by_county_system_spec.rb index 200263ffeb..c5b0060a0d 100644 --- a/spec/system/distributions_by_county_system_spec.rb +++ b/spec/system/distributions_by_county_system_spec.rb @@ -44,6 +44,7 @@ def visit_distribution_by_county_with_specified_date_range(date_range_string) visit dashboard_path(default_params) click_on "Reporting & Auditing" + find('.menu-open a', text: "Distributions by County") click_on "Distributions by County" find("#filters_date_range").click From 128ff44dcdc1b901e47e368c406f75649675f183 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 10 Feb 2024 20:47:25 -0500 Subject: [PATCH 071/122] Clean out some rubocop lint --- spec/system/distributions_by_county_system_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/system/distributions_by_county_system_spec.rb b/spec/system/distributions_by_county_system_spec.rb index c5b0060a0d..519fea7ad5 100644 --- a/spec/system/distributions_by_county_system_spec.rb +++ b/spec/system/distributions_by_county_system_spec.rb @@ -44,7 +44,7 @@ def visit_distribution_by_county_with_specified_date_range(date_range_string) visit dashboard_path(default_params) click_on "Reporting & Auditing" - find('.menu-open a', text: "Distributions by County") + find(".menu-open a", text: "Distributions by County") click_on "Distributions by County" find("#filters_date_range").click From f40cbceb59f2f5bc8dd9010ec92a84cb9b799c47 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 10 Feb 2024 22:03:07 -0500 Subject: [PATCH 072/122] Move donations summary into main reports controller --- app/controllers/reports_controller.rb | 8 ++++++++ app/views/layouts/_lte_sidebar.html.erb | 2 +- .../reports/{donations_summary => }/_donation.html.erb | 0 .../index.html.erb => donations_summary.html.erb} | 4 ++-- config/routes.rb | 2 +- spec/requests/reports/donations_summary_spec.rb | 4 ++-- 6 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 app/controllers/reports_controller.rb rename app/views/reports/{donations_summary => }/_donation.html.erb (100%) rename app/views/reports/{donations_summary/index.html.erb => donations_summary.html.erb} (81%) diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb new file mode 100644 index 0000000000..9032e9c8cc --- /dev/null +++ b/app/controllers/reports_controller.rb @@ -0,0 +1,8 @@ +class ReportsController < ApplicationController + def donations_summary + setup_date_range_picker + + @donations = current_organization.donations.during(helpers.selected_range) + @recent_donations = @donations.recent + end +end diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 20ba188ae1..f5ecfb1c17 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -196,7 +196,7 @@ <% end %>

  • - <%= link_to(reports_donations_summary_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/donations_summary'])}") do %> + <%= link_to(reports_donations_summary_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/donations_summary'])}") do %> Donations Summary <% end %>
    • diff --git a/app/views/reports/donations_summary/_donation.html.erb b/app/views/reports/_donation.html.erb similarity index 100% rename from app/views/reports/donations_summary/_donation.html.erb rename to app/views/reports/_donation.html.erb diff --git a/app/views/reports/donations_summary/index.html.erb b/app/views/reports/donations_summary.html.erb similarity index 81% rename from app/views/reports/donations_summary/index.html.erb rename to app/views/reports/donations_summary.html.erb index 4343938bfd..6c46da6515 100644 --- a/app/views/reports/donations_summary/index.html.erb +++ b/app/views/reports/donations_summary.html.erb @@ -5,7 +5,7 @@ subtitle: @selected_date_range, footer_options: { class: "text-center" }, footer: link_to("See more...", donations_path), - filter_url: reports_donations_summary_index_path + filter_url: reports_donations_summary_path ) do %> <%= new_button_to new_donation_path, {text: "New Donation"} %>

    @@ -21,7 +21,7 @@

    Recent Donations

    - <%= render partial: "reports/donations_summary/donation", collection: @recent_donations, as: :donation %> + <%= render partial: "donation", collection: @recent_donations, as: :donation %>
    <% end %> diff --git a/config/routes.rb b/config/routes.rb index 7d93f68253..5ae0fa74cf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -104,7 +104,7 @@ def set_up_flipper resources :annual_reports, only: [:index, :show], param: :year do post :recalculate, on: :member end - resources :donations_summary, only: [:index] + get :donations_summary resources :manufacturer_donations_summary, only: [:index] resources :product_drives_summary, only: [:index] resources :itemized_donations, only: [:index] diff --git a/spec/requests/reports/donations_summary_spec.rb b/spec/requests/reports/donations_summary_spec.rb index bd85a39c52..f6ce92b723 100644 --- a/spec/requests/reports/donations_summary_spec.rb +++ b/spec/requests/reports/donations_summary_spec.rb @@ -12,7 +12,7 @@ describe "GET #index" do subject do - get reports_donations_summary_index_path(default_params.merge(format: response_format)) + get reports_donations_summary_path(default_params.merge(format: response_format)) response end let(:response_format) { "html" } @@ -24,7 +24,7 @@ describe "while not signed in" do describe "GET /index" do subject do - get reports_donations_summary_index_path(default_params) + get reports_donations_summary_path(default_params) response end From cacb59af007c35c3572639185fb72c58550ddab7 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 10 Feb 2024 22:09:54 -0500 Subject: [PATCH 073/122] Consolidate manufacturer donations into main reports controller --- .../reports/donations_summary_controller.rb | 8 -------- .../manufacturer_donations_summary_controller.rb | 10 ---------- app/controllers/reports_controller.rb | 9 +++++++++ app/views/layouts/_lte_sidebar.html.erb | 2 +- .../_manufacturer.html.erb | 0 ...tml.erb => manufacturer_donations_summary.html.erb} | 2 +- config/routes.rb | 2 +- .../reports/manufacturer_donations_summary_spec.rb | 4 ++-- 8 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 app/controllers/reports/donations_summary_controller.rb delete mode 100644 app/controllers/reports/manufacturer_donations_summary_controller.rb rename app/views/reports/{manufacturer_donations_summary => }/_manufacturer.html.erb (100%) rename app/views/reports/{manufacturer_donations_summary/index.html.erb => manufacturer_donations_summary.html.erb} (93%) diff --git a/app/controllers/reports/donations_summary_controller.rb b/app/controllers/reports/donations_summary_controller.rb deleted file mode 100644 index 692916bc50..0000000000 --- a/app/controllers/reports/donations_summary_controller.rb +++ /dev/null @@ -1,8 +0,0 @@ -class Reports::DonationsSummaryController < ApplicationController - def index - setup_date_range_picker - - @donations = current_organization.donations.during(helpers.selected_range) - @recent_donations = @donations.recent - end -end diff --git a/app/controllers/reports/manufacturer_donations_summary_controller.rb b/app/controllers/reports/manufacturer_donations_summary_controller.rb deleted file mode 100644 index d7a6828cad..0000000000 --- a/app/controllers/reports/manufacturer_donations_summary_controller.rb +++ /dev/null @@ -1,10 +0,0 @@ -class Reports::ManufacturerDonationsSummaryController < ApplicationController - def index - setup_date_range_picker - - @recent_donations_from_manufacturers = current_organization.donations.during(helpers.selected_range).by_source(:manufacturer) - @top_manufacturers = current_organization.manufacturers.by_donation_count - @donations = current_organization.donations.during(helpers.selected_range) - @recent_donations = @donations.recent - end -end diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index 9032e9c8cc..9b4243e975 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -5,4 +5,13 @@ def donations_summary @donations = current_organization.donations.during(helpers.selected_range) @recent_donations = @donations.recent end + + def manufacturer_donations_summary + setup_date_range_picker + + @recent_donations_from_manufacturers = current_organization.donations.during(helpers.selected_range).by_source(:manufacturer) + @top_manufacturers = current_organization.manufacturers.by_donation_count + @donations = current_organization.donations.during(helpers.selected_range) + @recent_donations = @donations.recent + end end diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index f5ecfb1c17..6bf5350a45 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -201,7 +201,7 @@ <% end %>
  • - <%= link_to(reports_manufacturer_donations_summary_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/manufacturer_donations_summary'])}") do %> + <%= link_to(reports_manufacturer_donations_summary_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/manufacturer_donations_summary'])}") do %> Manufacturer Donations <% end %>
    • diff --git a/app/views/reports/manufacturer_donations_summary/_manufacturer.html.erb b/app/views/reports/_manufacturer.html.erb similarity index 100% rename from app/views/reports/manufacturer_donations_summary/_manufacturer.html.erb rename to app/views/reports/_manufacturer.html.erb diff --git a/app/views/reports/manufacturer_donations_summary/index.html.erb b/app/views/reports/manufacturer_donations_summary.html.erb similarity index 93% rename from app/views/reports/manufacturer_donations_summary/index.html.erb rename to app/views/reports/manufacturer_donations_summary.html.erb index 68343a7818..21ed6b9c93 100644 --- a/app/views/reports/manufacturer_donations_summary/index.html.erb +++ b/app/views/reports/manufacturer_donations_summary.html.erb @@ -5,7 +5,7 @@ gradient: "success", title: "Manufacturer Donations", subtitle: @selected_date_range, - filter_url: reports_manufacturer_donations_summary_index_path, + filter_url: reports_manufacturer_donations_summary_path, footer_options: { class: "text-center" }, footer: link_to("See more...", donations_path( filters: { diff --git a/config/routes.rb b/config/routes.rb index 5ae0fa74cf..cf1d8fae08 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -105,7 +105,7 @@ def set_up_flipper post :recalculate, on: :member end get :donations_summary - resources :manufacturer_donations_summary, only: [:index] + get :manufacturer_donations_summary resources :product_drives_summary, only: [:index] resources :itemized_donations, only: [:index] resources :itemized_distributions, only: [:index] diff --git a/spec/requests/reports/manufacturer_donations_summary_spec.rb b/spec/requests/reports/manufacturer_donations_summary_spec.rb index c9a9b7c26a..4954f66906 100644 --- a/spec/requests/reports/manufacturer_donations_summary_spec.rb +++ b/spec/requests/reports/manufacturer_donations_summary_spec.rb @@ -12,7 +12,7 @@ describe "GET #index" do subject do - get reports_manufacturer_donations_summary_index_path(default_params.merge(format: response_format)) + get reports_manufacturer_donations_summary_path(default_params.merge(format: response_format)) response end let(:response_format) { "html" } @@ -24,7 +24,7 @@ describe "while not signed in" do describe "GET /index" do subject do - get reports_manufacturer_donations_summary_index_path(default_params) + get reports_manufacturer_donations_summary_path(default_params) response end From a6428bf16c782123d5f0dca0613d444851135df9 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 10 Feb 2024 22:14:19 -0500 Subject: [PATCH 074/122] Consolidate product drives summary into main reports controller --- .../reports/product_drives_summary_controller.rb | 7 ------- app/controllers/reports_controller.rb | 6 ++++++ app/views/layouts/_lte_sidebar.html.erb | 2 +- .../{product_drives_summary => }/_product_drive.html.erb | 0 .../index.html.erb => product_drives_summary.html.erb} | 2 +- config/routes.rb | 2 +- spec/requests/reports/product_drives_summary_spec.rb | 4 ++-- 7 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 app/controllers/reports/product_drives_summary_controller.rb rename app/views/reports/{product_drives_summary => }/_product_drive.html.erb (100%) rename app/views/reports/{product_drives_summary/index.html.erb => product_drives_summary.html.erb} (93%) diff --git a/app/controllers/reports/product_drives_summary_controller.rb b/app/controllers/reports/product_drives_summary_controller.rb deleted file mode 100644 index 82163411a4..0000000000 --- a/app/controllers/reports/product_drives_summary_controller.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Reports::ProductDrivesSummaryController < ApplicationController - def index - setup_date_range_picker - @donations = current_organization.donations.during(helpers.selected_range) - @recent_donations = @donations.recent - end -end diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index 9b4243e975..cb1cdf3b61 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -14,4 +14,10 @@ def manufacturer_donations_summary @donations = current_organization.donations.during(helpers.selected_range) @recent_donations = @donations.recent end + + def product_drives_summary + setup_date_range_picker + @donations = current_organization.donations.during(helpers.selected_range) + @recent_donations = @donations.recent + end end diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 6bf5350a45..6befa36d44 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -206,7 +206,7 @@ <% end %>
  • - <%= link_to(reports_product_drives_summary_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/product_drives_summary'])}") do %> + <%= link_to(reports_product_drives_summary_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/product_drives_summary'])}") do %> Product Drives Summary <% end %>
    • diff --git a/app/views/reports/product_drives_summary/_product_drive.html.erb b/app/views/reports/_product_drive.html.erb similarity index 100% rename from app/views/reports/product_drives_summary/_product_drive.html.erb rename to app/views/reports/_product_drive.html.erb diff --git a/app/views/reports/product_drives_summary/index.html.erb b/app/views/reports/product_drives_summary.html.erb similarity index 93% rename from app/views/reports/product_drives_summary/index.html.erb rename to app/views/reports/product_drives_summary.html.erb index 5d3198384e..c1fdf786da 100644 --- a/app/views/reports/product_drives_summary/index.html.erb +++ b/app/views/reports/product_drives_summary.html.erb @@ -5,7 +5,7 @@ title: "Product Drives", subtitle: @selected_date_range, type: :table, - filter_url: reports_product_drives_summary_index_path, + filter_url: reports_product_drives_summary_path, footer_options: { class: "text-center" }, footer: link_to("See more...", product_drives_path), ) do %> diff --git a/config/routes.rb b/config/routes.rb index cf1d8fae08..287aa4ed98 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -106,7 +106,7 @@ def set_up_flipper end get :donations_summary get :manufacturer_donations_summary - resources :product_drives_summary, only: [:index] + get :product_drives_summary, only: [:index] resources :itemized_donations, only: [:index] resources :itemized_distributions, only: [:index] resources :activity_graph, only: [:index] diff --git a/spec/requests/reports/product_drives_summary_spec.rb b/spec/requests/reports/product_drives_summary_spec.rb index 80bd26da9b..a9ced4943a 100644 --- a/spec/requests/reports/product_drives_summary_spec.rb +++ b/spec/requests/reports/product_drives_summary_spec.rb @@ -12,7 +12,7 @@ describe "GET #index" do subject do - get reports_product_drives_summary_index_path(default_params.merge(format: response_format)) + get reports_product_drives_summary_path(default_params.merge(format: response_format)) response end let(:response_format) { "html" } @@ -24,7 +24,7 @@ describe "while not signed in" do describe "GET /index" do subject do - get reports_product_drives_summary_index_path(default_params) + get reports_product_drives_summary_path(default_params) response end From e5341ebf775d77df53c9bae8a3fe14884773953f Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 10 Feb 2024 22:20:14 -0500 Subject: [PATCH 075/122] Consolidate itemized donations report --- app/controllers/reports/itemized_donations_controller.rb | 7 ------- app/controllers/reports_controller.rb | 6 ++++++ .../index.html.erb => itemized_donations.html.erb} | 0 config/routes.rb | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 app/controllers/reports/itemized_donations_controller.rb rename app/views/reports/{itemized_donations/index.html.erb => itemized_donations.html.erb} (100%) diff --git a/app/controllers/reports/itemized_donations_controller.rb b/app/controllers/reports/itemized_donations_controller.rb deleted file mode 100644 index fa356fcb95..0000000000 --- a/app/controllers/reports/itemized_donations_controller.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Reports::ItemizedDonationsController < ApplicationController - def index - setup_date_range_picker - @donations = current_organization.donations.during(helpers.selected_range) - @itemized_donation_data = DonationItemizedBreakdownService.new(organization: current_organization, donation_ids: @donations.pluck(:id)).fetch - end -end diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index cb1cdf3b61..03ad7d374b 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -20,4 +20,10 @@ def product_drives_summary @donations = current_organization.donations.during(helpers.selected_range) @recent_donations = @donations.recent end + + def itemized_donations + setup_date_range_picker + @donations = current_organization.donations.during(helpers.selected_range) + @itemized_donation_data = DonationItemizedBreakdownService.new(organization: current_organization, donation_ids: @donations.pluck(:id)).fetch + end end diff --git a/app/views/reports/itemized_donations/index.html.erb b/app/views/reports/itemized_donations.html.erb similarity index 100% rename from app/views/reports/itemized_donations/index.html.erb rename to app/views/reports/itemized_donations.html.erb diff --git a/config/routes.rb b/config/routes.rb index 287aa4ed98..08f5c82d93 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -106,8 +106,8 @@ def set_up_flipper end get :donations_summary get :manufacturer_donations_summary - get :product_drives_summary, only: [:index] - resources :itemized_donations, only: [:index] + get :product_drives_summary + get :itemized_donations resources :itemized_distributions, only: [:index] resources :activity_graph, only: [:index] end From 2db7d1d692afdc5ec92e7991a491e565950efc0e Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 10 Feb 2024 22:23:09 -0500 Subject: [PATCH 076/122] Consolidate itemized distributions report --- .../reports/itemized_distributions_controller.rb | 7 ------- app/controllers/reports_controller.rb | 6 ++++++ .../index.html.erb => itemized_distributions.html.erb} | 0 config/routes.rb | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 app/controllers/reports/itemized_distributions_controller.rb rename app/views/reports/{itemized_distributions/index.html.erb => itemized_distributions.html.erb} (100%) diff --git a/app/controllers/reports/itemized_distributions_controller.rb b/app/controllers/reports/itemized_distributions_controller.rb deleted file mode 100644 index a1f1e68be1..0000000000 --- a/app/controllers/reports/itemized_distributions_controller.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Reports::ItemizedDistributionsController < ApplicationController - def index - setup_date_range_picker - distributions = current_organization.distributions.includes(:partner).during(helpers.selected_range) - @itemized_distribution_data = DistributionItemizedBreakdownService.new(organization: current_organization, distribution_ids: distributions.pluck(:id)).fetch - end -end diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index 03ad7d374b..9426245711 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -26,4 +26,10 @@ def itemized_donations @donations = current_organization.donations.during(helpers.selected_range) @itemized_donation_data = DonationItemizedBreakdownService.new(organization: current_organization, donation_ids: @donations.pluck(:id)).fetch end + + def itemized_distributions + setup_date_range_picker + distributions = current_organization.distributions.includes(:partner).during(helpers.selected_range) + @itemized_distribution_data = DistributionItemizedBreakdownService.new(organization: current_organization, distribution_ids: distributions.pluck(:id)).fetch + end end diff --git a/app/views/reports/itemized_distributions/index.html.erb b/app/views/reports/itemized_distributions.html.erb similarity index 100% rename from app/views/reports/itemized_distributions/index.html.erb rename to app/views/reports/itemized_distributions.html.erb diff --git a/config/routes.rb b/config/routes.rb index 08f5c82d93..3462aaa331 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -108,7 +108,7 @@ def set_up_flipper get :manufacturer_donations_summary get :product_drives_summary get :itemized_donations - resources :itemized_distributions, only: [:index] + get :itemized_distributions resources :activity_graph, only: [:index] end From 407f7382d723412ed380b02ca3a8f2527cd292d6 Mon Sep 17 00:00:00 2001 From: Brock Wilcox Date: Sat, 10 Feb 2024 22:26:14 -0500 Subject: [PATCH 077/122] Consolidate activity graph report --- .../reports/activity_graph_controller.rb | 28 ------------------- app/controllers/reports_controller.rb | 27 ++++++++++++++++++ app/views/layouts/_lte_sidebar.html.erb | 2 +- ...index.html.erb => activity_graph.html.erb} | 2 +- config/routes.rb | 2 +- spec/requests/reports/activity_graph_spec.rb | 4 +-- 6 files changed, 32 insertions(+), 33 deletions(-) delete mode 100644 app/controllers/reports/activity_graph_controller.rb rename app/views/reports/{activity_graph/index.html.erb => activity_graph.html.erb} (96%) diff --git a/app/controllers/reports/activity_graph_controller.rb b/app/controllers/reports/activity_graph_controller.rb deleted file mode 100644 index 356290853e..0000000000 --- a/app/controllers/reports/activity_graph_controller.rb +++ /dev/null @@ -1,28 +0,0 @@ -class Reports::ActivityGraphController < ApplicationController - def index - setup_date_range_picker - @distribution_data = received_distributed_data(helpers.selected_range) - end - - private - - def total_purchased_unformatted(range = selected_range) - LineItem.active.where(itemizable: current_organization.purchases.during(range)).sum(:quantity) - end - - def total_distributed_unformatted(range = selected_range) - LineItem.active.where(itemizable: current_organization.distributions.during(range)).sum(:quantity) - end - - def total_received_donations_unformatted(range = selected_range) - LineItem.active.where(itemizable: current_organization.donations.during(range)).sum(:quantity) - end - - def received_distributed_data(range = selected_range) - { - "Received donations" => total_received_donations_unformatted(range), - "Purchased" => total_purchased_unformatted(range), - "Distributed" => total_distributed_unformatted(range) - } - end -end diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index 9426245711..2f707ea1ab 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -32,4 +32,31 @@ def itemized_distributions distributions = current_organization.distributions.includes(:partner).during(helpers.selected_range) @itemized_distribution_data = DistributionItemizedBreakdownService.new(organization: current_organization, distribution_ids: distributions.pluck(:id)).fetch end + + def activity_graph + setup_date_range_picker + @distribution_data = received_distributed_data(helpers.selected_range) + end + + private + + def total_purchased_unformatted(range = selected_range) + LineItem.active.where(itemizable: current_organization.purchases.during(range)).sum(:quantity) + end + + def total_distributed_unformatted(range = selected_range) + LineItem.active.where(itemizable: current_organization.distributions.during(range)).sum(:quantity) + end + + def total_received_donations_unformatted(range = selected_range) + LineItem.active.where(itemizable: current_organization.donations.during(range)).sum(:quantity) + end + + def received_distributed_data(range = selected_range) + { + "Received donations" => total_received_donations_unformatted(range), + "Purchased" => total_purchased_unformatted(range), + "Distributed" => total_distributed_unformatted(range) + } + end end diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index 6befa36d44..831c082fe1 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -179,7 +179,7 @@
    • - <%= link_to(reports_activity_graph_index_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/activity_graph'])}") do %> + <%= link_to(reports_activity_graph_path(organization_id: current_user.organization), class: "nav-link #{active_class(['reports/activity_graph'])}") do %> Activity Graph <% end %>
      • diff --git a/app/views/reports/activity_graph/index.html.erb b/app/views/reports/activity_graph.html.erb similarity index 96% rename from app/views/reports/activity_graph/index.html.erb rename to app/views/reports/activity_graph.html.erb index de410b0b1a..6dfe0e079b 100644 --- a/app/views/reports/activity_graph/index.html.erb +++ b/app/views/reports/activity_graph.html.erb @@ -5,7 +5,7 @@ title: "Activity Graph", subtitle: @selected_date_range, type: :table, - filter_url: reports_activity_graph_index_path + filter_url: reports_activity_graph_path ) do %> <% if @distribution_data.empty? %>