diff --git a/app/controllers/flight_logs_controller.rb b/app/controllers/flight_logs_controller.rb index 32f61ea..a2f7000 100644 --- a/app/controllers/flight_logs_controller.rb +++ b/app/controllers/flight_logs_controller.rb @@ -7,6 +7,7 @@ class FlightLogsController < ApplicationController def index @flight_logs = @aircraft.flight_logs.recent_first.includes(:user).with_attached_track_log.with_attached_engine_data + @days = FlightDay.group(@flight_logs) @stats = FlightStats.new(@aircraft) end diff --git a/app/models/flight_day.rb b/app/models/flight_day.rb new file mode 100644 index 0000000..3fa254f --- /dev/null +++ b/app/models/flight_day.rb @@ -0,0 +1,50 @@ +# One day of flying on the Flights tab: its legs in the order flown, the +# route as one chain (KOQU → KBID → KOQU), and the day's totals. +class FlightDay + attr_reader :date, :flights + + def self.group(flight_logs) + flight_logs.group_by(&:date).map { |date, flights| new(date, flights) }.sort_by(&:date).reverse + end + + def initialize(date, flights) + @date = date + # Order flown: by tach out where known, then by when they were logged. + @flights = flights.sort_by { [ _1.tach_out || 0, _1.created_at || Time.at(0) ] } + end + + # The day's airports chained leg to leg; a gap (a leg that doesn't start + # where the last one ended, or a missing code) starts a new chain: "A → B · C → D". + def route + chains = [] + current = [] + flights.each do |f| + from = f.departure_location.presence + to = f.destination_location.presence + if from && current.any? && from != current.last + chains << current + current = [] + end + current << from if from && current.empty? + current << to if to + end + chains << current if current.any? + chains.map { _1.join(" → ") }.join(" · ") + end + + def tach_time = sum(:tach_time) + def hobbs_time = sum(:hobbs_time) + def fuel_added = sum(:fuel_added) + def oil_added = sum(:oil_added) + def pilots = flights.filter_map { _1.user&.display_name }.uniq + def track_log? = flights.any? { _1.track_log.attached? } + def engine_data? = flights.any? { _1.engine_data.attached? } + + private + + # nil when no leg recorded it, so "—" can be shown instead of 0. + def sum(attr) + values = flights.filter_map(&attr) + values.sum if values.any? + end +end diff --git a/app/views/flight_logs/index.html.erb b/app/views/flight_logs/index.html.erb index e2f7cc9..ff2f444 100644 --- a/app/views/flight_logs/index.html.erb +++ b/app/views/flight_logs/index.html.erb @@ -4,28 +4,52 @@

Flight Log

