From f137fb07591ca18d1c09eaaf6c8b8d65520c9efa Mon Sep 17 00:00:00 2001 From: czup Date: Mon, 25 Nov 2019 01:10:46 +0100 Subject: [PATCH] Wyjazdy - dodano dodawanie kilku kierowcow --- app/Http/Controllers/VehiclesController.php | 16 +-- app/Http/Controllers/operationsController.php | 6 +- resources/views/operationAdd.blade.php | 118 ++++++++++++++++-- routes/web.php | 2 +- 4 files changed, 119 insertions(+), 23 deletions(-) diff --git a/app/Http/Controllers/VehiclesController.php b/app/Http/Controllers/VehiclesController.php index f845266..7bbdf9d 100644 --- a/app/Http/Controllers/VehiclesController.php +++ b/app/Http/Controllers/VehiclesController.php @@ -28,9 +28,9 @@ class VehiclesController extends Controller } public function addForm(){ - if(auth()->user() != null && auth()->user()->fireStationID != null ){ + if(auth()->user() != null && auth()->user()->fireStationID != null ){ return view('vehiclesAdd'); - + } else return view("login"); } @@ -43,14 +43,14 @@ class VehiclesController extends Controller //$fireStationCreatorId = DB::table('fireStations')->where("id", $userFireStation)->value('creatorID'); $vehicle = DB::table('vehicles')->where("id", $id)->first(); - + return view('vehiclesEdit', ["vehicle" => $vehicle]); - } + } else return "Brak dostepu"; - + } - + public function store(){ @@ -76,7 +76,7 @@ class VehiclesController extends Controller $vehicle = vehicle::create([ 'fireStationID' => auth()->user()->fireStationID, 'name' => $request-> name, - 'codename' => $request-> codename, + 'codename' => $request-> codename, 'brand' => $request-> brand, 'registrationNumber' => $request-> registrationNumber, 'productionYear' => $request-> productionYear, @@ -123,7 +123,7 @@ class VehiclesController extends Controller $request = request(); $vehicle = vehicle::find( $request->vehicleID); $vehicle-> name = $request-> name; - $vehicle-> codename = $request-> codename; + $vehicle-> codename = $request-> codename; $vehicle-> brand = $request-> brand; $vehicle-> registrationNumber = $request-> registrationNumber; $vehicle-> productionYear = $request-> productionYear; diff --git a/app/Http/Controllers/operationsController.php b/app/Http/Controllers/operationsController.php index dcc1873..e48e898 100644 --- a/app/Http/Controllers/operationsController.php +++ b/app/Http/Controllers/operationsController.php @@ -6,6 +6,7 @@ namespace App\Http\Controllers; use App\User; use App\operations; use App\operationsMembers; +use App\vehicle; use App\operationsDrivers; use Illuminate\Http\Request; @@ -28,7 +29,9 @@ class operationsController extends Controller //$fireStationID = auth()->user()->fireStationID; // $fireFighters = User::pluck('fireStationID', $fireStationID); $fireFighters = DB::table('users')->where("fireStationID", "=", auth()->user()->fireStationID )->get(); - return view("operationAdd", ["fireFighters" => $fireFighters]); + $vehicles = DB::table('vehicles')->where("fireStationID", '=', auth()->user()->fireStationID) + ->get(); + return view("operationAdd", ["fireFighters" => $fireFighters], ["vehicles" => $vehicles]); } else return view("unit"); } @@ -60,7 +63,6 @@ class operationsController extends Controller 'dangerType' => $request-> operationDangerType, 'description' => $request-> operationDescription, 'commanderID' => $request-> operationLeader, - 'driverID' => $request-> operationDriver, ]); return operationsController::create(); diff --git a/resources/views/operationAdd.blade.php b/resources/views/operationAdd.blade.php index dde4c87..0eabff4 100644 --- a/resources/views/operationAdd.blade.php +++ b/resources/views/operationAdd.blade.php @@ -1,5 +1,6 @@ @extends('layout.app') + @section('left-menu') @parent