From 8b42974d186fba273b1ddfa8690e96eda98d0288 Mon Sep 17 00:00:00 2001
From: Krzysztof Strzelecki
Date: Fri, 6 Dec 2019 21:22:15 +0100
Subject: [PATCH] =?UTF-8?q?Dodano=20usuwanie=20sprz=C4=99tu=20i=20usuwanie?=
=?UTF-8?q?=20pojazd=C3=B3w.=20Poprawki=20przy=20dodawaniu=20pojazd=C3=B3w?=
=?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/EquipmentController.php | 11 +++-
app/Http/Controllers/VehiclesController.php | 59 ++++++++++---------
app/equipment.php | 2 +
app/vehicle.php | 2 +
...019_11_07_230105_create_vehicles_table.php | 37 ++++++------
...19_12_05_185219_create_equipment_table.php | 2 +-
resources/views/equipment.blade.php | 9 ++-
resources/views/vehicles.blade.php | 6 ++
routes/web.php | 3 +-
9 files changed, 79 insertions(+), 52 deletions(-)
diff --git a/app/Http/Controllers/EquipmentController.php b/app/Http/Controllers/EquipmentController.php
index 1ba340d..871e02e 100644
--- a/app/Http/Controllers/EquipmentController.php
+++ b/app/Http/Controllers/EquipmentController.php
@@ -12,7 +12,7 @@ class EquipmentController extends Controller
if(auth()->user() != null && auth()->user()->fireStationID != null ){
$equipment = DB::table('equipment')->where("fireStationID", '=', auth()->user()->fireStationID)
- ->get();
+ ->whereNull('deleted_at')->get();
return view("equipment", ["equipment" => $equipment]);
} else{
return view('equipment');
@@ -83,6 +83,13 @@ class EquipmentController extends Controller
$equipment-> parameter = $request-> parameter;
$equipment->save();
- return EquipmentController::create();
+ return redirect()->to('/sprzet');
+ }
+
+ public function destroy($id)
+ {
+ equipment::where('id',$id)->delete();
+
+ return redirect()->to('/sprzet');
}
}
diff --git a/app/Http/Controllers/VehiclesController.php b/app/Http/Controllers/VehiclesController.php
index 7bbdf9d..276a5c8 100644
--- a/app/Http/Controllers/VehiclesController.php
+++ b/app/Http/Controllers/VehiclesController.php
@@ -9,8 +9,11 @@ use Carbon\Carbon; // formatowanie daty
function formatDate($date)
{
- $fdate = Carbon::parse($date);
- return $fdate;
+ if ($date == null)
+ return $date;
+ else
+ $fdate = Carbon::parse($date);
+ return $fdate;
}
class VehiclesController extends Controller
@@ -19,7 +22,7 @@ class VehiclesController extends Controller
if(auth()->user() != null && auth()->user()->fireStationID != null ){
$vehicles = DB::table('vehicles')->where("fireStationID", '=', auth()->user()->fireStationID)
- ->get();
+ ->whereNull('deleted_at')->get();
return view("vehicles", ["vehicles" => $vehicles]);
} else{
return view('vehicles');
@@ -30,7 +33,6 @@ class VehiclesController extends Controller
public function addForm(){
if(auth()->user() != null && auth()->user()->fireStationID != null ){
return view('vehiclesAdd');
-
} else return view("login");
}
@@ -38,32 +40,25 @@ class VehiclesController extends Controller
{
if(auth()->user() != null && auth()->user()->fireStationID != null )
{
- //$userFireStation = auth()->user()->fireStationID;
- //$fireFighterFireStation = DB::table('users')->where("id", $id)->value('fireStationID');
- //$fireStationCreatorId = DB::table('fireStations')->where("id", $userFireStation)->value('creatorID');
-
- $vehicle = DB::table('vehicles')->where("id", $id)->first();
+ $vehicle = DB::table('vehicles')->where("id", $id)->first();
return view('vehiclesEdit', ["vehicle" => $vehicle]);
- }
+ }
else
- return "Brak dostepu";
-
+ return "Brak dostepu";
}
-
-
public function store(){
$this->validate(request(), [
'name' => 'required',
- 'productionYear' => 'digits:4',
- 'foamAgent' => 'numeric',
- 'enginePower' => 'numeric',
- 'crewNumber' => 'numeric',
- 'mass' => 'numeric',
- 'chassisPoductionYear' => 'numeric',
- //dokończyć! Wypytać Adriana które mają być required
+ 'codename' => 'required',
+ 'productionYear' => 'digits:4|nullable',
+ 'foamAgent' => 'numeric|nullable',
+ 'enginePower' => 'numeric|nullable',
+ 'crewNumber' => 'numeric|nullable',
+ 'mass' => 'numeric|nullable',
+ 'chassisPoductionYear' => 'numeric|nullable',
],
[
'required' => ':attribute jest wymagany(e).',
@@ -105,13 +100,13 @@ class VehiclesController extends Controller
$this->validate(request(), [
'name' => 'required',
- 'productionYear' => 'digits:4',
- 'foamAgent' => 'numeric',
- 'enginePower' => 'numeric',
- 'crewNumber' => 'numeric',
- 'mass' => 'numeric',
- 'chassisPoductionYear' => 'numeric',
- //dokończyć! Wypytać Adriana które mają być required
+ 'codename' => 'required',
+ 'productionYear' => 'digits:4|nullable',
+ 'foamAgent' => 'numeric|nullable',
+ 'enginePower' => 'numeric|nullable',
+ 'crewNumber' => 'numeric|nullable',
+ 'mass' => 'numeric|nullable',
+ 'chassisPoductionYear' => 'numeric|nullable',
],
[
'required' => ':attribute jest wymagany(e).',
@@ -144,6 +139,12 @@ class VehiclesController extends Controller
$vehicle-> fireEnginePumpDescription = $request-> fireEnginePumpDescription;
$vehicle->save();
- return VehiclesController::create();
+ return redirect()->to('/pojazdy');;
+ }
+
+ public function destroy($id)
+ {
+ vehicle::where('id',$id)->delete();
+ return redirect()->to('/pojazdy');
}
}
diff --git a/app/equipment.php b/app/equipment.php
index 7b1c257..3f01808 100644
--- a/app/equipment.php
+++ b/app/equipment.php
@@ -3,9 +3,11 @@
namespace App;
use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
class equipment extends Model
{
+ use SoftDeletes;
protected $primaryKey = 'id';
protected $table = 'equipment';
diff --git a/app/vehicle.php b/app/vehicle.php
index 0976e71..3c3fb6b 100644
--- a/app/vehicle.php
+++ b/app/vehicle.php
@@ -3,9 +3,11 @@
namespace App;
use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
class vehicle extends Model
{
+ use SoftDeletes;
protected $primaryKey = 'id';
protected $table = 'vehicles';
diff --git a/database/migrations/2019_11_07_230105_create_vehicles_table.php b/database/migrations/2019_11_07_230105_create_vehicles_table.php
index 8b2f0ca..a56ee75 100644
--- a/database/migrations/2019_11_07_230105_create_vehicles_table.php
+++ b/database/migrations/2019_11_07_230105_create_vehicles_table.php
@@ -18,24 +18,25 @@ class CreateVehiclesTable extends Migration
$table->integer('fireStationID');
$table->string('name', 45);
$table->string('codename', 45);
- $table->string('brand',45);
- $table->string('registrationNumber', 15);
- $table->integer('productionYear');
- $table->date('examExpirationDate'); //Data ważności przegladu
- $table->date('insuranceExpirationDate');
- $table->string('driveType',45); //układ napędowy
- $table->string('chassisType',45); //typ podwozia
- $table->string('bodyProducer',45); //producent nadwozia
- $table->integer('crewNumber');
- $table->integer('foamAgent'); //Ilość środka pianotwórczego w litrach
- $table->integer('enginePower'); //Moc silnika w kW
- $table->integer('mass'); //Masa całkowita pojazdu
- $table->string('chassisNumber');
- $table->string('engineNumber');
- $table->string('fuelType',45);
- $table->integer('chassisPoductionYear');
- $table->date('entryIntoServiceDate');
- $table->string('fireEnginePumpDescription');// Opis autopompy
+ $table->string('brand',45)->nullable();
+ $table->string('registrationNumber', 15)->nullable();
+ $table->integer('productionYear')->nullable();
+ $table->date('examExpirationDate')->nullable(); //Data ważności przegladu
+ $table->date('insuranceExpirationDate')->nullable();
+ $table->string('driveType',45)->nullable(); //układ napędowy
+ $table->string('chassisType',45)->nullable(); //typ podwozia
+ $table->string('bodyProducer',45)->nullable(); //producent nadwozia
+ $table->integer('crewNumber')->nullable();
+ $table->integer('foamAgent')->nullable(); //Ilość środka pianotwórczego w litrach
+ $table->integer('enginePower')->nullable(); //Moc silnika w kW
+ $table->integer('mass')->nullable(); //Masa całkowita pojazdu
+ $table->string('chassisNumber')->nullable();
+ $table->string('engineNumber')->nullable();
+ $table->string('fuelType',45)->nullable();
+ $table->integer('chassisPoductionYear')->nullable();
+ $table->date('entryIntoServiceDate')->nullable();
+ $table->string('fireEnginePumpDescription')->nullable();// Opis autopompy
+ $table->softDeletes();
$table->timestamps();
});
}
diff --git a/database/migrations/2019_12_05_185219_create_equipment_table.php b/database/migrations/2019_12_05_185219_create_equipment_table.php
index 394df9d..46ee0d0 100644
--- a/database/migrations/2019_12_05_185219_create_equipment_table.php
+++ b/database/migrations/2019_12_05_185219_create_equipment_table.php
@@ -19,7 +19,7 @@ class CreateEquipmentTable extends Migration
$table->string('name', 45);
$table->integer('amount');
$table->string('parameter', 45)->nullable();
- $table->boolean('deleted')->default(0);
+ $table->softDeletes();
$table->timestamps();
});
}
diff --git a/resources/views/equipment.blade.php b/resources/views/equipment.blade.php
index 2077ca6..3fdb490 100644
--- a/resources/views/equipment.blade.php
+++ b/resources/views/equipment.blade.php
@@ -16,7 +16,7 @@
@if( auth()->user()->fireStationID == NULL)
Jednostka nie istnieje
@else
-
+
+
@endif
@else
diff --git a/resources/views/vehicles.blade.php b/resources/views/vehicles.blade.php
index ca4d1c8..e8743a7 100644
--- a/resources/views/vehicles.blade.php
+++ b/resources/views/vehicles.blade.php
@@ -36,6 +36,7 @@
$lp = $lp + 1
@endphp
+
@endforeach
diff --git a/routes/web.php b/routes/web.php
index e63c4dd..0b6af29 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -61,13 +61,14 @@ Route::get('/pojazdy/add', 'VehiclesController@addForm');
Route::post('/pojazdy', 'VehiclesController@store');
Route::get('/pojazdy/edit/{id}', 'VehiclesController@editForm');
Route::post('/pojazdy/edit', 'VehiclesController@update');
-
+Route::resource('vehicles', 'VehiclesController');
Route::get('/sprzet', 'EquipmentController@create');
Route::get('/sprzet/add', 'EquipmentController@addForm');
Route::post('/sprzet', 'EquipmentController@store');
Route::get('/sprzet/edit/{id}', 'EquipmentController@editForm');
Route::post('/sprzet/edit', 'EquipmentController@update');
+Route::resource('equipment', 'EquipmentController');
Route::get('register/verify/{confirmationCode}', [
'as' => 'confirmation_path',