barbie-bot/fixin.me
0
0
Fork 0
forked from fixin.me/fixin.me
Code Pull Requests Activity

Merge upstream/final-form into master

Browse Source 
Incorporates WIP alternative measurement form (single select form with
multiple select actions) and readouts controller.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
barbie-bot
2026-03-13 02:38:09 +00:00
parent f52f4c83dd 1acb179851
commit 492507aea7
11 changed files with 62 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/controllers/readouts_controller.rb
View File

@@ -1,16 +1,23 @@
class ReadoutsController < ApplicationController
before_action :find_quantities, only: [:new]
before_action :find_quantity, only: [:discard]
before_action :find_quantity, only: [:new, :discard]
before_action :find_prev_quantities, only: [:new, :discard]
def new
@quantities -= @prev_quantities
# TODO: raise ParameterInvalid if new_quantities.empty?
@readouts = current_user.readouts.build(@quantities.map { |q| {quantity: q} })
new_quantities =
case params[:button]
when 'children'
@quantity.subquantities
when 'subtree'
@quantity.progenies
else
[@quantity]
end
new_quantities -= @prev_quantities
@readouts = current_user.readouts.build(new_quantities.map { |q| {quantity: q} })
@user_units = current_user.units.ordered
quantities = @prev_quantities + @quantities
quantities = @prev_quantities + new_quantities
@superquantity = current_user.quantities
.common_ancestors(quantities.map(&:parent_id)).first
end
@@ -24,9 +31,6 @@ class ReadoutsController < ApplicationController
private
def find_quantities
@quantities = current_user.quantities.find(params[:quantity])
end
def find_quantity
@quantity = current_user.quantities.find_by!(id: params[:id])