Made UI pretty!
This commit is contained in:
@@ -4,6 +4,7 @@ class VehiclesController < ApplicationController
|
||||
def index
|
||||
@status = params[:status]
|
||||
@vehicles = vehicles_for_status(@status).order(:make, :model, :year)
|
||||
@vehicle_maintenance_statuses = vehicle_maintenance_statuses(@vehicles)
|
||||
end
|
||||
|
||||
def show
|
||||
@@ -82,15 +83,24 @@ class VehiclesController < ApplicationController
|
||||
|
||||
def maintenance_schedule_statuses(schedules)
|
||||
schedules.index_with do |schedule|
|
||||
latest_entry = latest_maintenance_entry_for(schedule)
|
||||
latest_entry = latest_maintenance_entry_for(@vehicle, schedule)
|
||||
status = MaintenanceScheduleStatus.new(schedule, latest_entry, current_odometer: @vehicle.current_odometer)
|
||||
MaintenanceNotification.record_status_change(schedule, status)
|
||||
status
|
||||
end
|
||||
end
|
||||
|
||||
def latest_maintenance_entry_for(schedule)
|
||||
@vehicle.maintenance_entries
|
||||
def vehicle_maintenance_statuses(vehicles)
|
||||
vehicles.index_with do |vehicle|
|
||||
vehicle.maintenance_schedules.active.order(:maintenance_type).map do |schedule|
|
||||
latest_entry = latest_maintenance_entry_for(vehicle, schedule)
|
||||
MaintenanceScheduleStatus.new(schedule, latest_entry, current_odometer: vehicle.current_odometer)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def latest_maintenance_entry_for(vehicle, schedule)
|
||||
vehicle.maintenance_entries
|
||||
.where("lower(name) = ?", schedule.maintenance_type.downcase)
|
||||
.order(date: :desc, created_at: :desc)
|
||||
.first
|
||||
|
||||
Reference in New Issue
Block a user