RomanNum3ral
/
kcal
mirror of https://github.com/kcal-app/kcal.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for old values in recipe form

This commit is contained in:
Christopher C. Wells 2021-01-21 05:54:35 -08:00 committed by Christopher Charbonneau Wells
parent cec27ff0b0
commit f499e5ffb7
4 changed files with 79 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Food.php
View File

@ -105,7 +105,7 @@ class Food extends Model
protected $appends = ['serving_size_formatted']; protected $appends = ['serving_size_formatted'];
/** /**
* Get the serving size as a fractional. * Get the serving size as a formatted string (e.g. 0.5 = 1/2).
*/ */
public function getServingSizeFormattedAttribute(): string { public function getServingSizeFormattedAttribute(): string {
return Number::fractionStringFromFloat($this->serving_size); return Number::fractionStringFromFloat($this->serving_size);

13
app/Models/FoodAmount.php
View File

@ -2,6 +2,7 @@
namespace App\Models; namespace App\Models;
use App\Support\Number;
use App\Support\Nutrients; use App\Support\Nutrients;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
@ -74,6 +75,18 @@ class FoodAmount extends Model
'sodium', 'sodium',
]; ];
/**
* @inheritdoc
*/
protected $appends = ['amount_formatted'];
/**
* Get the amount as a formatted string (e.g. 0.5 = 1/2).
*/
public function getAmountFormattedAttribute(): string {
return Number::fractionStringFromFloat($this->amount);
}
/** /**
* Get the Food this amount belongs to. * Get the Food this amount belongs to.
*/ */

85
resources/views/recipes/edit.blade.php
View File

