Poprawienie widokow i kilku bugow - pojazdy

app/Http/Controllers/VehiclesController.php

@@ -22,7 +22,7 @@ class VehiclesController extends Controller
 
         if(auth()->user() != null && auth()->user()->fireStationID != null ){
             $vehicles = DB::table('vehicles')->where("fireStationID", '=', auth()->user()->fireStationID)
-                ->whereNull('deleted_at')->get();
+                ->whereNull('deleted_at')->paginate(10);
             return view("vehicles", ["vehicles" => $vehicles]);
         } else{
             return view('vehicles');

app/Http/Controllers/operationsController.php

@@ -36,7 +36,9 @@ class operationsController extends Controller
                     ->select('users.*', 'operationsMembers.memberID', 'operationsMembers.privateTransport')
                     ->get();
 
-                $trucks[$id] = DB::table('vehicles')->where("vehicles.fireStationID", "=", auth()->user()->fireStationID )
+                $trucks[$id] = DB::table('vehicles')->where([
+                    ["vehicles.fireStationID", "=", auth()->user()->fireStationID ],
+                    ])
                     ->leftJoin('operationsTrucks', function ($join) use($id){
                         $join->on('vehicles.id', '=', 'operationsTrucks.truckID');
                         $join->where('operationsTrucks.operationID', '=', $id);
@@ -58,7 +60,11 @@ class operationsController extends Controller
     public function addForm(){
         if(auth()->user() != null && auth()->user()->fireStationID != null ){
             $fireFighters = DB::table('users')->where("fireStationID", "=", auth()->user()->fireStationID )->get();
-            $vehicles = DB::table('vehicles')->where("fireStationID", '=', auth()->user()->fireStationID)
+            $vehicles = DB::table('vehicles')->where([
+                ["fireStationID", '=', auth()->user()->fireStationID],
+                ["vehicles.status", "=", 1],
+                ["vehicles.deleted_at", "=", null],
+            ])
                 ->get();
             return view("operationAdd", ["fireFighters" => $fireFighters], ["vehicles" => $vehicles]);
         } else return view("unit");
@@ -70,7 +76,10 @@ class operationsController extends Controller
         if(auth()->user() != null && auth()->user()->fireStationID != null ){
 
 //            $fireFighters = DB::table('users')->where("fireStationID", "=", auth()->user()->fireStationID )->get();
-            $vehicles = DB::table('vehicles')->where("fireStationID", '=', auth()->user()->fireStationID)
+            $vehicles = DB::table('vehicles')->where([
+                ["fireStationID", '=', auth()->user()->fireStationID],
+                ["vehicles.deleted_at", "=", null]
+            ])
                 ->get();
             $operation = DB::table('operations')->where('operations.id', '=', $id)->first();
             $operationMembers = DB::table('operationsMembers')->where('operationID', '=', $id)->get();

database/migrations/2019_12_28_165307_add_softDelete_to_vehicles_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSoftDeleteToVehiclesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('vehicles', function (Blueprint $table) {
+            //
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('vehicles', function (Blueprint $table) {
+            //
+        });
+    }
+}

resources/views/unit.blade.php

@@ -17,19 +17,52 @@
             @include('inc.addFireStation')
         @else
             <div>
-                <p><b>Nazwa:</b> {{ $fireStation-> name }}</p>
+                <table class="table">
-                <p><b>Województwo:</b> {{ $fireStation-> voivodeship }}</p>
+                    <tr>
-                <p><b>Powiat:</b> {{ $fireStation-> county }}</p>
+                        <th>Nazwa</th>
-                <p><b>Gmina i numer ewidencyjny:</b> {{ $fireStation-> community }} {{ $fireStation-> number }}</p>
+                        <td>{{ $fireStation-> name }}</td>
-                <p><b>Kod pocztowy, Miejscowość:</b> {{ $fireStation-> zipCode }} {{ $fireStation-> name }}</p>
+                    </tr>
-                <p><b>Ulica i numer:</b> {{ $fireStation-> address }}</p>
+                    <tr>
-                <p><b>Szerokość i długość geograficzna:</b> {{ $fireStation-> latitude }} | {{ $fireStation-> longitude }}</p>
+                        <th>Województwo</th>
-                <p><b>KRS:</b> {{ $fireStation-> KRS }}</p>
+                        <td>{{ $fireStation-> voivodeship }}</td>
-                <p><b>NIP:</b> {{ $fireStation-> NIP }}    </p>
+                    </tr>
-                <p><b>Telefon:</b> {{ $fireStation-> phoneNumber }}</p>
+                    <tr>
-                <p><b>E-mail:</b> {{ $fireStation-> email }}</p>
+                        <th>Powiat</th>
-                <hr>
+                        <td>{{ $fireStation-> county }}</td>
-                <p><b>Liczba członków:</b> {{$users}}</p>
+                    </tr>
+                    <tr>
+                        <th>Gmina i numer ewidencyjny</th>
+                        <td>{{ $fireStation-> community }} {{ $fireStation-> number }}</td>
+                    </tr>
+                    <tr>
+                        <th>Kod pocztowy, Miejscowość</th>
+                        <td>{{ $fireStation-> zipCode }} {{ $fireStation-> name }}</td>
+                    </tr>
+                    <tr>
+                        <th>Ulica i numer</th>
+                        <td>{{ $fireStation-> address }}</td>
+                    </tr>
+                    <tr>
+                        <th>Szerokość i długość geograficzna</th>
+                        <td>{{ $fireStation-> latitude }} | {{ $fireStation-> longitude }}</td>
+                    </tr>
+                    <tr>
+                        <th>KRS</th>
+                        <td>{{ $fireStation-> KRS }}</td>
+                    </tr>
+                    <tr>
+                        <th>NIP</th>
+                        <td>{{ $fireStation-> NIP }}</td>
+                    </tr>
+                    <tr>
+                        <th>Telefon</th>
+                        <td>{{ $fireStation-> phoneNumber }}</td>
+                    </tr>
+                    <tr>
+                        <th>E-mail</th>
+                        <td>{{ $fireStation-> email }}</td>
+                    </tr>
+                </table>
             </div>
             <div>
         @endif
@@ -53,3 +86,17 @@
     @endif
     </div>
 @stop
+
+{{--                    <p><b>Nazwa:</b> {{ $fireStation-> name }}</p>--}}
+{{--                    <p><b>Województwo:</b> {{ $fireStation-> voivodeship }}</p>--}}
+{{--                    <p><b>Powiat:</b> {{ $fireStation-> county }}</p>--}}
+{{--                    <p><b>Gmina i numer ewidencyjny:</b> {{ $fireStation-> community }} {{ $fireStation-> number }}</p>--}}
+{{--                    <p><b>Kod pocztowy, Miejscowość:</b> {{ $fireStation-> zipCode }} {{ $fireStation-> name }}</p>--}}
+{{--                    <p><b>Ulica i numer:</b> {{ $fireStation-> address }}</p>--}}
+{{--                    <p><b>Szerokość i długość geograficzna:</b> {{ $fireStation-> latitude }} | {{ $fireStation-> longitude }}</p>--}}
+{{--                    <p><b>KRS:</b> {{ $fireStation-> KRS }}</p>--}}
+{{--                    <p><b>NIP:</b> {{ $fireStation-> NIP }}    </p>--}}
+{{--                    <p><b>Telefon:</b> {{ $fireStation-> phoneNumber }}</p>--}}
+{{--                    <p><b>E-mail:</b> {{ $fireStation-> email }}</p>--}}
+{{--                    <hr>--}}
+{{--                    <p><b>Liczba członków:</b> {{$users}}</p>--}}

resources/views/userDecorations.blade.php

@@ -18,16 +18,24 @@
         @else
         	@if(count($userDecorations) > 0)
             	<p align='center'>
-            	<table class='firefighterViewTable'>
+            	<table class='table'>
-                <tr class='table-header'>
+                    <thead>
-                    <td>Odznaczenie</td>
+                        <tr>
-                    <td>Data przyznania</td>
+                            <th colspan="2"><center>Odznaczenia</center></th>
-                	@foreach($userDecorations as $userDecoration)
-                    	<tr>
-                        	<td id="decorationName{{ $userDecoration->id }}">{{ $userDecoration->decorationName }}</td>
-                        	<td id="amount{{ $userDecoration->id }}">{{ $userDecoration->dateOfAward }}</td>
                         </tr>
-                    @endforeach
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <th>Odznaczenie</th>
+                            <th>Data przyznania</th>
+                        </tr>
+                        @foreach($userDecorations as $userDecoration)
+                            <tr>
+                                <td id="decorationName{{ $userDecoration->id }}">{{ $userDecoration->decorationName }}</td>
+                                <td id="amount{{ $userDecoration->id }}">{{ $userDecoration->dateOfAward }}</td>
+                            </tr>
+                        @endforeach
+                    </tbody>
             </table>
         	</p>
                 @else

resources/views/userProfile.blade.php

@@ -24,33 +24,33 @@
     @endif
 
             <p align='center'>
-            <table class='firefighterViewTable'>
+            <table class='table'>
                 <tr>
-                        <td>Imię i nazwisko:</td>
+                        <th>Imię i nazwisko:</th>
                         <td>{{ $userData->name }} {{ $userData->surname }}</td>
                 </tr>
                 <tr>
-                        <td>PESEL:</td>
+                        <th>PESEL:</th>
                         <td>{{ $userData->PESEL}}</td>
                 </tr>
                 <tr>
-                        <td>Nr telefonu:</td>
+                        <th>Nr telefonu:</th>
                         <td>{{ $userData->phoneNumber}}</td>
                 </tr>
                 <tr>
-                        <td>Adres e-mail:</td>
+                        <th>Adres e-mail:</th>
                         <td>{{ $userData->email}}</td>
                 </tr>
                 <tr>
-                        <td>Numer ewidencyjny:</td>
+                        <th>Numer ewidencyjny:</th>
                         <td>{{ $userData->number}}</td>
                 </tr>
                 <tr>
-                        <td>Stopień:</td>
+                        <th>Stopień:</th>
                         <td>{{ $userData->rank}}</td>
                 </tr>
                 <tr>
-                        <td>Funkcja:</td>
+                        <th>Funkcja:</th>
                         <td>{{ $userData->unitFunction}}</td>
                 </tr>
             </table>

resources/views/userTrainings.blade.php

@@ -16,18 +16,22 @@
     @if( auth()->check())
 
             <p align='center'>
-            <table class='firefighterViewTable'>
+            <table class='table'>
-                <tr class='table-header'>
+                <thead>
-                    <td>Szkolenie</td>
+                    <th>Szkolenie</th>
-                    <td>Data ukończenia</td>
+                    <th>Data ukończenia</th>
-                    <td>Data ważności</td>
+                    <th>Data ważności</th>
-                @foreach($userTrainings as $userTraining)
+                </thead>
-                <tr>
+
-                        <td id="trainingName{{ $userTraining->id }}">{{ $userTraining->trainingName }}</td>
+                <tbody>
-                        <td id="dateOfComplete{{ $userTraining->id }}">{{ $userTraining->dateOfComplete }}</td>
+                    @foreach($userTrainings as $userTraining)
-                        <td id="dateOfExpiry{{ $userTraining->id }}">{{ $userTraining->dateOfExpiry }}</td>
+                        <tr>
-                </tr>
+                            <td id="trainingName{{ $userTraining->id }}">{{ $userTraining->trainingName }}</td>
-                @endforeach
+                            <td id="dateOfComplete{{ $userTraining->id }}">{{ $userTraining->dateOfComplete }}</td>
+                            <td id="dateOfExpiry{{ $userTraining->id }}">{{ $userTraining->dateOfExpiry }}</td>
+                        </tr>
+                    @endforeach
+                </tbody>
             </table>
         </p>
      @else

resources/views/vehicles.blade.php

@@ -14,17 +14,22 @@
             Jednostka nie istnieje
         @else
 
-            <table class='firefighterViewTable'>
+            <table class='table'>
-                <tr class='table-header'>
+                <thead>
-                    <td>LP</td>
+                    <tr>
-                    <td>Typ Pojazdu</td>
+                        <th>#</th>
-                    <td>Marka</td>
+                        <th>Typ Pojazdu</th>
-                    <td>Nr rej.</td>
+                        <th>Marka</th>
-                    <td>Kryptonim</td>
+                        <th>Nr rej.</th>
-                    <td>Rok Produkcji</td>
+                        <th>Kryptonim</th>
-                    <td>Rodzaj napędu</td>
+                        <th>Rok Produkcji</th>
-                    <td>Przegląd</td>
+                        <th>Rodzaj napędu</th>
-                    <td>OC</td>
+                        <th>Przegląd</th>
+                        <th>OC</th>
+                        <th>Operacja</th>
+                    </tr>
+                </thead>
+
                 @php
                 $lp=0   // liczba porządkowa
                 @endphp
@@ -32,6 +37,7 @@
                 @php
                 $lp = $lp + 1
                 @endphp
+
                     <tr>
                         <form action="{{ route('vehicles.destroy', $vehicle->id)}}" method="post">
                         <td>{{ $lp }}</td>
@@ -43,30 +49,31 @@
                         <td id="driveType{{ $vehicle->id }}">{{ $vehicle->driveType }}</td>
                         <td id="examExpirationDate{{ $vehicle->id }}">{{ $vehicle->examExpirationDate }}</td>
                         <td id="insuranceExpirationDate{{ $vehicle->id }}">{{ $vehicle->insuranceExpirationDate }}</td>
-                        <td><a href="{{ URL::asset('pojazdy/edit/'.$vehicle->id) }}"><input type="button" onclick="" value="Edytuj"> </a></td>                       
+                        <td style="display:inline;">
-                         {{ csrf_field() }}
+                                <a href="{{ URL::asset('pojazdy/edit/'.$vehicle->id) }}"  class="btn btn-secondary" role="button">Edytuj</a>
-                          @method('DELETE')
+                             {{ csrf_field() }}
-                          <td><button class="btn btn-danger" type="submit">Usuń</button></td>
+                              @method('DELETE')
-                        </form>
+                              <button class="btn btn-danger" type="submit">Usuń</button>
-                        @if ($vehicle->status == 1)
-                            <form method="POST" action="/pojazdy/deactivate">
-                            {{ csrf_field() }}
-                            <input type="hidden" class="form-control" name="vehicleID" value="{{ $vehicle->id }}">
-                            <td><button style="cursor:pointer" type="submit" class="btn btn-primary">Zawieś</button></td>
-                            </form>
-                        @elseif ($vehicle->status == 0)
-                            <form method="POST" action="/pojazdy/activate">
-                            {{ csrf_field() }}
-                            <input type="hidden" class="form-control" name="vehicleID" value="{{ $vehicle->id }}">
-                            <td><button style="cursor:pointer" type="submit" class="btn btn-primary">Przywróć do służby</button></td>
                             </form>
+                            @if ($vehicle->status == 1)
+                                <form method="POST" action="/pojazdy/deactivate" style="display:inline;">
+                                {{ csrf_field() }}
+                                <input type="hidden" class="form-control" name="vehicleID" value="{{ $vehicle->id }}">
+                                <button style="cursor:pointer" type="submit" class="btn btn-primary">Zawieś</button>
+                                </form>
+                            @elseif ($vehicle->status == 0)
+                                <form method="POST" action="/pojazdy/activate" style="display:inline;" >
+                                {{ csrf_field() }}
+                                <input type="hidden" class="form-control" name="vehicleID" value="{{ $vehicle->id }}">
+                                <button style="cursor:pointer" type="submit" class="btn btn-primary">Przywróć do służby</button>
+                                </form>
 
-                        @endif
+                            @endif
-                    
+                        </td>
                     </tr>
                 @endforeach
             </table>
-
+            {{ $vehicles->links() }}
         @endif
      @else
         Brak autoryzacji