Implemented retake, changed default ordering to taken_at
This commit is contained in:
parent
df5fb71e10
commit
e7ede4cce6
@ -45,9 +45,12 @@ class MeasurementsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def retake
|
def retake
|
||||||
|
readouts = @measurement.readouts.map(&:dup)
|
||||||
@measurement = @measurement.dup
|
@measurement = @measurement.dup
|
||||||
prepare_measurements
|
@measurement.readouts = readouts
|
||||||
redirect_to project_measurements_path(@project)
|
@measurement.taken_at = Time.now
|
||||||
|
@measurement.readouts.each { |r| r.value = nil }
|
||||||
|
render :new
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
module BodyTracking
|
module BodyTracking
|
||||||
module ProjectPatch
|
module ProjectPatch
|
||||||
Project.class_eval do
|
Project.class_eval do
|
||||||
has_many :measurements, -> { order "name" }, dependent: :destroy
|
has_many :measurements, -> { order "taken_at DESC" }, dependent: :destroy
|
||||||
has_many :ingredients, -> { order "name" }, dependent: :destroy
|
has_many :ingredients, -> { order "name" }, dependent: :destroy
|
||||||
|
|
||||||
has_many :sources, dependent: :destroy
|
has_many :sources, dependent: :destroy
|
||||||
|
Reference in New Issue
Block a user