Dashboard!

.github/workflows/brakeman.yml

@@ -2,11 +2,11 @@ name: brakeman
 
 on:
   push:
-    branches:
-      - main
+    paths-ignore:
+      - 'doc/**'
+      - '*.md'
+      - 'bin/*'
   pull_request:
-    branches:
-      - main
     paths-ignore:
       - 'doc/**'
       - '*.md'

.github/workflows/factory-bot-lint.yml

@@ -2,11 +2,11 @@ name: factory bot lint
 
 on:
   push:
-    branches:
-      - main
+    paths-ignore:
+      - 'doc/**'
+      - '*.md'
+      - 'bin/*'
   pull_request:
-    branches:
-      - main
     paths-ignore:
       - 'doc/**'
       - '*.md'

.github/workflows/plantuml.yml

@@ -1,5 +1,12 @@
 name: Generate PlantUML
 on: push
+  paths:
+    - 'doc/**'
+    - '*.md'
+  pull_request:
+    - 'doc/**'
+    - '*.md'
+
 jobs:
   generate_plantuml:
     runs-on: ubuntu-latest

.github/workflows/rspec-events.yml

@@ -2,11 +2,11 @@ name: rspec-events
 
 on:
   push:
-    branches:
-      - main
+    paths-ignore:
+      - "doc/**"
+      - "*.md"
+      - "bin/*"
   pull_request:
-    branches:
-      - main
     paths-ignore:
       - "doc/**"
       - "*.md"
@@ -87,4 +87,6 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: failed-browser-tests
-          path: tmp/screenshots
+          path: |
+            tmp/screenshots
+            tmp/capybara

.github/workflows/rspec-system-events.yml

@@ -2,11 +2,11 @@ name: rspec-system-events
 
 on:
   push:
-    branches:
-      - main
+    paths-ignore:
+      - "doc/**"
+      - "*.md"
+      - "bin/*"
   pull_request:
-    branches:
-      - main
     paths-ignore:
       - "doc/**"
       - "*.md"

.github/workflows/rspec-system.yml

@@ -2,11 +2,11 @@ name: rspec-system
 
 on:
   push:
-    branches:
-      - main
+    paths-ignore:
+      - "doc/**"
+      - "*.md"
+      - "bin/*"
   pull_request:
-    branches:
-      - main
     paths-ignore:
       - "doc/**"
       - "*.md"

.github/workflows/rspec.yml

@@ -2,11 +2,11 @@ name: rspec
 
 on:
   push:
-    branches:
-      - main
+    paths-ignore:
+      - "doc/**"
+      - "*.md"
+      - "bin/*"
   pull_request:
-    branches:
-      - main
     paths-ignore:
       - "doc/**"
       - "*.md"

.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"

app/controllers/dashboard_controller.rb

@@ -3,29 +3,12 @@ class DashboardController < ApplicationController
   respond_to :html, :js
 
   def index
-    setup_date_range_picker
-
-    @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
-
-    @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
-
     @org_stats = OrganizationStats.new(current_organization)
+    @total_inventory = current_organization.total_inventory
+    @partners_awaiting_review = current_organization.partners.awaiting_review
+    @outstanding_requests = current_organization.ordered_requests.where(status: %i[pending started]).order(:created_at)
 
-    # 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
-
-    @distribution_data = helpers.received_distributed_data(helpers.selected_range)
+    @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)

app/controllers/reports_controller.rb

@@ -0,0 +1,66 @@
+class ReportsController < ApplicationController
+  before_action :setup_date_range_picker
+
+  def donations_summary
+    @donations = current_organization.donations.during(helpers.selected_range)
+    @recent_donations = @donations.recent
+  end
+
+  def manufacturer_donations_summary
+    @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
+
+  def purchases_summary
+    @purchases = current_organization.purchases.during(helpers.selected_range)
+    @recent_purchases = @purchases.recent.includes(:vendor)
+  end
+
+  def product_drives_summary
+    @donations = current_organization.donations.during(helpers.selected_range)
+    @recent_donations = @donations.recent
+  end
+
+  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
+    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 distributions_summary
+    distributions = current_organization.distributions.includes(:partner).during(helpers.selected_range)
+    @recent_distributions = distributions.recent
+  end
+
+  def activity_graph
+    @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

app/helpers/application_helper.rb

@@ -14,12 +14,12 @@ def default_title_content
     end
   end
 
-  def active_class(name)
-    name.include?(controller_path) ? "active" : controller_path
+  def active_class(controller_action_names)
+    (controller_action_names.include?(params[:controller]) || controller_action_names.include?("#{params[:controller]}/#{params[:action]}")) ? 'active' : ''
   end
 
-  def menu_open?(name)
-    name.include?(controller_path) ? 'menu-open' : ''
+  def menu_open?(controller_action_names)
+    (controller_action_names.include?(params[:controller]) || controller_action_names.include?("#{params[:controller]}/#{params[:action]}")) ? 'menu-open' : ''
   end
 
   def can_administrate?

app/helpers/dashboard_helper.rb

@@ -1,37 +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_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
-
   def total_distributed(range = selected_range)
     number_with_delimiter total_distributed_unformatted(range)
   end
@@ -46,18 +18,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
-
   def total_distributed_unformatted(range = selected_range)
     LineItem.active.where(itemizable: current_organization.distributions.during(range)).sum(:quantity)
   end

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

app/queries/low_inventory_query.rb

@@ -0,0 +1,45 @@
+class LowInventoryQuery
+  def self.call(organization)
+    if Event.read_events?(organization)
+      inventory = View::Inventory.new(organization.id)
+      items = inventory.all_items
+
+      low_inventory_items = []
+      items.each do |item|
+        quantity = inventory.quantity_for(item_id: item.id)
+        if quantity < item.on_hand_minimum_quantity.to_i || quantity < item.on_hand_recommended_quantity.to_i
+          low_inventory_items.push(OpenStruct.new(
+            id: item.id,
+            name: item.name,
+            on_hand_minimum_quantity: item.on_hand_minimum_quantity,
+            on_hand_recommended_quantity: item.on_hand_recommended_quantity,
+            total_quantity: quantity
+          ))
+        end
+      end
+
+      low_inventory_items.sort_by { |item| item[:name] }
+
+    else
+      sql_query = <<-SQL
+        SELECT
+          items.id,
+          items.name,
+          items.on_hand_minimum_quantity,
+          items.on_hand_recommended_quantity,
+          sum(inventory_items.quantity) as total_quantity
+        FROM inventory_items
+        JOIN items ON items.id = inventory_items.item_id
+        JOIN storage_locations ON storage_locations.id = inventory_items.storage_location_id
+        WHERE storage_locations.organization_id = ?
+        GROUP BY items.id, items.name, items.on_hand_minimum_quantity, items.on_hand_recommended_quantity
+        HAVING sum(inventory_items.quantity) < items.on_hand_minimum_quantity
+          OR sum(inventory_items.quantity) < items.on_hand_recommended_quantity
+        ORDER BY items.name
+      SQL
+
+      sanitized_sql = ActiveRecord::Base.send(:sanitize_sql_array, [sql_query, organization.id])
+      ActiveRecord::Base.connection.execute(sanitized_sql).to_a
+    end
+  end
+end