Merge branch 'main' into 4333-remove-inventory-items

Author: dorner

Gemfile.lock

@@ -162,9 +162,9 @@ GEM
       irb (~> 1.10)
       reline (>= 0.3.8)
     debug_inspector (1.2.0)
-    delayed_job (4.1.11)
+    delayed_job (4.1.12)
       activesupport (>= 3.0, < 8.0)
-    delayed_job_active_record (4.1.8)
+    delayed_job_active_record (4.1.10)
       activerecord (>= 3.0, < 8.0)
       delayed_job (>= 3.0, < 5)
     delayed_job_web (1.4.4)
@@ -209,15 +209,15 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    erb_lint (0.6.0)
+    erb_lint (0.7.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
       rainbow
       rubocop (>= 1)
       smart_properties
     erubi (1.13.0)
-    execjs (2.9.1)
+    execjs (2.10.0)
     factory_bot (6.4.5)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
@@ -259,14 +259,14 @@ GEM
     ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
     filterrific (5.2.5)
-    flipper (1.3.0)
+    flipper (1.3.1)
       concurrent-ruby (< 2)
     flipper-active_record (1.3.0)
       activerecord (>= 4.2, < 8)
       flipper (~> 1.3.0)
-    flipper-ui (1.3.0)
+    flipper-ui (1.3.1)
       erubi (>= 1.0.0, < 2.0.0)
-      flipper (~> 1.3.0)
+      flipper (~> 1.3.1)
       rack (>= 1.4, < 4)
       rack-protection (>= 1.5.3, < 5.0.0)
       rack-session (>= 1.0.2, < 3.0.0)
@@ -321,7 +321,7 @@ GEM
     jbuilder (2.13.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    json (2.7.2)
+    json (2.7.5)
     jwt (2.9.1)
       base64
     kaminari (1.2.2)
@@ -354,7 +354,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.22.0)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lumberjack (1.2.9)
@@ -442,7 +442,7 @@ GEM
       activerecord (>= 6.1)
       request_store (~> 1.4)
     parallel (1.26.3)
-    parser (3.3.4.2)
+    parser (3.3.5.1)
       ast (~> 2.4.1)
       racc
     pdf-core (0.9.0)
@@ -485,7 +485,7 @@ GEM
     puma (6.4.3)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.9)
+    rack (2.2.10)
     rack-protection (3.1.0)
       rack (~> 2.2, >= 2.2.4)
     rack-session (1.0.2)
@@ -553,7 +553,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.8)
+    rexml (3.3.9)
     rolify (6.0.1)
     rouge (4.1.2)
     rspec (3.13.0)
@@ -588,9 +588,9 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.1)
+    rubocop-ast (1.33.0)
       parser (>= 3.3.1.0)
-    rubocop-performance (1.21.1)
+    rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rails (2.25.1)
@@ -606,7 +606,7 @@ GEM
       ffi (~> 1.12)
       logger
     ruby2_keywords (0.0.5)
-    sanitize (6.1.0)
+    sanitize (6.1.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sass-rails (6.0.0)
@@ -657,15 +657,15 @@ GEM
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.4.0)
+    standard-performance (1.5.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.21.0)
+      rubocop-performance (~> 1.22.0)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.1.1)
     strong_migrations (1.8.0)
       activerecord (>= 5.2)
-    terser (1.2.3)
+    terser (1.2.4)
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
     tilt (2.2.0)
@@ -676,7 +676,7 @@ GEM
       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     uniform_notifier (1.16.0)
     version_gem (1.1.4)
     warden (1.2.9)
@@ -798,4 +798,4 @@ DEPENDENCIES
   webmock (~> 3.24)
 
 BUNDLED WITH
-   2.5.20
+   2.5.22

app/assets/stylesheets/simple_form-bootstrap/_form_abbr.scss

@@ -1,5 +1,6 @@
 // Source: http://simple-form-bootstrap.plataformatec.com.br/documentation
 
-abbr[title] {
+form abbr[title] {
   text-decoration: none;
-}
+  cursor: inherit;
+}

app/controllers/concerns/importable.rb

@@ -27,8 +27,12 @@ def import_csv
       data = File.read(params[:file].path, encoding: "BOM|UTF-8")
       csv = CSV.parse(data, headers: true).reject { |row| row.to_hash.values.any?(&:nil?) }
       if csv.count.positive? && csv.first.headers.all? { |header| !header.nil? }
-        resource_model.import_csv(csv, current_organization.id)
-        flash[:notice] = "#{resource_model_humanized} were imported successfully!"
+        errors = resource_model.import_csv(csv, current_organization.id)
+        if errors.empty?
+          flash[:notice] = "#{resource_model_humanized} were imported successfully!"
+        else
+          flash[:error] = "The following #{resource_model_humanized} did not import successfully:\n#{errors.join("\n")}"
+        end
       else
         flash[:error] = "Check headers in file!"
       end

