Dashboard!

.github/workflows/brakeman.yml

@@ -6,6 +6,11 @@ on:
       - 'doc/**'
       - '*.md'
       - 'bin/*'
+  pull_request:
+    paths-ignore:
+      - 'doc/**'
+      - '*.md'
+      - 'bin/*'
 
 jobs:
   brakeman:

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

@@ -6,6 +6,11 @@ on:
       - 'doc/**'
       - '*.md'
       - 'bin/*'
+  pull_request:
+    paths-ignore:
+      - 'doc/**'
+      - '*.md'
+      - 'bin/*'
 
 jobs:
   factory_bot_lint:

.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

@@ -6,6 +6,11 @@ on:
       - "doc/**"
       - "*.md"
       - "bin/*"
+  pull_request:
+    paths-ignore:
+      - "doc/**"
+      - "*.md"
+      - "bin/*"
 
 jobs:
   rspec-system:

.github/workflows/rspec.yml

@@ -6,6 +6,11 @@ on:
       - "doc/**"
       - "*.md"
       - "bin/*"
+  pull_request:
+    paths-ignore:
+      - "doc/**"
+      - "*.md"
+      - "bin/*"
 
 jobs:
   rspec:

.github/workflows/ruby_lint.yml

@@ -6,6 +6,11 @@ on:
       - "doc/**"
       - "*.md"
       - "bin/*"
+  pull_request:
+    paths-ignore:
+      - "doc/**"
+      - "*.md"
+      - "bin/*"
 
 jobs:
   ruby_lint:

app/controllers/reports_controller.rb

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

app/helpers/application_helper.rb

@@ -15,11 +15,7 @@ def default_title_content
   end
 
   def active_class(name)
-    if name.find { |n| request.path.ends_with?(n) }
-      "active"
-    else
-      controller_path
-    end
+    (name.include?(controller_path) || name.include?(controller_path + '/' + action_name.to_s)) ? 'active' : controller_path
   end
 
   def menu_open?(name)

app/queries/low_inventory_query.rb

@@ -1,23 +1,51 @@
 class LowInventoryQuery
   def self.call(organization)
-    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
+    if Event.read_events?(organization)
+      inventory = InventoryAggregate.inventory_for(organization.id)
 
-    sanitized_sql = ActiveRecord::Base.send(:sanitize_sql_array, [sql_query, organization.id])
-    ActiveRecord::Base.connection.execute(sanitized_sql).to_a
+      items = {}
+      inventory.storage_locations.values.each do |storage_location|
+        storage_location.items.values.each do |item|
+          items[item.item_id] = items[item.item_id].to_i + item.quantity
+        end
+      end
+
+      low_inventory_items = []
+      items.each do |item_id, quantity|
+        item = Item.find(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

app/views/dashboard/_announcements.html.erb

@@ -0,0 +1,32 @@
+<% if @broadcast_announcements.any? %>
+  <div class="shared/card" id="distributions">
+    <div class="card-header border-0 bg-gradient-warning">
+      <h3 class="card-title">Announcements
+        <small>from Human Essentials</small></h3>
+      <div class="card-tools">
+        <button type="button" class="btn btn-tool" data-card-widget="collapse">
+          <i class="fas fa-minus"></i>
+        </button>
+      </div>
+    </div>
+    <div class="card-body">
+      <ul class="list-group list-group-flush">
+        <% @broadcast_announcements.each do |announcement| %>
+          <li class="list-group-item">
+            <strong><%= if announcement.created_at.strftime("%Y") == DateTime.now.strftime("%Y")
+                          announcement.created_at.strftime("%B %d")
+                        else
+                          announcement.created_at.strftime("%B %d %Y")
+                        end %></strong>
+            <br>
+            <%= announcement.message %>
+            <% unless announcement.link == '' %>
+              <br>
+              <a href="<%= announcement.link %>" class="btn btn-primary">more info</a>
+            <% end %>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+<% end %>

app/views/dashboard/_low_inventory_report.html.erb

@@ -1,4 +1,3 @@
-
 <%= render(
   "shared/card",
   id: "low_inventory",

app/views/dashboard/_outstanding_requests.html.erb

@@ -1,20 +1,35 @@
-<table class="table table-hover striped">
-  <thead>
-    <tr>
-      <th>Date</th>
-      <th>Partner</th>
-      <th>Requestor</th>
-      <th>Comments</th>
-    </tr>
-  </thead>
-  <tbody>
-    <% outstanding_requests.each do |item| %>
-      <tr>
-        <td class="date"><%= link_to item.created_at.strftime("%m/%d/%Y"), item %></td>
-        <td><%= item.partner.name %></td>
-        <td><%= item.partner_user&.formatted_email %></td>
-        <td><%= item.comments %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<%=
+  render(
+    "shared/card",
+    id: "outstanding",
+    gradient: "warning",
+    title: "Outstanding Requests",
+    footer: link_to("View all requests", requests_path),
+    footer_options: { class: "text-center" },
+  ) do
+%>
+  <% if @outstanding_requests.empty? %>
+    No outstanding requests!
+  <% else %>
+    <table class="table table-hover striped">
+      <thead>
+        <tr>
+          <th>Date</th>
+          <th>Partner</th>
+          <th>Requestor</th>
+          <th>Comments</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @outstanding_requests.take(25).each do |item| %>
+          <tr>
+            <td class="date"><%= link_to item.created_at.strftime("%m/%d/%Y"), item %></td>
+            <td><%= item.partner.name %></td>
+            <td><%= item.partner_user&.formatted_email %></td>
+            <td><%= item.comments %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  <% end %>
+<% end %>

app/views/dashboard/_partner_approvals.html.erb

@@ -0,0 +1,34 @@
+<%= 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? %>
+    <table class="table table-striped">
+      <thead>
+        <tr>
+          <th>Partner Name</th>
+          <th>Primary Contact Name</th>
+          <th>Primary Contact Email</th>
+          <th>Review Requested</th>
+          <th>Action</th>
+        </tr>
+      </thead>
+      <% @partners_awaiting_review.each do |partner| %>
+        <tr>
+          <td><%= partner.name %></td>
+          <td><%= partner.profile.primary_contact_name %></td>
+          <td><%= partner.profile.primary_contact_email %></td>
+          <td><%= partner.updated_at.strftime("%B %d %Y") %></td>
+          <td>
+            <%= view_button_to partner_path(partner) + "#partner-information", { text: "Review Application", icon: "check", type: "warning", class: 'badge' } %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  <% else %>
+    No partners waiting for approval
+  <% end %>
+<% end %>