Added MealsController#toggle_eaten
This commit is contained in:
parent
620d86b18a
commit
e659ecc760
@ -40,6 +40,7 @@ class MealsController < ApplicationController
|
|||||||
|
|
||||||
def toggle_eaten
|
def toggle_eaten
|
||||||
@meal.toggle_eaten!
|
@meal.toggle_eaten!
|
||||||
|
prepare_meals
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
@ -18,6 +18,10 @@ class Meal < ActiveRecord::Base
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def eaten_at
|
||||||
|
self[:eaten_at].getlocal if self[:eaten_at]
|
||||||
|
end
|
||||||
|
|
||||||
def toggle_eaten!
|
def toggle_eaten!
|
||||||
update(eaten_at: self.eaten_at ? nil : DateTime.current)
|
update(eaten_at: self.eaten_at ? nil : DateTime.current)
|
||||||
end
|
end
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
<% if @meals.any? { |m| m.persisted? } %>
|
<% if @meals.any? { |m| m.persisted? } %>
|
||||||
<table id="meals" class="odd-even list">
|
<table id="meals" class="odd-even list">
|
||||||
<tbody>
|
<tbody>
|
||||||
<% @meals.group_by { |m| m.eaten_at ? m.eaten_at.date : Date.current }
|
<% @meals.group_by { |m| m.eaten_at ? m.eaten_at.to_date : Date.current }
|
||||||
.each do |date, meals| %>
|
.each do |date, meals| %>
|
||||||
<tr id="day-<%= date.strftime('%Y%m%d') %>" class="day">
|
<tr id="day-<%= date.strftime('%Y%m%d') %>" class="date">
|
||||||
<td class="date" colspan="2">
|
<td class="date" colspan="2">
|
||||||
<h3><%= date == Date.current ? 'Today' : date.strftime('%F') %></h3>
|
<h3><%= date == Date.current ? 'Today' : date.strftime('%F') %></h3>
|
||||||
</td>
|
</td>
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<td class="name" colspan="2">
|
<td class="name" colspan="2">
|
||||||
<b><%= "#{t '.label_meal'} ##{index+1}" %></b>
|
<b><%= "#{t '.label_meal'} ##{index+1}" %></b>
|
||||||
<% if m.eaten_at %>
|
<% if m.eaten_at %>
|
||||||
<%= " - #{m.eaten_at.time}" %>
|
<%= " at #{m.eaten_at.strftime('%R')}" %>
|
||||||
<%= link_to '', toggle_eaten_meal_path(m),
|
<%= link_to '', toggle_eaten_meal_path(m),
|
||||||
{remote: true, method: :post, class: "icon icon-close"} %>
|
{remote: true, method: :post, class: "icon icon-close"} %>
|
||||||
<% else %>
|
<% else %>
|
||||||
|
@ -1 +1 @@
|
|||||||
$('#readouts').html('<%= j render partial: 'measurements/readouts' %>');
|
$('#meals').html('<%= j render partial: 'meals/index' %>');
|
||||||
|
Reference in New Issue
Block a user