app/controllers/organizations_controller.rb

@@ -59,7 +59,7 @@ def demote_to_user
       RemoveRoleService.call(user_id: params[:user_id],
         resource_type: Role::ORG_ADMIN,
         resource_id: current_organization.id)
-      redirect_to user_update_redirect_path, notice: notice
+      redirect_to user_update_redirect_path, notice: "User has been demoted!"
     rescue => e
       redirect_back(fallback_location: organization_path, alert: e.message)
     end

app/controllers/requests_controller.rb

@@ -8,7 +8,7 @@ def index
                 .undiscarded
                 .during(helpers.selected_range)
                 .class_filter(filter_params)
-
+    @unfulfilled_requests_count = current_organization.requests.where(status: [:pending, :started]).count
     @paginated_requests = @requests.page(params[:page])
     @calculate_product_totals = RequestsTotalItemsService.new(requests: @requests).calculate
     @items = current_organization.items.alphabetized
@@ -40,6 +40,24 @@ def start
     redirect_to new_distribution_path(request_id: request.id)
   end
 
+  def print_unfulfilled
+    requests = current_organization
+      .requests
+      .includes(:item_requests, partner: [:profile])
+      .where(status: [:pending, :started])
+      .order(created_at: :desc)
+
+    respond_to do |format|
+      format.any do
+        pdf = PicklistsPdf.new(current_organization, requests)
+        send_data pdf.compute_and_render,
+          filename: format("Picklists_%s.pdf", Time.current.to_fs(:long)),
+          type: "application/pdf",
+          disposition: "inline"
+      end
+    end
+  end
+
   private
 
   def load_items

app/helpers/date_range_helper.rb

@@ -1,7 +1,7 @@
 # Encapsulates methods used on the Dashboard that need some business logic
 module DateRangeHelper
   def date_range_params
-    params.dig(:filters, :date_range).presence || this_year
+    params.dig(:filters, :date_range).presence || default_date
   end
 
   def date_range_label
@@ -23,8 +23,10 @@ def date_range_label
     end
   end
 
-  def this_year
-    "January 1, #{Time.zone.today.year} - December 31, #{Time.zone.today.year}"
+  def default_date
+    start_date = 2.months.ago.to_date
+    end_date = 1.month.from_now.to_date
+    "#{start_date.strftime("%B %d, %Y")} - #{end_date.strftime("%B %d, %Y")}"
   end
 
   def selected_interval

app/javascript/application.js

@@ -90,7 +90,8 @@ $(document).ready(function(){
       format: "MMMM D, YYYY",
       ranges: {
         customRanges: {
-          'All Time': [today.minus({ 'years': 100}).toJSDate(), today.toJSDate()],
+          'Default': [today.minus({'months': 2}).toJSDate(), today.plus({'months': 1}).toJSDate()],
+          'All Time': [today.minus({ 'years': 100 }).toJSDate(), today.plus({ 'years': 1 }).toJSDate()],
           'Today': [today.toJSDate(), today.toJSDate()],
           'Yesterday': [today.minus({'days': 1}).toJSDate(), today.minus({'days': 1}).toJSDate()],
           'Last 7 Days': [today.minus({'days': 6}).toJSDate(), today.toJSDate()],

app/javascript/controllers/password_visibility_controller.js

@@ -0,0 +1,13 @@
+import { Controller } from "@hotwired/stimulus";
+
+export default class extends Controller {
+  static targets = ["password", "icon"];
+
+  toggle() {
+    const isPasswordVisible = this.passwordTarget.type === "text";
+
+    this.passwordTarget.type = isPasswordVisible ? "password" : "text";
+    this.iconTarget.classList.toggle("fa-eye", !isPasswordVisible);
+    this.iconTarget.classList.toggle("fa-eye-slash", isPasswordVisible);
+  }
+}

app/models/concerns/issued_at.rb

@@ -10,6 +10,7 @@ module IssuedAt
     scope :by_issued_at, ->(issued_at) { where(issued_at: issued_at.beginning_of_month..issued_at.end_of_month) }
     scope :for_year, ->(year) { where("extract(year from issued_at) = ?", year) }
     validate :issued_at_cannot_be_before_2000
+    validate :issued_at_cannot_be_further_than_1_year
   end
 
   private
@@ -23,4 +24,10 @@ def issued_at_cannot_be_before_2000
       errors.add(:issued_at, "Cannot be before 2000")
     end
   end
+
+  def issued_at_cannot_be_further_than_1_year
+    if issued_at.present? && issued_at > DateTime.now.next_year
+      errors.add(:issued_at, "cannot be more than 1 year in the future")
+    end
+  end
 end

app/models/concerns/provideable.rb

@@ -19,6 +19,7 @@ def self.import_csv(csv, organization)
 
         loc.save!
       end
+      []
     end
 
     def self.csv_export_headers