From 5f139cd4252ef060bef8caeb659a5680ee0eecb3 Mon Sep 17 00:00:00 2001 From: Krzysztof Strzelecki Date: Sat, 28 Dec 2019 19:01:42 +0100 Subject: [PATCH] =?UTF-8?q?zawieszanie=20i=20odwieszanie=20pojazd=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/VehiclesController.php | 20 +++++++++++ app/vehicle.php | 2 +- ...28_165307_add_status_to_vehicles_table.php | 33 +++++++++++++++++++ resources/views/vehicles.blade.php | 25 ++++++++++---- resources/views/vehiclesAdd.blade.php | 13 +++++--- resources/views/vehiclesEdit.blade.php | 8 +++++ routes/web.php | 2 ++ 7 files changed, 91 insertions(+), 12 deletions(-) create mode 100644 database/migrations/2019_12_28_165307_add_status_to_vehicles_table.php diff --git a/app/Http/Controllers/VehiclesController.php b/app/Http/Controllers/VehiclesController.php index 276a5c8..ae4099b 100644 --- a/app/Http/Controllers/VehiclesController.php +++ b/app/Http/Controllers/VehiclesController.php @@ -90,6 +90,7 @@ class VehiclesController extends Controller 'chassisPoductionYear' => $request-> chassisPoductionYear, 'entryIntoServiceDate' => formatDate($request-> entryIntoServiceDate), 'fireEnginePumpDescription' => $request-> fireEnginePumpDescription, + 'status' => $request-> status ]); return redirect()->to('/pojazdy'); @@ -137,6 +138,7 @@ class VehiclesController extends Controller $vehicle-> chassisPoductionYear = $request-> chassisPoductionYear; $vehicle-> entryIntoServiceDate = formatDate($request-> entryIntoServiceDate); $vehicle-> fireEnginePumpDescription = $request-> fireEnginePumpDescription; + $vehicle-> status = $request-> status; $vehicle->save(); return redirect()->to('/pojazdy');; @@ -147,4 +149,22 @@ class VehiclesController extends Controller vehicle::where('id',$id)->delete(); return redirect()->to('/pojazdy'); } + + public function activate() + { + $request = request(); + $vehicle = vehicle::find( $request-> vehicleID); + $vehicle-> status = 1; + $vehicle->save(); + return redirect()->to('/pojazdy'); + } + + public function deactivate() + { + $request = request(); + $vehicle = vehicle::find( $request-> vehicleID); + $vehicle-> status = 0; + $vehicle->save(); + return redirect()->to('/pojazdy'); + } } diff --git a/app/vehicle.php b/app/vehicle.php index 3c3fb6b..27d26af 100644 --- a/app/vehicle.php +++ b/app/vehicle.php @@ -12,7 +12,7 @@ class vehicle extends Model protected $table = 'vehicles'; protected $fillable = [ - 'fireStationID','name', 'codename', 'brand', 'registrationNumber', 'productionYear', 'examExpirationDate', 'insuranceExpirationDate', 'driveType', 'chassisType', 'bodyProducer', 'crewNumber', 'foamAgent', 'enginePower', 'mass', 'chassisNumber', 'engineNumber', 'fuelType', 'chassisPoductionYear', 'entryIntoServiceDate', 'fireEnginePumpDescription', 'created_at', 'updated_at' + 'fireStationID','name', 'codename', 'brand', 'registrationNumber', 'productionYear', 'examExpirationDate', 'insuranceExpirationDate', 'driveType', 'chassisType', 'bodyProducer', 'crewNumber', 'foamAgent', 'enginePower', 'mass', 'chassisNumber', 'engineNumber', 'fuelType', 'chassisPoductionYear', 'entryIntoServiceDate', 'fireEnginePumpDescription', 'created_at', 'updated_at', 'status' ]; } \ No newline at end of file diff --git a/database/migrations/2019_12_28_165307_add_status_to_vehicles_table.php b/database/migrations/2019_12_28_165307_add_status_to_vehicles_table.php new file mode 100644 index 0000000..2c4b226 --- /dev/null +++ b/database/migrations/2019_12_28_165307_add_status_to_vehicles_table.php @@ -0,0 +1,33 @@ +integer('status')->default('0'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('vehicles', function (Blueprint $table) { + // + }); + } +} diff --git a/resources/views/vehicles.blade.php b/resources/views/vehicles.blade.php index e8743a7..9e95242 100644 --- a/resources/views/vehicles.blade.php +++ b/resources/views/vehicles.blade.php @@ -4,9 +4,6 @@ @parent @stop @@ -46,12 +43,26 @@ {{ $vehicle->driveType }} {{ $vehicle->examExpirationDate }} {{ $vehicle->insuranceExpirationDate }} - - + {{ csrf_field() }} @method('DELETE') - - + + + @if ($vehicle->status == 1) +
+ {{ csrf_field() }} + + +
+ @elseif ($vehicle->status == 0) +
+ {{ csrf_field() }} + + +
+ + @endif + @endforeach diff --git a/resources/views/vehiclesAdd.blade.php b/resources/views/vehiclesAdd.blade.php index 4cb9a99..bba2f95 100644 --- a/resources/views/vehiclesAdd.blade.php +++ b/resources/views/vehiclesAdd.blade.php @@ -3,10 +3,7 @@ @section('left-menu') @parent @stop @@ -114,6 +111,14 @@ +
+ + +
+
diff --git a/resources/views/vehiclesEdit.blade.php b/resources/views/vehiclesEdit.blade.php index 2b3fdfb..ab17b3a 100644 --- a/resources/views/vehiclesEdit.blade.php +++ b/resources/views/vehiclesEdit.blade.php @@ -116,6 +116,14 @@ +
+ + +
+
diff --git a/routes/web.php b/routes/web.php index d630725..5291834 100644 --- a/routes/web.php +++ b/routes/web.php @@ -66,6 +66,8 @@ Route::post('/pojazdy', 'VehiclesController@store'); Route::get('/pojazdy/edit/{id}', 'VehiclesController@editForm'); Route::post('/pojazdy/edit', 'VehiclesController@update'); Route::resource('vehicles', 'VehiclesController'); +Route::post('pojazdy/activate', 'VehiclesController@activate'); +Route::post('pojazdy/deactivate', 'VehiclesController@deactivate'); Route::get('/sprzet', 'EquipmentController@create'); Route::get('/sprzet/add', 'EquipmentController@addForm');