19 Commits

Author SHA1 Message Date
9a1678d353 2026.3.0 2026-03-04 21:00:43 -05:00
28957c5dff fixed eager loading issue 2026-03-04 20:57:29 -05:00
a67b75671e updated logging with prefix 2026-03-04 20:57:12 -05:00
492ff000bf Don't copy the text Copied! 2026-02-26 13:26:45 -05:00
e0fc07141c 2026.2.8 2026-02-25 22:13:18 -05:00
3e6c2672e0 removed duplicate comment 2026-02-25 22:12:48 -05:00
71bde3a249 Enhance search_result_ranks_and_ids method to rank results by ID and streamline query handling 2026-02-25 22:12:14 -05:00
4f2ae19460 2026.2.7 2026-02-22 19:13:20 -05:00
9ee792cbd8 Refactor vehicle model: streamline search functionality using built in modules 2026-02-22 13:19:28 -05:00
ae7ccbf4b0 display VIN & Customer on search event_description 2026-02-21 19:20:28 -05:00
550601b5c9 Merge branch 'dev' 2026-02-21 19:09:29 -05:00
85cd02b16a 2026.2.6 2026-02-21 19:07:06 -05:00
4b8b3c3495 Update search form ID for consistency 2026-02-21 19:06:23 -05:00
b2c1bebea3 show_checkbox: true 2026-02-21 14:07:03 -05:00
2bd13a819b Removed unneeded BR 2026-02-21 14:00:34 -05:00
d6138843f8 Started to extend redmine's search 2026-02-21 09:22:04 -05:00
452568e8b3 fixed search label 2026-02-21 08:45:42 -05:00
a709fecd0c 2026.2.5 2026-02-21 08:34:33 -05:00
6db87dd551 search for a vehicle by vin, make, model, or year, plus sql sanitization 2026-02-21 08:33:59 -05:00
11 changed files with 129 additions and 60 deletions

View File

@@ -60,10 +60,15 @@ class VehiclesController < ApplicationController
# display a specific vehicle
def show
begin
@vehicle = Vehicle.find_by_id(params[:id])
@vehicle = Vehicle.includes(issues: [:estimate, :invoices]).find(params[:id])
@vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin
@issues = @vehicle.issues.order(id: :desc)
@closed_issues = (@issues - @issues.open)
@issues = @vehicle.issues
.joins(:status)
.includes(:estimate, :invoices, :status, :project, :tracker, :priority)
.order(id: :desc)
@open_issues = @issues.select { |i| !i.status.is_closed }
@closed_issues = @issues.select { |i| i.status.is_closed }
flash[:error] = t :alert_no_customer if @vehicle.customer.nil?
rescue
flash[:error] = t :alert_vehicle_not_found

View File

@@ -9,52 +9,26 @@
#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 Vehicle < ActiveRecord::Base
include Redmine::Acts::Searchable
include Redmine::Acts::Event
belongs_to :customer
has_many :issues
validates_presence_of :customer
validates :vin, uniqueness: true
before_save :decode_vin
# returns a human readable string
def to_s
if year.nil? or make.nil? or model.nil?
return "#{vin}"
else
split_vin = vin.scan(/.{1,9}/)
return "#{year} #{make} #{model} - #{split_vin[1]}"
end
end
# returns the raw JSON details from NHTSA
def details
get_details if @details.nil?
return @details
end
# Force Upper Case for make numbers
def make=(val)
# The to_s is in case you get nil/non-string
write_attribute(:make, val.to_s.titleize)
end
# Force Upper Case for model numbers
def model=(val)
# The to_s is in case you get nil/non-string
write_attribute(:model, val.to_s.titleize)
end
# Force Upper Case & strip VIN of all illegal chars (for barcode scanner)
def vin=(val)
val = val.to_s.upcase.gsub(/[^A-HJ-NPR-Za-hj-npr-z\d]+/,"")
write_attribute(:vin, val)
end
# search for a vin
def self.search(search)
where("vin LIKE ?", "%#{search}%")
end
acts_as_searchable columns: %w[vin make model year],
scope: ->(_context) { left_joins(:project) },
date_column: :updated_at
acts_as_event :title => Proc.new {|o| "#{o.to_s}"},
:url => Proc.new {|o| { :controller => 'vehicles', :action => 'show', :id => o.id} },
:type => :to_s,
:description => Proc.new {|o| "#{o.vin} - #{o.customer}"},
:datetime => Proc.new {|o| o.updated_at || o.created_at}
# decodes a vin and updates self
def decode_vin
get_details
@@ -72,15 +46,74 @@ class Vehicle < ActiveRecord::Base
self.name = to_s
end
# reurns all invoices for this vehicle
def invoices
self.issues.flat_map(&:invoices).uniq.compact
# returns the raw JSON details from NHTSA
def details
get_details if @details.nil?
return @details
end
# returns all estimates for this vehicle
def estimates
self.issues.flat_map(&:estimate).uniq.compact
end
# reurns all invoices for this vehicle
def invoices
self.issues.flat_map(&:invoices).uniq.compact
end
# Force Upper Case for make numbers
def make=(val)
# The to_s is in case you get nil/non-string
write_attribute(:make, val.to_s.titleize)
end
# Force Upper Case for model numbers
def model=(val)
# The to_s is in case you get nil/non-string
write_attribute(:model, val.to_s.titleize)
end
# needed for redmine's search and event system, but we don't want to tie vehicles to projects
def project
nil
end
# search for a vehicle by vin, make, model, or year
def self.search(query)
q = sanitize_sql_like(query)
where("vin LIKE ? OR make LIKE ? OR model LIKE ? OR year LIKE ?", "%#{q}%", "%#{q}%", "%#{q}%", "%#{q}%")
end
# Override the defult redmine seach method to rank results by id
def self.search_result_ranks_and_ids(tokens, user, project = nil, options = {})
return {} if tokens.blank?
scope = self.all
tokens.each do |token|
scope = scope.search(token)
end
ids = scope.distinct.limit(options[:limit] || 100).pluck(:id)
ids.index_with { |id| id }
end
# returns a human readable string
def to_s
if year.nil? or make.nil? or model.nil?
return "#{vin}"
else
split_vin = vin.scan(/.{1,9}/)
return "#{year} #{make} #{model} - #{split_vin[1]}"
end
end
# Force Upper Case & strip VIN of all illegal chars (for barcode scanner)
def vin=(val)
val = val.to_s.upcase.gsub(/[^A-HJ-NPR-Za-hj-npr-z\d]+/,"")
write_attribute(:vin, val)
end
private

