vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v0.5.3 - Added Locations and a location_id to washing machines

Browse Source
This commit is contained in:
frederikpyt
2020-08-06 08:37:16 +02:00
parent 9b631843b0
commit 5452711665
22 changed files with 424 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/WashingMachineController.php
+13 -10
View File
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use App\Location;
use App\WashingReservation;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
@@ -44,7 +45,9 @@ class WashingMachineController extends Controller
*/
public function create()
{
return Response::detect("washing-machines.create");
$locations = Location::all();
return Response::detect("washing-machines.create", ["locations" => $locations] );
}
/**
@@ -56,12 +59,13 @@ class WashingMachineController extends Controller
public function store(Request $request)
{
$data = $request->validate([
"name" => "required"
"name" => "required",
"location_id" => "required"
]);
$machine = new WashingMachine($data);
$allMachines = WashingMachine::query()->where('name', '=', $request->name)->get();
$allMachines = WashingMachine::query()->where('name', '=', $request->name)->where('location_id', "=", $request->location_id)->get();
// If there already is a washing machine with that name, then don't add it
if (count($allMachines) > 0)
@@ -81,11 +85,7 @@ class WashingMachineController extends Controller
*/
public function show($id)
{
$machine = WashingMachine::find($id);
return Response::detect("washing-machines.show", [
"machine" => $machine
]);
}
/**
@@ -97,9 +97,11 @@ class WashingMachineController extends Controller
public function edit($id)
{
$machine = WashingMachine::find($id);
$locations = Location::all();
return Response::detect("washing-machines.edit", [
"machine" => $machine
"machine" => $machine,
"locations" => $locations
]);
}
@@ -113,13 +115,14 @@ class WashingMachineController extends Controller
public function update(Request $request, $id)
{
$data = $request->validate([
"name" => "required"
"name" => "required",
"location_id" => "required",
]);
$machine = WashingMachine::find($id);
$allMachines = WashingMachine::query()->where('name', '=', $request->name)->where('id', '!=', $id)->get();
$allMachines = WashingMachine::query()->where('name', '=', $request->name)->where('location_id', "=", $request->location_id)->where('id', '!=', $id)->get();
// If there already is a washing machine with that name, then don't change it
if (count($allMachines) > 0)