Merge branch 'dev'

app/models/vehicle.rb

@@ -15,7 +15,71 @@ class Vehicle < ActiveRecord::Base
   validates_presence_of :customer
   validates :vin, uniqueness: true
   before_save :decode_vin
+
+  def self.searchable_columns
+    ['vin', 'make', 'model', 'year']
+  end
+
+  def self.searchable_options
+    {
+      columns: searchable_columns,
+      scope: self.all
+    }
+  end
+
+  def self.search_result_ranks_and_ids(tokens, user, project = nil, options = {})
+    return {} if tokens.blank?
+
+    scope = self.all
+
+    tokens.each do |token|
+      q = "%#{sanitize_sql_like(token)}%"
+      scope = where("vin LIKE ? OR make LIKE ? OR model LIKE ? OR year LIKE ?", "%#{q}%", "%#{q}%", "%#{q}%", "%#{q}%") 
+    end
+
+    ids = scope.distinct.limit(options[:limit] || 100).pluck(:id)
+
+    # Assign simple uniform ranking
+    ids.each_with_object({}) { |id, h| h[id] = id }
+  end
+
+  def self.search_results_from_ids(ids, *args)
+    return [] if ids.blank?
+
+    Rails.logger.warn "IDS: #{ids.inspect}"
+
+    ids = ids.map(&:to_i)
+    records = where(id: ids).index_by(&:id)
+    ids.map { |id| records[id] }.compact
+  end
   
+  # ---- Redmine Search Event Interface ----
+  def event_type
+    'vehicle'
+  end
+
+  def event_title
+    to_s
+  end
+
+  def event_description
+    "#{vin} #{year} #{make} #{model}"
+  end
+
+  def event_url
+    Rails.application.routes.url_helpers.vehicle_path(self)
+  end
+
+  def event_datetime
+    updated_at || created_at
+  end
+
+  def project
+    # Vehicles are not project scoped in your schema.
+    # Return nil so global search works cleanly.
+    nil
+  end
+
   # returns a human readable string
   def to_s
     if year.nil? or make.nil? or model.nil?

app/views/customers/_show_hook.html.erb

@@ -1,5 +1,5 @@
 <h4><%=t(:field_vehicles)%>:</h4>
-<%= render partial: 'vehicles/list', locals: { vehicles: customer.vehicles.paginate(page: params[:page]), show_customer: false, show_checkbox: false } %>
+<%= render partial: 'vehicles/list', locals: { vehicles: customer.vehicles.paginate(page: params[:page]), show_customer: false, show_checkbox: true } %>
 <div style="float: right;">
     <%= button_to t(:button_new_vehicle), new_customer_vehicle_path(customer), method: :get %>
 </div>

app/views/vehicles/_list.html.erb

@@ -19,7 +19,6 @@
         <div class="label-sub">
           <div onclick="handleCopy(event)"><%= vehicle.vin.scan(/.{1,9}/)[0] if vehicle.vin %><b><%=vehicle.vin.scan(/.{1,9}/)[1] if vehicle.vin%></b></div>
           <% if show_customer %>
-            <br/>
             <%= vehicle.customer %>
           <% end %>
         </div>

app/views/vehicles/_search.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag(vehicles_path, method: "get", id: "search-form") do %>
+<%= form_tag(vehicles_path, method: "get", id: "vehicles-search-form") do %>
   <%= text_field_tag :search, params[:search], placeholder: t(:label_search_vehicles), autocomplete: "off" %>
   <%= submit_tag t(:label_search) %>
 <% end %>

db/migrate/003_add_timestamp.rb

@@ -0,0 +1,17 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class AddTimestamp < ActiveRecord::Migration[7.0]
+  
+  def change
+    add_timestamps(:vehicles, null: true)
+  end
+
+end

init.rb

@@ -35,6 +35,10 @@ Redmine::Plugin.register :redmine_qbo_vehicles do
   # Register top menu items
   menu :top_menu, :vehicles, { controller: :vehicles, action: :index }, caption: :field_vehicles, if: Proc.new { User.current.logged? }
     
+  Redmine::Search.map do |search|
+    search.register :vehicles
+  end
+
 end
 
 # Dynamically load all Hooks & Patches recursively