Make dropdown lists alphabetical order ( Part 1)

Gemfile.lock

@@ -801,4 +801,4 @@ DEPENDENCIES
   webmock (~> 3.23)
 
 BUNDLED WITH
-   2.5.16
+   2.5.19

app/controllers/adjustments_controller.rb

@@ -15,7 +15,7 @@ def index
     @paginated_adjustments = @adjustments.page(params[:page])
 
     @storage_locations = Adjustment.storage_locations_adjusted_for(current_organization).uniq
-    @users = current_organization.users
+    @users = current_organization.users.sort_by { |user| user.name.to_s.downcase }
 
     respond_to do |format|
       format.html

app/models/adjustment.rb

@@ -32,7 +32,7 @@ class Adjustment < ApplicationRecord
   validate :storage_locations_belong_to_organization
 
   def self.storage_locations_adjusted_for(organization)
-    includes(:storage_location).joins(:storage_location).where(organization_id: organization.id, storage_location: {discarded_at: nil}).collect(&:storage_location).sort
+    includes(:storage_location).joins(:storage_location).where(organization_id: organization.id, storage_location: {discarded_at: nil}).collect(&:storage_location)
   end
 
   def split_difference

app/models/item.rb

@@ -56,7 +56,7 @@ class Item < ApplicationRecord
   scope :loose, -> { where(kit_id: nil) }
 
   scope :visible, -> { where(visible_to_partners: true) }
-  scope :alphabetized, -> { order(:name) }
+  scope :alphabetized, -> { order('LOWER(name)') }
   scope :by_base_item, ->(base_item) { where(base_item: base_item) }
   scope :by_partner_key, ->(partner_key) { where(partner_key: partner_key) }
 

app/models/user.rb

@@ -71,7 +71,6 @@ class User < ApplicationRecord
   validate :password_complexity
 
   default_scope -> { kept }
-  scope :alphabetized, -> { order(discarded_at: :desc, name: :asc) }
   scope :partner_users, -> { with_role(Role::PARTNER, :any) }
   scope :org_users, -> { with_role(Role::ORG_USER, :any) }
   scope :search_name, ->(query) { where("name ilike ?", "%#{query}%") }

app/views/line_items/_line_item_fields.html.erb

@@ -15,8 +15,9 @@
           <span class="li-name w-100">
             <%= field.input :item_id,
                             disabled: requested.present?,
-                            collection: @items, prompt: "Choose an item",
-                            include_blank: "",
+                            collection: @items,
+                            prompt: "Choose an item",
+                            include_blank: false, # We've got a prompt, so no need for an include blank
                             label: false,
                             input_html: { class: "my-0 line_item_name", "data-controller": "select2" } %>
             <% if requested.present? %>

app/views/storage_locations/_source.html.erb

@@ -10,7 +10,8 @@
   label: label,
   error: error,
   selected: storage_location_for_source(source.object),
-  include_blank: true,
+  include_blank: false,
+  prompt: "Choose a storage location",
   input_html: {
     data: {
       storage_location_inventory_path: inventory_storage_location_path(

db/seeds.rb

@@ -149,7 +149,9 @@ def random_record_for_org(org, klass)
   user = User.create(
     email: user_data[:email],
     password: 'password!',
-    password_confirmation: 'password!'
+    password_confirmation: 'password!',
+    organization: user_data[:organization], # Any reason not to set this?
+    name: user_data[:email].split('@').first # Any reason not to set this?
   )
 
   if user_data[:organization]