From e7ede4cce6e6faeccbe084558d0666fec6b052cf Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Fri, 6 Dec 2019 23:35:49 +0100 Subject: [PATCH] Implemented retake, changed default ordering to taken_at --- app/controllers/measurements_controller.rb | 7 +++++-- lib/body_tracking/project_patch.rb | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/measurements_controller.rb b/app/controllers/measurements_controller.rb index d26ba53..8eead3f 100644 --- a/app/controllers/measurements_controller.rb +++ b/app/controllers/measurements_controller.rb @@ -45,9 +45,12 @@ class MeasurementsController < ApplicationController end def retake + readouts = @measurement.readouts.map(&:dup) @measurement = @measurement.dup - prepare_measurements - redirect_to project_measurements_path(@project) + @measurement.readouts = readouts + @measurement.taken_at = Time.now + @measurement.readouts.each { |r| r.value = nil } + render :new end private diff --git a/lib/body_tracking/project_patch.rb b/lib/body_tracking/project_patch.rb index db60fb2..2a0aae8 100644 --- a/lib/body_tracking/project_patch.rb +++ b/lib/body_tracking/project_patch.rb @@ -1,7 +1,7 @@ module BodyTracking module ProjectPatch 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 :sources, dependent: :destroy