1
0

Added MeasurementRoutine as a nested Measurement model

Updated ItemsWithQuantities to work with MeasurementRoutine
Replaced ColumnViews HABTM with polymorphic HMT
Added Measurement notes
Added destroy restrictions on Quantity
Replaced BodyTrackingPluginController with Finders concern
Removed 'body_trackers' prefix from paths
Unified styling for textarea
This commit is contained in:
cryptogopher
2020-03-29 00:56:37 +01:00
parent e7a33c684f
commit 18419f1aeb
28 changed files with 260 additions and 243 deletions

View File

@@ -7,9 +7,9 @@ module IngredientsHelper
def toggle_column_options
disabled = []
enabled_columns = @project.nutrients_column_view.quantities.to_a
enabled_quantities = @project.nutrient_quantities.to_a
options = nested_set_options(@project.quantities.diet) do |q|
disabled << q.id if enabled_columns.include?(q)
disabled << q.id if enabled_quantities.include?(q)
raw("#{'&ensp;' * q.level}#{q.name}")
end
options_for_select(options, disabled: disabled)

View File

@@ -11,9 +11,9 @@ module MeasurementsHelper
def toggle_column_options
disabled = []
enabled_columns = @scoping_measurement.column_view.quantities
enabled_quantities = @routine.quantities.to_a
options = nested_set_options(@project.quantities.measurement) do |q|
disabled << q.id if enabled_columns.include?(q)
disabled << q.id if enabled_quantities.include?(q)
raw("#{'&ensp;' * q.level}#{q.name}")
end
options_for_select(options, disabled: disabled)