<%= link_to "Export for AirTrail", new_aircraft_air_trail_export_path(@aircraft), class: "btn-secondary" %><% if owner? %><%= link_to "Standardize airport codes", aircraft_airport_codes_path(@aircraft), class: "btn-secondary" %><%= link_to "Import from spreadsheet", new_aircraft_flight_import_path(@aircraft), class: "btn-secondary" %><% end %><%= link_to "+ Log Flight", new_aircraft_flight_log_path(@aircraft), class: "btn-primary" %>
<% if @flight_logs.any? %> -
- - - - <% blank = tag.span("—", class: "text-slate-300") %> - <% @flight_logs.each do |fl| %> - - - - - - - - - - <% end %> - -
DateRouteTachHobbsOil (qt)Fuel (gal)Pilot
<%= link_to fl.date, aircraft_flight_log_path(@aircraft, fl), class: "link" %> - <%= fl.route_summary.presence || blank %> - <% if fl.track_log.attached? %>📍<% end %> - <% if fl.engine_data.attached? %>📈<% end %> - <%= fl.tach_time ? hours(fl.tach_time) : blank %><%= fl.hobbs_time ? hours(fl.hobbs_time) : blank %><%= fl.oil_added ? number_with_precision(fl.oil_added, precision: 2, strip_insignificant_zeros: true) : blank %><%= fl.fuel_added ? number_with_precision(fl.fuel_added, precision: 2, strip_insignificant_zeros: true) : blank %><%= fl.user&.display_name || blank %>
+ <% blank = tag.span("—", class: "text-slate-300") %> + <% qty = ->(v) { v ? number_with_precision(v, precision: 2, strip_insignificant_zeros: true) : blank } %> + +
+ <% @days.each do |day| %> +
+ + <%= day.date.strftime("%a %b %-d, %Y") %><%= pluralize(day.flights.size, "flight") %> + + <%= day.route.presence || blank %> + <% if day.track_log? %>📍<% end %> + <% if day.engine_data? %>📈<% end %> + <% if day.pilots.any? %><%= day.pilots.to_sentence %><% end %> + + Tach <%= day.tach_time ? hours(day.tach_time) : blank %> + Hobbs <%= day.hobbs_time ? hours(day.hobbs_time) : blank %> + Fuel <%= qty.(day.fuel_added) %> + Oil <%= qty.(day.oil_added) %> + + +
+ + + + <% day.flights.each_with_index do |fl, i| %> + + + + + + + + + + <% end %> + +
LegRouteTachHobbsFuel (gal)Oil (qt)Pilot
<%= link_to "Leg #{i + 1}", aircraft_flight_log_path(@aircraft, fl), class: "link" %> + <%= fl.route_summary.presence || blank %> + <% if fl.track_log.attached? %>📍<% end %> + <% if fl.engine_data.attached? %>📈<% end %> + <%= fl.tach_time ? hours(fl.tach_time) : blank %><%= fl.hobbs_time ? hours(fl.hobbs_time) : blank %><%= qty.(fl.fuel_added) %><%= qty.(fl.oil_added) %><%= fl.user&.display_name || blank %>
+
+
+ <% end %>
<% else %> <%= empty_state "No flights logged yet." %> diff --git a/docs/guide/flights.md b/docs/guide/flights.md index 559ab06..51ac093 100644 --- a/docs/guide/flights.md +++ b/docs/guide/flights.md @@ -19,7 +19,7 @@ If **Enforce airworthiness** is on, neither works while the aircraft is grounded ## The Flights tab -The **Flights** tab lists flights with totals and hours by month. From there: +The **Flights** tab shows totals and hours by month, then the flight log grouped by day: each day shows the whole route flown (KOQU → KBID → KOQU; a "·" marks where the aircraft moved without a logged leg) and that day's tach and Hobbs time, fuel and oil. Click a day to see its legs, and a leg to open the flight. From there: - **Import from spreadsheet** (owners): historical flights from `.xlsx` or `.csv` (Date, From, To, Tach, Hobbs, Oil Added, Fuel Added). A preview flags problems such as a tach going backwards and skips rows already imported. It only adds history: component hours don't change unless you choose to advance the meters. - **Export for AirTrail**: a file to import into AirTrail. For automatic syncing, see [Your profile](profile.md). diff --git a/test/integration/flight_days_test.rb b/test/integration/flight_days_test.rb new file mode 100644 index 0000000..92caf23 --- /dev/null +++ b/test/integration/flight_days_test.rb @@ -0,0 +1,44 @@ +require "test_helper" + +# Flights tab grouped by day: the day's route, totals, and its legs. +class FlightDaysTest < ActionDispatch::IntegrationTest + setup do + @owner = create_user("owner@example.com") + @a = create_aircraft(owner: @owner, tail_number: "N12345") + end + + def leg(date, from, to, tach_out, tach_in, fuel: nil, oil: nil) + @a.flight_logs.create!(date: date, departure_location: from, destination_location: to, tach_out: tach_out, tach_in: tach_in, + fuel_added: fuel, oil_added: oil, user: @owner) + end + + test "legs are grouped by day with the route chained and totals added up" do + day = Date.new(2026, 11, 7) + leg(day, "KBID", "KOQU", 101.0, 101.6, fuel: 10) # logged first but flown second + leg(day, "KOQU", "KBID", 100.0, 100.7, oil: 1) + leg(day, "1B9", "KOQU", 102.0, 102.4, fuel: 5.5) # repositioned in between: a gap + leg(day - 1, "KOQU", "KOQU", 99.0, 99.5) + + days = FlightDay.group(@a.flight_logs.to_a) + assert_equal [ day, day - 1 ], days.map(&:date) + d = days.first + assert_equal "KOQU → KBID → KOQU · 1B9 → KOQU", d.route + assert_in_delta 1.7, d.tach_time, 0.001 + assert_in_delta 15.5, d.fuel_added, 0.001 + assert_equal 1, d.oil_added + assert_nil days.last.fuel_added # nothing recorded: shown as "—" + + sign_in @owner + get aircraft_flight_logs_path(@a) + assert_select "details.flight-day", 2 + assert_select "details.flight-day summary", text: /Sat Nov 7, 2026.*3 flights.*KOQU → KBID → KOQU · 1B9 → KOQU/m + assert_select "details.flight-day:first-of-type table tbody tr", 3 + assert_select "details.flight-day:first-of-type a", text: "Leg 1" + end + + test "legs with missing airports still show" do + leg(Date.new(2026, 11, 8), nil, "KOQU", 1, 1.5) + leg(Date.new(2026, 11, 8), nil, nil, 2, 2.5) + assert_equal "KOQU", FlightDay.group(@a.flight_logs.to_a).first.route + end +end