Refactor vehicle views for improved formatting and note handling

app/models/vehicle.rb

@@ -33,6 +33,23 @@ class Vehicle < ApplicationRecord
     issues.includes(:invoices).flat_map(&:invoices).uniq.compact
   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)
     super(val.to_s.strip)
   end

app/views/issues/_show_issue_view_right.html.erb

@@ -1,17 +1,20 @@
 <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 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 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>

app/views/vehicles/_details.html.erb

@@ -1,13 +1,12 @@
 <div class="issue">
   <div class="splitcontent">
     <div class="splitcontentleft">
-      <h4><%=t(:label_details)%>:</h4>
+      <h4><%= t(:label_details) %>:</h4>
       
       <table>
         <tbody>
-
           <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>
           </tr>
         
@@ -19,49 +18,42 @@
           <tr>
             <th><%= t(:field_vin) %></th>
             <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>
           </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>
         </tbody>
       </table>
-      
     </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>
 
-<% 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 %>
 
 <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>

app/views/vehicles/_form.html.erb

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

app/views/vehicles/_list.html.erb

@@ -21,10 +21,22 @@
           <% if show_customer %>
             <%= vehicle.customer %>
           <% 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>
+        <br/>
       
       </div>
-      <br/>
+
     </div>
   <% end %>
 

lib/vehicles/hooks/issues_show_hook_listener.rb

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