1
0

Moved adjust from IngredientsController to MealsController

This commit is contained in:
cryptogopher 2020-05-02 16:49:54 +02:00
parent 4397249fa9
commit b3f7199f93
6 changed files with 23 additions and 12 deletions

View File

@ -1,12 +1,5 @@
class IngredientsController < ApplicationController
include Concerns::Finders
before_action :find_ingredient, only: [:adjust]
before_action :authorize
def adjust
amount = params[:adjustment].to_i
@ingredient.amount += amount if @ingredient.amount > -amount
@ingredient.save
end
end

View File

@ -9,6 +9,7 @@ class MealsController < ApplicationController
before_action :find_quantity_by_quantity_id, only: [:toggle_exposure]
before_action :find_meal, only: [:edit, :update, :destroy, :edit_notes, :update_notes,
:toggle_eaten]
before_action :find_ingredient, only: [:adjust]
before_action :authorize
def index
@ -65,6 +66,17 @@ class MealsController < ApplicationController
prepare_meals
end
def adjust
amount = params[:adjustment].to_i
@ingredient.amount += amount if @ingredient.amount > -amount
@ingredient.save
prepare_meals
@meal = @ingredient.composition
@date = @meal.display_date
@meal_index = @meals_by_date[@date].index(@meal)
end
private
def meal_params

View File

@ -1,2 +0,0 @@
$('tr[id=ingredient-<%= @ingredient.id %>] td.amount span')
.html('<%= j "#{@ingredient.amount}" %>');

View File

@ -0,0 +1,9 @@
$('tr[id=ingredient-<%= @ingredient.id %>]').replaceWith(
'<%= j render partial: 'meals/show_ingredient', locals: {i: @ingredient} %>'
);
$('tr[id=meal-<%= @meal.id %>]').replaceWith(
'<%= j render partial: 'meals/show', locals: {m: @meal, index: @meal_index} %>'
);
$('tr[id=date-<%= @date.strftime('%Y%m%d') %>]').replaceWith(
'<%= j render partial: 'meals/show_date', locals: {date: @date} %>'
);

View File

@ -8,7 +8,7 @@ resources :projects, shallow: true do
end
end
resources :ingredients, only: [] do
post 'adjust/:adjustment', to: 'ingredients#adjust', as: :adjust, on: :member
post 'adjust/:adjustment', to: 'meals#adjust', as: :adjust, on: :member
end
resources :meals, only: [:index, :new, :create, :edit, :update, :destroy] do
member do

View File

@ -23,9 +23,8 @@ Redmine::Plugin.register :body_tracking do
}, read: true
permission :manage_common, {
body_trackers: [:defaults],
ingredients: [:adjust],
meals: [:new, :create, :edit, :update, :destroy, :edit_notes, :update_notes,
:toggle_eaten, :toggle_exposure],
:toggle_eaten, :toggle_exposure, :adjust],
measurement_routines: [:edit],
measurements: [:new, :create, :edit, :update, :destroy, :retake, :toggle_exposure],
foods: [:new, :create, :edit, :update, :destroy, :toggle, :toggle_exposure,