diff --git a/app/helpers/measurements_helper.rb b/app/helpers/measurements_helper.rb index 10536df..33cc015 100644 --- a/app/helpers/measurements_helper.rb +++ b/app/helpers/measurements_helper.rb @@ -1,6 +1,7 @@ module MeasurementsHelper def format_datetime(m) - m.taken_at.getlocal.strftime("%F %R").html_safe + m.taken_at.getlocal + .strftime("%F %R (#{time_ago_in_words(m.taken_at)} ago)").html_safe end def format_time(m) diff --git a/app/models/column_view.rb b/app/models/column_view.rb index 5cf2b0f..7a1f175 100644 --- a/app/models/column_view.rb +++ b/app/models/column_view.rb @@ -2,7 +2,7 @@ class ColumnView < ActiveRecord::Base enum domain: Quantity.domains belongs_to :project, required: true - has_and_belongs_to_many :quantities + has_and_belongs_to_many :quantities, -> { order "lft" } validates :name, presence: true, uniqueness: {scope: :domain} validates :domain, inclusion: {in: domains.keys} @@ -10,9 +10,10 @@ class ColumnView < ActiveRecord::Base # TODO: enforce column_view - quantity 'domain' identity def toggle_column!(q) column = self.quantities.find(q.id) - self.quantites.destroy(column) + self.quantities.destroy(column) rescue ActiveRecord::RecordNotFound # Cannot 'create' association, as ColumnView (parent) may not be saved yet - self.quantities.append(q).save! + self.quantities.append(q) + self.save! end end diff --git a/app/models/measurement.rb b/app/models/measurement.rb index 4a1126f..64d6e3f 100644 --- a/app/models/measurement.rb +++ b/app/models/measurement.rb @@ -69,7 +69,8 @@ class Measurement < ActiveRecord::Base return unless old_column_view if self.project.measurements.exists?(name: self.name_was) - self.column_view.quantities.append(old_column_view.quantities).save! + self.column_view.quantities.append(old_column_view.quantities) + self.save! else old_column_view.update!(name: self.name) end diff --git a/app/views/measurements/_readouts.html.erb b/app/views/measurements/_readouts.html.erb index 0185ae8..fa92dab 100644 --- a/app/views/measurements/_readouts.html.erb +++ b/app/views/measurements/_readouts.html.erb @@ -24,7 +24,12 @@