Logbook: a new entry can mark its sub-components serviced or replaced on the Components tab, dated to the entry

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
rickyandClaude Opus 5.5 committed 2026-11-11 20:57:18 -05:00
1 parent 8bea2abf75
commit 87e30946fe
5 files changed
+53 -4

No files matched your search

+14 -1
View File
@@ -37,6 +37,7 @@ class LogbookEntriesController < ApplicationController
@entry.assign_parts(parts_params, @aircraft)
if @entry.save
log_event("logbook", "Logbook entry #{@entry.supersedes ? 'correction ' : ''}added (#{@entry.date})")
record_parts_service
redirect_to aircraft_logbook_entry_path(@aircraft, @entry),
notice: @entry.supersedes ? "Correction saved. Sign it to supersede the original entry." : "Logbook entry added."
else
@@ -88,7 +89,19 @@ class LogbookEntriesController < ApplicationController
copy
end
# Sub-components ticked on the form: { component_id => { include, hours, since } }.
# Sub-components marked "Serviced" or "Replaced" on a new entry: recorded on
# the Components tab too, dated to the entry.
def record_parts_service
parts_params.each do |id, p|
next unless p["include"] == "1" && %w[serviced replaced].include?(p["service"])
part = @entry.parts.find { _1.component_id == id.to_i } or next
component = part.component
component.service_from_entry!(date: @entry.date, hours_at_entry: part.hours_at_entry, replaced: p["service"] == "replaced")
log_event("component", "#{p['service'] == 'replaced' ? 'Replaced' : 'Serviced'}: #{component} (logbook entry #{@entry.date})")
end
end
# Sub-components ticked on the form: { component_id => { include, hours, since, service } }.
def parts_params
params.fetch(:logbook_entry, {}).permit(parts: {})[:parts]&.to_h || {}
end
+10
View File
@@ -90,6 +90,16 @@ class Component < ApplicationRecord
# Service reset: always zeroes time since overhaul; optionally the whole
# in-service clock when the part was physically replaced.
# Serviced (or replaced) as recorded in a logbook entry: dated to the entry,
# with the hours it has run since then (its total time now less its total
# time at the entry) as the new time since service.
def service_from_entry!(date:, hours_at_entry:, replaced: false)
since = hours_at_entry ? [ hours_in_service.to_d - hours_at_entry.to_d, 0 ].max : 0
attrs = { hours_since_overhaul: since, overhaul_date: date }
attrs.merge!(hours_in_service: since, date_in_service: date) if replaced
update!(attrs)
end
def reset_service!(reset_in_service: false)
attrs = { hours_since_overhaul: 0, overhaul_date: Date.current }
attrs.merge!(hours_in_service: 0, date_in_service: Date.current) if reset_in_service
@@ -27,7 +27,7 @@
<% part = parts[c.id] %>
<% ancestors = c.ancestor_ids %>
<% field = "#{f.object_name}[parts][#{c.id}]" %>
<div class="grid items-end gap-2 sm:grid-cols-[1fr_9rem_9rem]" data-component-times-target="part" data-ancestors="<%= ancestors.join(' ') %>"
<div class="grid items-end gap-2 <%= f.object.new_record? ? 'sm:grid-cols-[1fr_9rem_9rem_10rem]' : 'sm:grid-cols-[1fr_9rem_9rem]' %>" data-component-times-target="part" data-ancestors="<%= ancestors.join(' ') %>"
data-total="<%= c.hours_in_service.to_f %>" data-since="<%= c.hours_since_overhaul.to_f %>"
<%= "hidden" unless selected && ancestors.include?(selected.id) %>>
<label class="flex items-center gap-2 text-sm">
@@ -41,8 +41,13 @@
<div><label class="text-xs text-slate-500" for="part_<%= c.id %>_since"><%= c.since_overhaul_abbreviation.capitalize %></label>
<%= number_field_tag "#{field}[since]", part&.since_overhaul_at_entry, id: "part_#{c.id}_since", step: 0.1, class: "input",
data: { role: "since", action: "input->component-times#partEdited" } %></div>
<% if f.object.new_record? %>
<div><label class="text-xs text-slate-500" for="part_<%= c.id %>_service">On the Components tab</label>
<%= select_tag "#{field}[service]", options_for_select([ [ "Not changed", "" ], [ "Serviced", "serviced" ], [ "Replaced", "replaced" ] ], params.dig(:logbook_entry, :parts, c.id.to_s, :service)),
id: "part_#{c.id}_service", class: "input" %></div>
<% end %>
</div>
<% end %>
<p class="hint">Their times are worked out the same way as the component's. Sub-components are set up on the Components tab (a part's "Parent component").</p>
<p class="hint">Their times are worked out the same way as the component's. Sub-components are set up on the Components tab (a part's "Parent component").<%= " “Serviced” or “Replaced” also records it on the Components tab (e.g. an oil and filter change), dated to this entry." if f.object.new_record? %></p>
</fieldset>
<% end %>