diff --git a/app/Http/Controllers/AdjunctAdditionController.php b/app/Http/Controllers/AdjunctAdditionController.php index d6ac01d..f112fdd 100644 --- a/app/Http/Controllers/AdjunctAdditionController.php +++ b/app/Http/Controllers/AdjunctAdditionController.php @@ -4,6 +4,8 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use App\Models\Adjunctaddition; +use App\Models\Adjunct; +use App\Models\Summarie; class AdjunctAdditionController extends Controller { @@ -14,8 +16,17 @@ class AdjunctAdditionController extends Controller public function index() { - $project = Adjunctaddition::get(); - return view('adjunctadditions')->with('adjunctadditions', $project); + $adjunctadditions = Adjunctaddition::get(); + foreach ($adjunctadditions as $adjunctaddition) + { + $beername = Summarie::where('beer_id', $adjunctaddition->beer_id)->value('name'); + $adjunctname = Adjunct::where('id', $adjunctaddition->adjunct_id)->value('name'); + $altname = = Adjunct::where('id', $adjunctaddition->alternative)->value('name'); + $adjunctaddition['beer'] = $beername; + $adjunctaddition['name'] = $adjunctname; + $adjunctaddition['alternativename'] = $altname; + } + return view('adjunctadditions.index')->with('adjunctadditions', $project); } @@ -27,11 +38,9 @@ class AdjunctAdditionController extends Controller 'amount' => 'required', 'timing' => 'required', ]); - - // create project $adjunct = new Adjunctaddition; - $lastID = Adjunctaddition::orderBy('id','desc')->value('id'); + $lastID = Adjunctaddition::orderBy('id','desc')->take(1)->value('id'); $adjunct->id = number_format($lastID) + 1; $adjunct->beer_id = $request->input('beer_id'); $adjunct->adjunct_id = $request->input('adjunct_id'); @@ -44,4 +53,41 @@ class AdjunctAdditionController extends Controller return redirect('/adjunctadditions')->with('success', 'Adjunct Addition Added'); } + public function edit($id){ + $adjunctaddition = Adjunctaddition::where('id', (int)$id)->first(); + return view('adjunctadditions.edit')->with('adjunctaddition', $adjunctaddition); + } + + public function update(Request $request, $id){ + // validation + $this->validate($request,[ + 'beer_id' => 'required', + 'adjunct_id' => 'required', + 'amount' => 'required', + 'timing' => 'required', + ]); + + $adjunct = Adjunctaddition::where('id', (int)$id)->first(); + $adjunct->beer_id = $request->input('beer_id'); + $adjunct->adjunct_id = $request->input('adjunct_id'); + $adjunct->amount = $request->input('amount'); + $adjunct->timing = $request->input('timing'); + $adjunct->alternative = $request->input('alternative'); + $adjunct->notes = $request->input('notes'); + + $adjunct->save(); + + return redirect('/adjunctadditions')->with('success', 'Adjunct Addition Updated!'); + } + public function create() + { + return view('adjunctadditions.create'); + } + public function destroy($id) + { + $adjunctaddition = Adjunctaddition::find($id); + $adjunctaddition->delete(); + + return redirect('/adjunctadditions')->with('success', 'Adjunct Addition deleted!'); + } } diff --git a/resources/views/adjunctadditions.blade.php b/resources/views/adjunctadditions.blade.php index 9fbbaad..9ede88a 100644 --- a/resources/views/adjunctadditions.blade.php +++ b/resources/views/adjunctadditions.blade.php @@ -1,69 +1,8 @@ @extends('layouts.app') @section('content') -
Adjunct | +Beer | +Amount | +Timing | +Alternative | +Notes | + @if (Auth::user()->isAdmin())Admin | @endif +|
---|---|---|---|---|---|---|---|
{{$adjunctaddition->name}} | +{{$adjunctaddition->beer}} | +{{$adjunctaddition->amount}} | +{{$adjunctaddition->timing}} | +{{$adjunctaddition->alternativename}} | +{{$adjunctaddition->notes}} | + @if (Auth::user()->isAdmin()) +Edit | ++ @endif + |