@ -64,50 +64,32 @@
<!-- Ingredients --> <!-- Ingredients -->
<h3 class="pt-2 mb-2 font-extrabold">Ingredients</h3> <h3 class="pt-2 mb-2 font-extrabold">Ingredients</h3>
<div x-data="{ ingredients: 0 }"> <div x-data="{ ingredients: 0 }">
@foreach($recipe->foodAmounts as $foodAmount) @if(old('ingredients'))
<div class="flex flex-row space-x-4 mb-4"> @foreach(old('ingredients') as $i => $ingredient)
<x-inputs.input type="text" @if (empty($ingredient) && empty(old('ingredients_amount')[$i]) && empty(old('ingredients_unit')[$i]))
name="ingredients_amount[]" @continue
size="5" @endif
:value="old('ingredients_amount.' . $loop->index, \App\Support\Number::fractionStringFromFloat($foodAmount->amount))" /> @include('recipes.partials.ingredient-input', [
<x-inputs.select name="ingredients_unit[]" 'amount' => old('ingredients_amount')[$i],
:options="$ingredients_units" 'unit' => old('ingredients_unit')[$i],
:selectedValue="old('ingredients_unit.' . $loop->index, $foodAmount->unit)"> 'food_id' => old('ingredients')[$i],
<option value=""></option> 'food_name' => old('ingredients_name')[$i],
</x-inputs.select> 'detail' => old('ingredients_detail')[$i],
<x-ingredient-picker :default-id="old('ingredients.' . $loop->index, $foodAmount->food->id)" ])
:default-name="old('ingredients_name.' . $loop->index, $foodAmount->food->name)"/>
<x-inputs.input type="text"
class="block"
name="ingredients_detail[]"
:value="old('ingredients_detail.' . $loop->index, $foodAmount->detail)" />
<x-inputs.icon-button type="button" color="red" x-on:click="$event.target.parentNode.remove();">
<svg class="h-8 w-8 pointer-events-none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
<path fill-rule="evenodd" d="M9 2a1 1 0 00-.894.553L7.382 4H4a1 1 0 000 2v10a2 2 0 002 2h8a2 2 0 002-2V6a1 1 0 100-2h-3.382l-.724-1.447A1 1 0 0011 2H9zM7 8a1 1 0 012 0v6a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v6a1 1 0 102 0V8a1 1 0 00-1-1z" clip-rule="evenodd" />
</svg>
</x-inputs.icon-button>
</div>
@endforeach @endforeach
<!-- TODO: Handle old values!! --> @else
@foreach($recipe->foodAmounts as $foodAmount)
@include('recipes.partials.ingredient-input', [
'amount' => $foodAmount->amount_formatted,
'unit' => $foodAmount->unit,
'food_id' => $foodAmount->food->id,
'food_name' => $foodAmount->food->name,
'detail' => $foodAmount->detail,
])
@endforeach
@endif
<template x-for="i in ingredients + 1"> <template x-for="i in ingredients + 1">
<div class="flex flex-row space-x-4 mb-4"> @include('recipes.partials.ingredient-input')
<x-inputs.input type="text"
name="ingredients_amount[]"
size="5" />
<x-inputs.select name="ingredients_unit[]"
:options="$ingredients_units" >
<option value=""></option>
</x-inputs.select>
<x-ingredient-picker/>
<x-inputs.input type="text"
class="block"
name="ingredients_detail[]" />
<x-inputs.icon-button type="button" color="red" x-on:click="$event.target.parentNode.remove();">
<svg class="h-8 w-8 pointer-events-none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
<path fill-rule="evenodd" d="M9 2a1 1 0 00-.894.553L7.382 4H4a1 1 0 000 2v10a2 2 0 002 2h8a2 2 0 002-2V6a1 1 0 100-2h-3.382l-.724-1.447A1 1 0 0011 2H9zM7 8a1 1 0 012 0v6a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v6a1 1 0 102 0V8a1 1 0 00-1-1z" clip-rule="evenodd" />
</svg>
</x-inputs.icon-button>
</div>
</template> </template>
<x-inputs.icon-button type="button" color="green" x-on:click="ingredients++;"> <x-inputs.icon-button type="button" color="green" x-on:click="ingredients++;">
<svg class="h-10 w-10" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor"> <svg class="h-10 w-10" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
@ -119,20 +101,27 @@
<!-- Steps --> <!-- Steps -->
<h3 class="pt-2 mb-2 font-extrabold">Steps</h3> <h3 class="pt-2 mb-2 font-extrabold">Steps</h3>
@php($step_number = 0) @php($step_number = 0)
<div x-data="{steps: 0}"> <div x-data="{ steps: 0 }">
@if(old('steps'))
@foreach(old('steps') as $i => $step)
@if (empty($step)) @continue @endif
<div class="flex flex-row space-x-4 mb-4">
<div class="text-3xl text-gray-400 text-center">{{ $step_number++ }}</div>
<x-inputs.textarea class="block mt-1 w-full" name="steps[]" :value="$step" />
</div>
@endforeach
@else
@foreach($recipe->steps as $step) @foreach($recipe->steps as $step)
<div class="flex flex-row space-x-4 mb-4"> <div class="flex flex-row space-x-4 mb-4">
<div class="text-3xl text-gray-400 text-center">{{ $step_number++ }}</div> <div class="text-3xl text-gray-400 text-center">{{ $step_number++ }}</div>
<x-inputs.textarea class="block mt-1 w-full" <x-inputs.textarea class="block mt-1 w-full" name="steps[]" :value="$step->step" />
name="steps[]"
:value="old('steps.' . $loop->index, $step->step)" />
</div> </div>
@endforeach @endforeach
@endif
<template x-for="i in steps + 1"> <template x-for="i in steps + 1">
<div class="flex flex-row space-x-4 mb-4"> <div class="flex flex-row space-x-4 mb-4">
<div class="text-3xl text-gray-400 text-center" x-text="{{ $step_number }} + i"></div> <div class="text-3xl text-gray-400 text-center" x-text="{{ $step_number }} + i"></div>
<x-inputs.textarea class="block mt-1 w-full" <x-inputs.textarea class="block mt-1 w-full" name="steps[]" />
name="steps[]" />
</div> </div>
</template> </template>
<x-inputs.icon-button type="button" color="green" x-on:click="steps++;"> <x-inputs.icon-button type="button" color="green" x-on:click="steps++;">

22
resources/views/recipes/partials/ingredient-input.blade.php Normal file
View File

@ -0,0 +1,22 @@
<div class="flex flex-row space-x-4 mb-4">
<x-inputs.input type="text"
name="ingredients_amount[]"
size="5"
:value="$amount ?? null" />
<x-inputs.select name="ingredients_unit[]"
:options="$ingredients_units"
:selectedValue="$unit ?? null">
<option value=""></option>
</x-inputs.select>
<x-ingredient-picker :default-id="$food_id ?? null"
:default-name="$food_name ?? null" />
<x-inputs.input type="text"
class="block"
name="ingredients_detail[]"
:value="$detail ?? null" />
<x-inputs.icon-button type="button" color="red" x-on:click="$event.target.parentNode.remove();">
<svg class="h-8 w-8 pointer-events-none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
<path fill-rule="evenodd" d="M9 2a1 1 0 00-.894.553L7.382 4H4a1 1 0 000 2v10a2 2 0 002 2h8a2 2 0 002-2V6a1 1 0 100-2h-3.382l-.724-1.447A1 1 0 0011 2H9zM7 8a1 1 0 012 0v6a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v6a1 1 0 102 0V8a1 1 0 00-1-1z" clip-rule="evenodd" />
</svg>
</x-inputs.icon-button>
</div>