mirror of https://github.com/kcal-app/kcal.git
Add journal entry add support (WIP)
This commit is contained in:
Christopher C. Wells
parent
2e7233b3b9
commit
dbb752d73c
|
|
@ -1,9 +1,16 @@
|
|||
<?php
|
||||
/**
|
||||
* @noinspection PhpDocSignatureInspection
|
||||
*/
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Food;
|
||||
use App\Models\JournalEntry;
|
||||
use App\Models\Recipe;
|
||||
use App\Rules\ArrayNotEmpty;
|
||||
use Illuminate\Contracts\View\View;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
|
@ -12,13 +19,11 @@ class JournalEntryController extends Controller
|
|||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @return \Illuminate\Contracts\View\View
|
||||
*/
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$date = $request->date ?? Carbon::now()->toDateString();
|
||||
return view('journal.index')
|
||||
return view('journal-entries.index')
|
||||
->with('entries', JournalEntry::where([
|
||||
'user_id' => Auth::user()->id,
|
||||
'date' => $date,
|
||||
|
|
@ -29,23 +34,70 @@ class JournalEntryController extends Controller
|
|||
|
||||
/**
|
||||
* Show the form for creating a new resource.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function create()
|
||||
public function create(): View
|
||||
{
|
||||
//
|
||||
$foods = Food::all(['id', 'name', 'detail', 'brand'])
|
||||
->sortBy('name')
|
||||
->collect()
|
||||
->map(function ($food) {
|
||||
return [
|
||||
'value' => $food->id,
|
||||
'label' => "{$food->name}"
|
||||
. ($food->detail ? ", {$food->detail}" : "")
|
||||
. ($food->brand ? " ({$food->brand})" : ""),
|
||||
];
|
||||
});
|
||||
$recipes = Recipe::all(['id', 'name'])
|
||||
->sortBy('name')
|
||||
->collect()
|
||||
->map(function ($recipe) {
|
||||
return ['value' => $recipe->id, 'label' => $recipe->name];
|
||||
});
|
||||
return view('journal-entries.create')
|
||||
->with('foods', $foods)
|
||||
->with('recipes', $recipes)
|
||||
->with('meals', [
|
||||
['value' => 'breakfast', 'label' => 'Breakfast'],
|
||||
['value' => 'lunch', 'label' => 'Lreakfast'],
|
||||
['value' => 'dinner', 'label' => 'Dreakfast'],
|
||||
['value' => 'snacks', 'label' => 'Snacks'],
|
||||
])
|
||||
->with('units', [
|
||||
['value' => 'tsp', 'label' => 'tsp.'],
|
||||
['value' => 'tbsp', 'label' => 'tbsp.'],
|
||||
['value' => 'cup', 'label' => 'cup'],
|
||||
['value' => 'oz', 'label' => 'oz'],
|
||||
['value' => 'servings', 'label' => 'servings'],
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
public function store(Request $request): RedirectResponse
|
||||
{
|
||||
//
|
||||
$input = $request->validate([
|
||||
'date' => 'required|date',
|
||||
'meal' => 'required|string',
|
||||
'amounts' => ['required', 'array', new ArrayNotEmpty],
|
||||
'amounts.*' => 'required_with:foods.*,recipes.*|nullable|numeric|min:0',
|
||||
'units' => ['required', 'array', new ArrayNotEmpty],
|
||||
'units.*' => 'nullable|string',
|
||||
'foods' => 'required|array',
|
||||
'foods.*' => 'nullable|exists:App\Models\Food,id',
|
||||
'recipes' => 'required|array',
|
||||
'recipes.*' => 'nullable|exists:App\Models\Recipe,id',
|
||||
]);
|
||||
|
||||
$foods_selected = array_filter($input['foods']);
|
||||
if (!empty($foods_selected)) {
|
||||
/** @var \App\Models\Food $foods */
|
||||
$foods = Food::findMany($foods_selected);
|
||||
foreach ($foods_selected as $key => $id) {
|
||||
// TODO: Calculate totals with NutrientCalculator.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -0,0 +1,106 @@
|
|||
<x-app-layout>
|
||||
<x-slot name="header">
|
||||
<h2 class="font-semibold text-xl text-gray-800 leading-tight">
|
||||
{{ __('Add Journal Entry') }}
|
||||
</h2>
|
||||
</x-slot>
|
||||
|
||||
<div class="py-12">
|
||||
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
|
||||
@if (session()->has('message'))
|
||||
<div class="bg-green-200 border-2 border-green-600 p-2 mb-2">
|
||||
{{ session()->get('message') }}
|
||||
</div>
|
||||
@endif
|
||||
@if ($errors->any())
|
||||
<div class="flex flex-col space-y-2 pb-2">
|
||||
@foreach ($errors->all() as $error)
|
||||
<div class="bg-red-200 border-2 border-red-900 p-2">
|
||||
{{ $error }}
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
|
||||
<div class="p-6 bg-white border-b border-gray-200">
|
||||
<form method="POST" action="{{ route('journal-entries.store') }}">
|
||||
@csrf
|
||||
<div class="flex flex-row mb-4 space-x-4">
|
||||
<!-- Date -->
|
||||
<div>
|
||||
<x-inputs.label for="date" :value="__('Date')"/>
|
||||
|
||||
<x-inputs.input id="date"
|
||||
class="block mt-1"
|
||||
type="date"
|
||||
name="date"
|
||||
:value="old('date', \Illuminate\Support\Carbon::now()->toDateString())"
|
||||
required />
|
||||
</div>
|
||||
|
||||
<!-- Meal -->
|
||||
<div>
|
||||
<x-inputs.label for="meal" :value="__('Meal')"/>
|
||||
|
||||
<x-inputs.select name="meal"
|
||||
class="block mt-1"
|
||||
:options="$meals"
|
||||
:selectedValue="old('meal')"
|
||||
required>
|
||||
<option value=""></option>
|
||||
</x-inputs.select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid grid-cols-12 gap-4 items-center">
|
||||
<x-inputs.label for="amounts" :value="__('Amount')"/>
|
||||
<x-inputs.label for="units" :value="__('Unit')" class="col-span-2"/>
|
||||
<x-inputs.label for="foods" :value="__('Food')" class="col-span-4"/>
|
||||
<div class="text-center">- or -</div>
|
||||
<x-inputs.label for="recipes" :value="__('Recipe')" class="col-span-4"/>
|
||||
@for ($i = 0; $i < 10; $i++)
|
||||
<div>
|
||||
<x-inputs.input type="number"
|
||||
name="amounts[]"
|
||||
class="block w-full"
|
||||
:value="old('amounts.' . $i)"
|
||||
step="any" />
|
||||
</div>
|
||||
<div class="col-span-2">
|
||||
<x-inputs.select name="units[]"
|
||||
class="block w-full"
|
||||
:options="$units"
|
||||
:selectedValue="old('units.' . $i)">
|
||||
<option value=""></option>
|
||||
</x-inputs.select>
|
||||
</div>
|
||||
<div class="col-span-4">
|
||||
<x-inputs.select name="foods[]"
|
||||
class="block w-full"
|
||||
:options="$foods"
|
||||
:selectedValue="old('foods.' . $i)">
|
||||
<option value=""></option>
|
||||
</x-inputs.select>
|
||||
</div>
|
||||
<div class="text-center">- or -</div>
|
||||
<div class="col-span-4">
|
||||
<x-inputs.select name="recipes[]"
|
||||
class="block w-full"
|
||||
:options="$recipes"
|
||||
:selectedValue="old('recipes.' . $i)">
|
||||
<option value=""></option>
|
||||
</x-inputs.select>
|
||||
</div>
|
||||
@endfor
|
||||
</div>
|
||||
<div class="flex items-center justify-end mt-4">
|
||||
<x-inputs.button class="ml-3">
|
||||
{{ __('Add') }}
|
||||
</x-inputs.button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</x-app-layout>
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
<div class="p-2 font-light rounded-lg border-2 border-gray-200">
|
||||
<div class="pb-2 lowercase flex justify-between items-baseline">
|
||||
<div class="text-2xl">
|
||||
<a href="{{ route('recipes.show', $recipe->id) }}"
|
||||
<a href="{{ route('recipes.show', $recipe) }}"
|
||||
class="text-gray-600 hover:text-gray-800">{{ $recipe->name }}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue