diff --git a/app/Http/Controllers/operationsController.php b/app/Http/Controllers/operationsController.php index e48e898..5e80d79 100644 --- a/app/Http/Controllers/operationsController.php +++ b/app/Http/Controllers/operationsController.php @@ -8,6 +8,7 @@ use App\operations; use App\operationsMembers; use App\vehicle; use App\operationsDrivers; +use App\operationsTrucks; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -17,8 +18,12 @@ class operationsController extends Controller // public function create(){ if(auth()->user() != null && auth()->user()->fireStationID != null ){ + $operations = DB::table('operations')->where('operations.fireStationID', "=", auth()->user()->fireStationID) + ->leftJoin('users', 'operations.commanderID', '=', 'users.id') + ->select('operations.operationDate', 'operations.location', 'operations.target', 'operations.dangerType', 'operations.description', 'operations.commanderID', 'operations.fireStationID', 'users.id', 'users.name', 'users.surname') + ->get(); - return view('operation'); + return view('operation', ["operations" => $operations]); } else{ return view('operation'); } @@ -37,8 +42,23 @@ class operationsController extends Controller - public function editForm(){ + public function editForm($id){ + if(auth()->user() != null && auth()->user()->fireStationID != null ){ + $operation = DB::table('operations')->where('operations.id', '=', $id)->first(); +// $operation = DB::table('operations')->where('operations.id', '=', $id) +// ->leftJoin('users', 'operations.commanderID', '=', 'users.id') +// ->select('operations.id', 'operations.operationDate', 'operations.location', 'operations.target', 'operations.dangerType', 'operations.description', 'operations.commanderID', 'operations.fireStationID', 'users.id', 'users.name', 'users.surname') +// ->get(); + +// if($userFireStation == $fireFighterFireStation && auth()->user()->id == $fireStationCreatorId) { + return view('operationEdit', ["operation" => $operation]); +// } else{ +// return "Brak dostepu"; +// } + } else{ + return view('unit'); + } } public function store(){ @@ -49,7 +69,10 @@ class operationsController extends Controller 'operationDangerType' => 'required', 'operationDescription' => 'required', 'operationLeader' => 'required', - 'operationDriver' => 'required', + 'operationDriver.*' => 'required', + 'operationVehicle.*' => 'required', + 'attendance.*' => 'required', + 'transport.*' => 'required', ], [ 'required' => ':attribute jest wymagany(e)' @@ -63,8 +86,30 @@ class operationsController extends Controller 'dangerType' => $request-> operationDangerType, 'description' => $request-> operationDescription, 'commanderID' => $request-> operationLeader, + 'fireStationID' => auth()->user()->fireStationID, ]); + $operationDriver = $request ->operationDriver; + $operationVehicle = $request -> operationVehicle; + for($count = 0; $count < count($operationDriver); $count++){ + $operationsTrucks = operationsTrucks::create([ + 'operationID' => $operations->id, + 'truckID' => $operationDriver[$count], + 'driverID' => $operationVehicle[$count] + ]); + } + + $attendance = $request-> attendance; + for($count = 0; $count < count($attendance); $count++){ + if($attendance[$count] != 'false'){ + $operationsMembers = operationsMembers::create([ + 'operationID' => $operations->id, + 'memberID' => $attendance[$count], + 'privateTransport' => $request->transport[$count], + ]); + }; + } + return operationsController::create(); } diff --git a/app/operations.php b/app/operations.php index 9adafff..1deb64e 100644 --- a/app/operations.php +++ b/app/operations.php @@ -9,5 +9,5 @@ class operations extends Model // protected $primaryKey = 'id'; - protected $fillable = ['operationDate', 'location', 'target', 'dangerType', 'description', 'commanderID', 'driverID']; + protected $fillable = ['fireStationID', 'operationDate', 'location', 'target', 'dangerType', 'description', 'commanderID']; } diff --git a/app/operationsMembers.php b/app/operationsMembers.php index 9591385..908405a 100644 --- a/app/operationsMembers.php +++ b/app/operationsMembers.php @@ -8,6 +8,7 @@ class operationsMembers extends Model { // protected $primaryKey = 'id'; + protected $table = 'operationsMembers'; - protected $fillable = ['operationID', 'memberID']; + protected $fillable = ['operationID', 'memberID', 'privateTransport']; } diff --git a/app/operationsTrucks.php b/app/operationsTrucks.php index 13231c2..e5e1cd7 100644 --- a/app/operationsTrucks.php +++ b/app/operationsTrucks.php @@ -8,6 +8,7 @@ class operationsTrucks extends Model { // protected $primaryKey = 'id'; + protected $table = 'operationsTrucks'; - protected $fillable = ['operationID', 'truckID']; + protected $fillable = ['operationID', 'truckID', 'driverID']; } diff --git a/database/migrations/2019_11_12_235707_create_operations_table.php b/database/migrations/2019_11_12_235707_create_operations_table.php index 157d771..3d51b7f 100644 --- a/database/migrations/2019_11_12_235707_create_operations_table.php +++ b/database/migrations/2019_11_12_235707_create_operations_table.php @@ -21,7 +21,6 @@ class CreateOperationsTable extends Migration $table->string('dangerType', 100); $table->string('description'); $table->integer('commanderID'); - $table->integer('driverID'); $table->timestamps(); }); } diff --git a/database/migrations/2019_11_16_195559_create_operationsTrucks_table.php b/database/migrations/2019_11_16_195559_create_operationsTrucks_table.php index 3af03d6..65759b9 100644 --- a/database/migrations/2019_11_16_195559_create_operationsTrucks_table.php +++ b/database/migrations/2019_11_16_195559_create_operationsTrucks_table.php @@ -17,6 +17,7 @@ class CreateOperationsTrucksTable extends Migration $table->increments('id'); $table->integer('operationID'); $table->integer('truckID'); + $table->integer('driverID'); $table->timestamps(); }); } diff --git a/database/migrations/2019_11_16_195646_create_operationsMembers_table.php b/database/migrations/2019_11_16_195646_create_operationsMembers_table.php index a7b2ce2..7708e05 100644 --- a/database/migrations/2019_11_16_195646_create_operationsMembers_table.php +++ b/database/migrations/2019_11_16_195646_create_operationsMembers_table.php @@ -17,6 +17,7 @@ class CreateOperationsMembersTable extends Migration $table->increments('id'); $table->integer('operationID'); $table->integer('memberID'); + $table->boolean('privateTransport'); $table->timestamps(); }); } diff --git a/database/migrations/2019_11_27_113757_add_fire_station_i_d_column_to_operations_table.php b/database/migrations/2019_11_27_113757_add_fire_station_i_d_column_to_operations_table.php new file mode 100644 index 0000000..aa2c040 --- /dev/null +++ b/database/migrations/2019_11_27_113757_add_fire_station_i_d_column_to_operations_table.php @@ -0,0 +1,33 @@ +integer('fireStationID'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('operations', function (Blueprint $table) { + // + }); + } +} diff --git a/resources/views/operation.blade.php b/resources/views/operation.blade.php index e004005..e59bda0 100644 --- a/resources/views/operation.blade.php +++ b/resources/views/operation.blade.php @@ -11,6 +11,34 @@ @section('center-area') @parent - Strona w budowie + @if( auth()->check()) + @if( auth()->user()->fireStationID == NULL) + Jednostka nie istnieje + @else + + + + + + + + + + @foreach($operations as $operation) + + + + + + + + + @endforeach +
DataMiejsceCelRodzaj zagrożeniaDowódca
{{ $operation->operationDate }}{{ $operation->location }}{{ $operation->target }}{{ $operation->dangerType }}{{$operation->name}} {{$operation->surname}}
" + + @endif + @else + Brak autoryzacji + @endif @stop diff --git a/resources/views/operationAdd.blade.php b/resources/views/operationAdd.blade.php index 0eabff4..1f9580a 100644 --- a/resources/views/operationAdd.blade.php +++ b/resources/views/operationAdd.blade.php @@ -52,23 +52,43 @@
- - - - +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}}
+
+ + + + + @php + $i = 0; + @endphp + @foreach($fireFighters as $fireFighterChecklist) + + + + @php + $i++; + @endphp + @endforeach +
Imię i nazwisko: [Obecność:[][][]Transport własny:
{{ $fireFighterChecklist->name }} {{$fireFighterChecklist->surname }} Tak Nie Tak Nie
+
+ +
diff --git a/resources/views/operationEdit.blade.php b/resources/views/operationEdit.blade.php index 1f9580a..e2fd179 100644 --- a/resources/views/operationEdit.blade.php +++ b/resources/views/operationEdit.blade.php @@ -14,40 +14,42 @@ @parent
{{ csrf_field() }} + +
- +
- +
- +
- +
- +
-
- - -
+ {{--
--}} + {{-- --}} + {{-- --}} + {{--
--}}
@@ -69,24 +71,24 @@
-
- - - - - @php - $i = 0; - @endphp - @foreach($fireFighters as $fireFighterChecklist) - - - - @php - $i++; - @endphp - @endforeach -
Imię i nazwisko: [Obecność:[][][]Transport własny:
{{ $fireFighterChecklist->name }} {{$fireFighterChecklist->surname }} Tak Nie Tak Nie
-
+{{--
--}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- @php--}} +{{-- $i = 0;--}} +{{-- @endphp--}} +{{-- @foreach($fireFighters as $fireFighterChecklist)--}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- @php--}} +{{-- $i++;--}} +{{-- @endphp--}} +{{-- @endforeach--}} +{{--
Imię i nazwisko: [Obecność:[][][]Transport własny:
{{ $fireFighterChecklist->name }} {{$fireFighterChecklist->surname }} Tak Nie Tak Nie
--}} +{{--
--}}
@@ -107,31 +109,31 @@ function dynamic_field(number) { - html = '
'; - html += ''; - html += ''; - html += ''; + {{--html = '
';--}} + {{--html += '';--}} + {{--html += '';--}} + {{--html += '';--}} - if(number > 1) - { - html += '
'; - $('#drivers').append(html); - } - else - { - html += '
'; - $('#drivers').html(html); - } + {{--if(number > 1)--}} + {{--{--}} + {{-- html += '
';--}} + {{-- $('#drivers').append(html);--}} + {{--}--}} + {{--else--}} + {{--{--}} + {{-- html += '
';--}} + {{-- $('#drivers').html(html);--}} + {{--}--}} } $(document).on('click', '#add', function(){ diff --git a/routes/web.php b/routes/web.php index 59c56f2..e9ae103 100644 --- a/routes/web.php +++ b/routes/web.php @@ -33,6 +33,8 @@ Route::get('/pojazdy', function(){ Route::get('/wyjazdy', 'operationsController@create'); Route::get('/wyjazdy/add/', 'operationsController@addForm'); Route::post('/wyjazdy', 'operationsController@store')->name('operationController.store'); +Route::get('/wyjazdy/edit/{id}', 'operationsController@editForm'); +Route::post('/wyjazdy/edit', 'operationsController@update'); Route::get('/register', 'RegistrationController@create'); Route::post('/register', 'RegistrationController@store');