Add spreadsheet flight import; fix oil/fuel consumption charts

Flight import (owners, Flights tab → Import from spreadsheet):
- Upload .xlsx or .csv, preview, then confirm. Columns are matched by
  header name (Date, From, To, Tach, Hobbs, Oil, Fuel, Flight Time).
- Each flight's time is derived from the previous row's meter reading;
  rows are kept in file order so typos (tach going backwards) are
  flagged and skipped while the next good row absorbs the time.
- Unchanged tach imports as a 0.0 hr entry so fuel/oil isn't lost;
  "Full" fuel is warned about; re-imports skip existing rows.
- History only: component hours are untouched unless the owner opts in
  to advancing the aircraft's meters to the last reading.
- Upload redirects to a GET preview (Turbo ignores 200 renders after a
  form POST, which made the button appear to do nothing).

Consumption charts:
- Replace per-fill math (qty ÷ hours since last add), which spiked to
  80 gal/hr on partial fills and top-offs, with a rolling rate (total
  added ÷ hours over a trailing 10 h fuel / 25 h oil window).
- Headline shows recent (last ~50/100 hrs) and lifetime rates; straight
  chart lines instead of splines.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
rickyandClaude Opus 5.5 committed 2026-11-04 19:23:47 -05:00
1 parent 38df19c331
commit 4d3dc7150a
21 files changed
+820 -75

No files matched your search

+41 -24
View File
@@ -1,33 +1,50 @@
require "test_helper"
class ConsumptionStatsTest < ActiveSupport::TestCase
test "oil hrs/qt average excludes IQR outliers and excluded records" do
a = create_aircraft
a.consumable_records.create!(record_type: "oil", date: Date.current, quantity_added: 1, flight_hours: 100)
hours = 100.0
# interval values (hrs/qt): 10, 11, 9, 10, 1 (outlier), 12, 10 (manually excluded)
[ [ 10, false ], [ 11, false ], [ 9, false ], [ 10, false ], [ 1, false ], [ 12, false ], [ 10, true ] ].each do |dh, excl|
hours += dh
a.consumable_records.create!(record_type: "oil", date: Date.current, quantity_added: 1, flight_hours: hours,
excluded_from_averages: excl)
end
stats = ConsumptionStats.new(a, "oil")
assert_equal 7, stats.points.size
assert_equal 10.4, stats.average # (10+11+9+10+12)/5
setup { @a = create_aircraft }
def add(type, hours, qty, excluded: false)
@a.consumable_records.create!(record_type: type, date: Date.current, flight_hours: hours,
quantity_added: qty, excluded_from_averages: excluded)
end
test "zero spread disables outlier filtering (matches original)" do
a = create_aircraft
[ 100, 110, 120, 130, 131, 141 ].each do |h|
a.consumable_records.create!(record_type: "oil", date: Date.current, quantity_added: 1, flight_hours: h)
end
assert_equal 8.2, ConsumptionStats.new(a, "oil").average
test "partial fills and top-offs don't spike fuel burn" do
add "fuel", 100, 20 # baseline fill
add "fuel", 105, 20
add "fuel", 105.2, 10 # top-off 0.2 h later: per-fill math would say 50 gal/hr
add "fuel", 110, 30
stats = ConsumptionStats.new(@a, "fuel")
assert_equal [ [ 110.0, 6.0 ] ], stats.points # 60 gal over 10 h
assert_equal 6.0, stats.recent
assert_equal 6.0, stats.lifetime
end
test "fuel gal/hr" do
a = create_aircraft
a.consumable_records.create!(record_type: "fuel", date: Date.current, quantity_added: 40, flight_hours: 100)
a.consumable_records.create!(record_type: "fuel", date: Date.current, quantity_added: 17, flight_hours: 102)
assert_equal 8.5, ConsumptionStats.new(a, "fuel").average
test "oil hrs/qt rolling window, oil changes excluded" do
add "oil", 0, 6
add "oil", 10, 1
add "oil", 20, 6, excluded: true # oil change
add "oil", 25, 1
add "oil", 30, 1
add "oil", 40, 1
stats = ConsumptionStats.new(@a, "oil")
assert_equal 10.0, stats.lifetime # 40 h / 4 qt counted
assert_equal [ 25.0, 12.5 ], stats.points.first # first 25 h window: 25 h / 2 qt (oil change not counted)
assert_equal 10.0, stats.latest # window 10→40 h: 30 h / 3 qt
end
test "recent window looks back about 50 fuel hours" do
add "fuel", 0, 10
add "fuel", 100, 1000 # old era: 10 gal/hr
add "fuel", 150, 300 # recent: 6 gal/hr
stats = ConsumptionStats.new(@a, "fuel")
assert_equal 6.0, stats.recent
assert_equal 8.7, stats.lifetime # 1300 / 150
end
test "too little history" do
add "oil", 10, 1
stats = ConsumptionStats.new(@a, "oil")
assert_nil stats.recent
assert_empty stats.points
end
end