mirror of
https://github.com/rickbarrette/redmine_qbo_vehicles.git
synced 2026-08-18 21:20:43 -04:00
Refactor vehicle views for improved formatting and note handling
This commit is contained in:
@@ -8,10 +8,13 @@
|
||||
<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>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="vehicle_notes attribute">
|
||||
<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>
|
||||
@@ -5,7 +5,6 @@
|
||||
|
||||
<table>
|
||||
<tbody>
|
||||
|
||||
<tr>
|
||||
<th><%= t(:field_customer) %></th>
|
||||
<td><%= vehicle.customer ? link_to(vehicle.customer.name, customer_path(vehicle.customer)) : t(:no_customer) %></td>
|
||||
@@ -23,35 +22,29 @@
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th><%= t(:label_trim) %></th>
|
||||
<td><%= vehicle.doors %> <%= t(:label_door) if vehicle.doors? %> <%= vehicle.trim %></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="splitcontentleft">
|
||||
|
||||
<div class="splitcontentright">
|
||||
<h4><%= t(:field_notes) %>:</h4>
|
||||
<pre id="note-display" style="text-align: left; white-space: pre-wrap; font-family: inherit; ">
|
||||
<td><%= vehicle.notes %></td>
|
||||
</pre>
|
||||
</tr>
|
||||
|
||||
<script>
|
||||
const preElement = document.getElementById('note-display');
|
||||
// This takes the text, trims the edges, and puts it back
|
||||
preElement.textContent = preElement.textContent.trim();
|
||||
</script>
|
||||
|
||||
<div class="vehicle_notes attribute">
|
||||
<div class="label"><%= t(:field_notes) %>:</div>
|
||||
<% if vehicle.notes.present? %>
|
||||
<div class="value wiki">
|
||||
<%= textilizable(vehicle, :notes) %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%
|
||||
mileage = vehicle.last_service_mileage
|
||||
%>
|
||||
<% mileage = vehicle.last_service_mileage %>
|
||||
|
||||
<% if mileage %>
|
||||
<p>
|
||||
|
||||
@@ -42,7 +42,14 @@
|
||||
<div class="clearfix">
|
||||
<%=t(:field_notes)%>:
|
||||
<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>
|
||||
|
||||
|
||||
@@ -20,8 +20,7 @@ module Vehicles
|
||||
partial: 'issues/show_issue_view_right',
|
||||
locals: {
|
||||
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,
|
||||
notes: context[:issue].vehicle ? context[:issue].vehicle.notes : nil
|
||||
split_vin: context[:issue].vehicle ? context[:issue].vehicle.vin.to_s.scan(/.{1,9}/) : nil
|
||||
}
|
||||
})
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user