View File

@@ -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>

View File

@@ -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>

View File

@@ -1,4 +1,4 @@
<%= form_tag(vehicles_path, method: "get", id: "search-form") do %>
<%= text_field_tag :search, params[:search], placeholder: t(:label_search_vin), autocomplete: "off" %>
<%= 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 %>

View File

@@ -14,9 +14,9 @@
</div>
</div>
<h3><%=@issues.open.count%> <%=t(:label_open_issues)%></h3>
<h3><%=@open_issues.count%> <%=t(:label_open_issues)%></h3>
<%= render partial: 'issues/list_simple', locals: {issues: @issues.open} %>
<%= render partial: 'issues/list_simple', locals: {issues: @open_issues} %>
<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%></h3>

View File

@@ -12,6 +12,11 @@ async function handleCopy(event) {
link = event.target;
}
// If the text is already "Copied!", don't do anything
if (text == "Copied!") {
return;
}
try {
// Write to clipboard
await navigator.clipboard.writeText(text);

View File

@@ -28,7 +28,7 @@ en:
label_model: "Model"
label_new_vehicle: "New Customer Vehicle"
label_no_vehicles: "There are no vehicles containing the term(s)"
label_search_vin: "Search Vehicles by VIN"
label_search_vehicles: "Search Vehicles"
label_year: "Year"
no_customer: "Customer no longer exists"
notice_vehicle_created: "Vehicle was successfully created."

View File

@@ -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

View File

@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo_vehicles do
name 'Redmine QBO Vehicles plugin'
author 'Rick Barrette'
description 'This is a plugin for Redmine to intergrate with the redmine_qbo plugin to provide vehicle data tracking'
version '2026.2.4'
version '2026.3.0'
url 'https://github.com/rickbarrette/redmine_qbo_vehicles'
author_url 'https://barrettefabrication.com'
requires_redmine version_or_higher: '6.1.0'
@@ -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

View File

@@ -17,13 +17,13 @@ module Vehicles
# Called by Redmine QBO Invoice
def process_invoice_custom_fields(context={})
Rails.logger.info "redmine_qbo_vehicles.process_invoice_custom_fields"
log "Processing invoice custom fields for invoice ##{context[:invoice].id}"
issue = context[:issue]
# update the invoive custom fields with infomation from the issue if available
context[:invoice].custom_fields.each do |cf|
Rails.logger.info "Checking invoice.custom field: #{cf.name}"
log "Checking invoice custom field: #{cf.name}"
# VIN from the attached vehicle
begin
@@ -32,13 +32,13 @@ module Vehicles
# TODO check cf_sync_confict flag once implemented
if cf.string_value.to_s.blank?
Rails.logger.info "VIN was blank, updating the invoice vin in quickbooks"
log "VIN was blank, updating the invoice vin in quickbooks"
vin = context[:issue].vehicle.vin
break if vin.nil?
if not cf.string_value.to_s.eql? vin
cf.string_value = vin.to_s
Rails.logger.info "VIN has changed"
log "VIN has changed"
context[:is_changed] = true
end
@@ -47,7 +47,7 @@ module Vehicles
end
rescue
#do nothing
Rails.logger.info "redmine_qbo_vehicles.process_invoice_custom_fields failed, skipping"
log "redmine_qbo_vehicles.process_invoice_custom_fields failed, skipping"
return nil
end
end
@@ -56,6 +56,12 @@ module Vehicles
return nil
end
private
def log(msg)
Rails.logger.info "[InvoiceHookListener] #{msg}"
end
end
end