Compare commits

..
6 Commits
11 changed files with 119 additions and 50 deletions
+17
View File
@@ -33,6 +33,23 @@ class Vehicle < ApplicationRecord
issues.includes(:invoices).flat_map(&:invoices).uniq.compact issues.includes(:invoices).flat_map(&:invoices).uniq.compact
end end
def last_service
return issues
.joins(:custom_values)
.where(custom_values: { custom_field_id: CustomField.find_by(name: "Mileage")&.id })
.where.not(custom_values: { value: ['', nil] })
.order(created_on: :desc)
.first
end
def last_service_date
return last_service.created_on&.to_date
end
def last_service_mileage
return last_service&.custom_values&.find_by(custom_field_id: CustomField.find_by(name: "Mileage")&.id)&.value.presence
end
def make=(val) def make=(val)
super(val.to_s.strip) super(val.to_s.strip)
end end
@@ -0,0 +1,9 @@
<% if appointment.customer.present? %>
<% unless appointment.vehicle.present? &&%>
<p>
<%= link_to new_vehicle_path(customer_id: appointment.customer_id), class: 'icon icon-add' do %>
<%= l(:label_add_vehicle) %>
<% end %>
</p>
<% end %>
<% end %>
@@ -1,17 +1,20 @@
<div class="vehicle attribute"> <div class="vehicle attribute">
<div class="label"><%=t(:field_vehicle)%>:</div> <div class="label"><%= t(:field_vehicle) %>:</div>
<div class="value"><%= vehicle %></div> <div class="value"><%= vehicle %></div>
</div> </div>
<div class="vehicle_vin attribute"> <div class="vehicle_vin attribute">
<div class="label"><%=t(:field_vin)%>:</div> <div class="label"><%= t(:field_vin) %>:</div>
<div class="value" id="vin"> <div class="value" id="vin">
<div id="copyLink" onclick="handleCopy(event)"><%=split_vin[0] if split_vin%><b><%=split_vin[1] if split_vin%></b></div> <div id="copyLink" onclick="handleCopy(event)"><%= split_vin[0] if split_vin %><b><%= split_vin[1] if split_vin %></b></div>
</div> </div>
</div> </div>
<div class="vehicle_notes attribute"> <div class="vehicle_notes attribute">
<div class="label"><%=t(:field_notes)%>:</div> <div class="label"><%= t(:field_notes) %>:</div>
<pre class="value" id="note-display" style="text-align: left; white-space: pre-wrap; font-family: inherit; "><%=notes%></pre> <% if vehicle.present? %>
<div class="value wiki">
<%= textilizable(@issue.vehicle, :notes) %>
</div>
<% end %>
</div> </div>
+27 -35
View File
@@ -1,13 +1,12 @@
<div class="issue"> <div class="issue">
<div class="splitcontent"> <div class="splitcontent">
<div class="splitcontentleft"> <div class="splitcontentleft">
<h4><%=t(:label_details)%>:</h4> <h4><%= t(:label_details) %>:</h4>
<table> <table>
<tbody> <tbody>
<tr> <tr>
<th><%= t(:field_customer)%></th> <th><%= t(:field_customer) %></th>
<td><%= vehicle.customer ? link_to(vehicle.customer.name, customer_path(vehicle.customer)) : t(:no_customer) %></td> <td><%= vehicle.customer ? link_to(vehicle.customer.name, customer_path(vehicle.customer)) : t(:no_customer) %></td>
</tr> </tr>
@@ -19,49 +18,42 @@
<tr> <tr>
<th><%= t(:field_vin) %></th> <th><%= t(:field_vin) %></th>
<td> <td>
<div onclick="handleCopy(event)"><%= @vin[0] if @vin %><b><%=@vin[1] if @vin%></b></div> <div onclick="handleCopy(event)"><%= @vin[0] if @vin %><b><%= @vin[1] if @vin %></b></div>
</td> </td>
</tr> </tr>
<th><%= t(:label_trim) %></th> <tr>
<td><%= vehicle.doors %> <%=t(:label_door) if vehicle.doors? %> <%= vehicle.trim %></td> <th><%= t(:label_trim) %></th>
<td><%= vehicle.doors %> <%= t(:label_door) if vehicle.doors? %> <%= vehicle.trim %></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="splitcontentleft"> <div class="splitcontentright">
<h4><%= t(:field_notes) %>:</h4>
<h4><%=t(:field_notes)%>:</h4> <div class="vehicle_notes attribute">
<pre id="note-display" style="text-align: left; white-space: pre-wrap; font-family: inherit; "> <div class="label"><%= t(:field_notes) %>:</div>
<td><%= vehicle.notes %></td> <% if vehicle.notes.present? %>
</pre> <div class="value wiki">
</tr> <%= textilizable(vehicle, :notes) %>
</div>
<script> <% end %>
const preElement = document.getElementById('note-display'); </div>
// This takes the text, trims the edges, and puts it back
preElement.textContent = preElement.textContent.trim();
</script>
</div> </div>
</div> </div>
</div> </div>
<% last = vehicle.issues.last %> <% mileage = vehicle.last_service_mileage %>
<% if last %>
<% mileage = last.custom_values.find_by(custom_field_id: CustomField.find_by_name("Mileage").id) %> <% if mileage %>
<% if mileage %> <p>
<p> <b><%= t(:label_last_service) %></b> <%= vehicle.last_service_date %>
<b><%=t(:label_last_service) %></b> <%= last&.closed_on&.to_date || l(:label_unknown) %> at <%= mileage %> <%= t(:label_miles) %>
at <%= mileage.value %> </p>
<%=t(:label_miles) %>
</p>
<% end %>
<% end %> <% end %>
<div style="float: right;"> <div style="float: right;">
<%= button_to t(:label_edit), edit_vehicle_path(vehicle), method: :get%> <%= button_to t(:label_edit), edit_vehicle_path(vehicle), method: :get %>
<%= button_to t(:label_delete), vehicle, method: :delete, data: {confirm: t(:warn_ru_sure)} %> <%= button_to t(:label_delete), vehicle, method: :delete, data: { confirm: t(:warn_ru_sure) } %>
</div> </div>
+8 -1
View File
@@ -42,7 +42,14 @@
<div class="clearfix"> <div class="clearfix">
<%=t(:field_notes)%>: <%=t(:field_notes)%>:
<div class="input"> <div class="input">
<%= f.text_area :notes, cols: 60, rows: 10, no_label: true %> <p>
<%= f.text_area :notes,
rows: 8,
class: 'wiki-edit',
style: 'width: 95%;',
id: 'customer_appointment_description' %>
<%= wikitoolbar_for 'customer_appointment_description' %>
</p>
</div> </div>
</div> </div>
+14 -2
View File
@@ -6,7 +6,7 @@
<div class="container"> <div class="container">
<% if show_checkbox %> <% if show_checkbox %>
<%= check_box_tag "vehicle_ids[]", vehicle.id, false, onchange: "updateLink()", data: { url: vehicle_path(vehicle).html_safe, text: vehicle.to_s }, class: "appointment checkbox" %> <%= check_box_tag "vehicle_ids[]", vehicle.id, false, onchange: "updateLink()", data: { url: vehicle_path(vehicle).html_safe, text: vehicle.to_s }, class: "vehicle-checkbox appointment checkbox" %>
<% else %> <% else %>
<div class='checkbox'> <div class='checkbox'>
</div> </div>
@@ -21,10 +21,22 @@
<% if show_customer %> <% if show_customer %>
<%= vehicle.customer %> <%= vehicle.customer %>
<% end %> <% end %>
<%
mileage = vehicle.last_service_mileage
%>
<% if mileage %>
<br/>
<b><%= t(:label_last_service) %></b> <%= vehicle.last_service_date %>
at <%= mileage %> <%= t(:label_miles) %>
<% end %>
</div> </div>
<br/>
</div> </div>
<br/>
</div> </div>
<% end %> <% end %>
+1
View File
@@ -21,6 +21,7 @@ en:
field_vehicle: "Vehicle" field_vehicle: "Vehicle"
field_vehicles: "Vehicles" field_vehicles: "Vehicles"
field_vin: "VIN" field_vin: "VIN"
label_add_vehicle: "Add Vehicle"
label_customer_vehicles: "Customer Vehicles" label_customer_vehicles: "Customer Vehicles"
label_edit: "Edit" label_edit: "Edit"
label_edit_customer_vehicle: "Edit Customer Vehicle" label_edit_customer_vehicle: "Edit Customer Vehicle"
+1 -1
View File
@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo_vehicles do
name 'Redmine QBO Vehicles plugin' name 'Redmine QBO Vehicles plugin'
author 'Rick Barrette' author 'Rick Barrette'
description 'This is a plugin for Redmine to intergrate with the redmine_qbo plugin to provide vehicle data tracking' description 'This is a plugin for Redmine to intergrate with the redmine_qbo plugin to provide vehicle data tracking'
version '2026.4.1' version '2026.8.1'
url 'https://github.com/rickbarrette/redmine_qbo_vehicles' url 'https://github.com/rickbarrette/redmine_qbo_vehicles'
author_url 'https://barrettefabrication.com' author_url 'https://barrettefabrication.com'
requires_redmine version_or_higher: '6.1.0' requires_redmine version_or_higher: '6.1.0'
+1
View File
@@ -18,5 +18,6 @@ module RedmineQboVehicles
Vehicles::Hooks::IssuesShowHookListener Vehicles::Hooks::IssuesShowHookListener
Vehicles::Hooks::PdfHookListener Vehicles::Hooks::PdfHookListener
Vehicles::Hooks::ViewHookListener Vehicles::Hooks::ViewHookListener
Vehicles::Hooks::CustomerAppointmentShowHookListener
end end
end end
@@ -0,0 +1,28 @@
#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.
module Vehicles
module Hooks
class CustomerAppointmentShowHookListener < Redmine::Hook::ViewListener
include IssuesHelper
# Display vehicle information on the customer show view (right side)
def show_customer_appointment(context={})
context[:controller].send(:render_to_string, {
partial: 'customer_appointments/show_hook', locals: { appointment: context[:appointment] }
})
end
end
end
end
@@ -20,8 +20,7 @@ module Vehicles
partial: 'issues/show_issue_view_right', partial: 'issues/show_issue_view_right',
locals: { locals: {
vehicle: context[:issue].vehicle ? link_to(context[:issue].vehicle) : nil, vehicle: context[:issue].vehicle ? link_to(context[:issue].vehicle) : nil,
split_vin: context[:issue].vehicle ? context[:issue].vehicle.vin.to_s.scan(/.{1,9}/) : nil, split_vin: context[:issue].vehicle ? context[:issue].vehicle.vin.to_s.scan(/.{1,9}/) : nil
notes: context[:issue].vehicle ? context[:issue].vehicle.notes : nil
} }
}) })
end end