From cdb5f98f291b85dc548e7b785fe2869617c4f5a4 Mon Sep 17 00:00:00 2001
From: Krzysztof Strzelecki <ks37365@st.amu.edu.pl>
Date: Thu, 30 Jan 2020 21:19:05 +0100
Subject: [PATCH] widoki - drobne poprawki

---
 resources/views/decorations.blade.php              |  6 +++++-
 resources/views/depot.blade.php                    |  6 +-----
 resources/views/equipment.blade.php                |  2 --
 resources/views/equipmentAdd.blade.php             |  4 +---
 resources/views/equipmentEdit.blade.php            |  3 +--
 resources/views/fireFighters.blade.php             |  8 +++-----
 resources/views/fireFightersAdd.blade.php          |  7 ++-----
 resources/views/fireFightersEdit.blade.php         |  7 ++-----
 resources/views/operationAdd.blade.php             | 12 +++++++-----
 resources/views/operationEdit.blade.php            |  3 ++-
 resources/views/trainings.blade.php                |  8 +++-----
 resources/views/trainingsAddFireFighters.blade.php |  5 ++---
 resources/views/vehiclesAdd.blade.php              |  2 +-
 resources/views/vehiclesEdit.blade.php             |  6 ++----
 14 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/resources/views/decorations.blade.php b/resources/views/decorations.blade.php
index 2b553d2..db432d9 100644
--- a/resources/views/decorations.blade.php
+++ b/resources/views/decorations.blade.php
@@ -54,7 +54,11 @@
                     <select name="decoration" class="form-control" style="width:300px">
                          <option value="">--- Wybierz odznaczenie ---</option>
                         @foreach ($decoration as $key => $value)
-                        <option value="{{ $key }}">{{ $value }}</option>
+                            @if(Illuminate\Support\Facades\Input::old('decoration') == $key)
+                                <option value="{{ $key }}" selected >{{ $value }}</option>
+                            @else
+                                <option value="{{ $key }}">{{ $value }}</option>
+                            @endif
                         @endforeach
                     </select>
                 </div>
diff --git a/resources/views/depot.blade.php b/resources/views/depot.blade.php
index 7b28e75..089aa75 100644
--- a/resources/views/depot.blade.php
+++ b/resources/views/depot.blade.php
@@ -4,16 +4,12 @@
     @parent
     <ul>
         <a href="/sprzet"><li>Sprzęt<img src="img/left_menu_icon/more.png"></li></a>
-        <a href="/szkolenia"><li>Badania/Szkolenia<img src="img/left_menu_icon/more.png"></li></a>
-        {{-- <li>Edytuj<img src="img/left_menu_icon/edit.png"></li> --}}
-        {{--  <li>Usuń<img src="img/left_menu_icon/delete.png"></li> --}}
     </ul>
 @stop
 
 @section('center-area')
     @parent
     Strona w budowie
-    <p>Zawarte będą tutaj informacje o umundurowaniu oraz sprzęcie jaki jest na wyposażeniu strażnicy oraz informacje gdzie umundurowanie się znajduje(druhowie mundury koszarowe oraz galowe mają w w domach, informacja ta pozwoli na sprawdzenie np jakie są braki w umundurowaniu).</p>
-
+    <p>Zawarte są tutaj informacje o sprzęcie jaki jest na wyposażeniu strażnicy. W przyszłej wersji eOSP do strażnicy dodane zostaną informacje o posiadanym umundurowaniu oraz gdzie umundurowanie się znajduje(druhowie mundury koszarowe oraz galowe miewają w domach, informacja ta pozwoli na sprawdzenie np jakie są braki w umundurowaniu).</p>
 
 @stop
diff --git a/resources/views/equipment.blade.php b/resources/views/equipment.blade.php
index 758b9ff..2500972 100644
--- a/resources/views/equipment.blade.php
+++ b/resources/views/equipment.blade.php
@@ -5,8 +5,6 @@
     @parent
     <ul>
         <a href="sprzet/add"><li>Dodaj<img src="/img/left_menu_icon/add.png"></li></a>
-        <li>Edytuj<img src="/img/left_menu_icon/edit.png"></li>
-        <li>Usuń<img src="/img/left_menu_icon/delete.png"></li>
     </ul>
 @stop
 
diff --git a/resources/views/equipmentAdd.blade.php b/resources/views/equipmentAdd.blade.php
index b49ad36..5f3535e 100644
--- a/resources/views/equipmentAdd.blade.php
+++ b/resources/views/equipmentAdd.blade.php
@@ -3,9 +3,7 @@
 @section('left-menu')
     @parent
     <ul>
-        <a href="/sprzet/add"><li>Dodaj<img src="/./img/left_menu_icon/add.png"></li></a>
-        <li>Edytuj<img src="/img/left_menu_icon/edit.png"></li>
-        <li>Usuń<img src="/img/left_menu_icon/delete.png"></li>
+        <a href="/sprzet"><li>Przeglądaj<img src="/img/left_menu_icon/more.png"></li></a>
     </ul>
 @stop
 
diff --git a/resources/views/equipmentEdit.blade.php b/resources/views/equipmentEdit.blade.php
index 18657d4..d798c61 100644
--- a/resources/views/equipmentEdit.blade.php
+++ b/resources/views/equipmentEdit.blade.php
@@ -4,8 +4,7 @@
     @parent
     <ul>
         <a href="/sprzet/add"><li>Dodaj<img src="/img/left_menu_icon/add.png"></li></a>
-        <li>Edytuj<img src="/img/left_menu_icon/edit.png"></li>
-        <li>Usuń<img src="/img/left_menu_icon/delete.png"></li>
+         <a href="/sprzet"><li>Przeglądaj<img src="/img/left_menu_icon/more.png"></li></a>
     </ul>
 @stop
 
diff --git a/resources/views/fireFighters.blade.php b/resources/views/fireFighters.blade.php
index 80c1eb1..1de1fba 100644
--- a/resources/views/fireFighters.blade.php
+++ b/resources/views/fireFighters.blade.php
@@ -4,9 +4,7 @@
     @parent
     <ul>
         <a href="/strazacy/add"><li>Dodaj<img src="img/left_menu_icon/add.png"></li></a>
-        <li>Wyklucz<img src="img/left_menu_icon/delete.png"></li>
-        <li>Zawieś<img src="img/left_menu_icon/suspended.png"></li>
-        <li>Więcej<img src="img/left_menu_icon/more.png"></li>
+        <a href="/szkolenia"><li><font size="-2">Badania/Szkolenia</font><img src="/img/left_menu_icon/more.png"></li></a>
     </ul>
 @stop
 
@@ -70,14 +68,14 @@
                 <thead>
                     <tr>
                         <th>#</th>
-                        <th>Imie</th>
+                        <th>Imię</th>
                         <th>Nazwisko</th>
                         <th>PESEL</th>
                         <th>E-mail</th>
                         <th>Funkcja</th>
                         <th>Stopień</th>
                         <th>Status</th>
-                        <th>Operacje</th>
+                        <th>Operacja</th>
                     </tr>
                 </thead>
 
diff --git a/resources/views/fireFightersAdd.blade.php b/resources/views/fireFightersAdd.blade.php
index 6450962..1dfb004 100644
--- a/resources/views/fireFightersAdd.blade.php
+++ b/resources/views/fireFightersAdd.blade.php
@@ -3,11 +3,8 @@
 @section('left-menu')
     @parent
     <ul>
-        <a href="/strazacy/add"><li>Dodaj<img src="/img/left_menu_icon/add.png"></li></a>
-        <li>Edytuj<img src="/img/left_menu_icon/edit.png"></li>
-        <li>Wyklucz<img src="/img/left_menu_icon/delete.png"></li>
-        <li>Zawieś<img src="/img/left_menu_icon/suspended.png"></li>
-        <li>Więcej<img src="/img/left_menu_icon/more.png"></li>
+        <a href="/strazacy"><li>Przeglądaj<img src="/img/left_menu_icon/more.png"></li></a>
+        <a href="/szkolenia"><li><font size="-2">Badania/Szkolenia</font><img src="/img/left_menu_icon/more.png"></li></a>
     </ul>
 @stop
 
diff --git a/resources/views/fireFightersEdit.blade.php b/resources/views/fireFightersEdit.blade.php
index 66a2815..743fc41 100644
--- a/resources/views/fireFightersEdit.blade.php
+++ b/resources/views/fireFightersEdit.blade.php
@@ -3,11 +3,8 @@
 @section('left-menu')
     @parent
     <ul>
-        <a href="/strazacy/add"><li>Dodaj<img src="img/left_menu_icon/add.png"></li></a>
-        <li>Edytuj<img src="img/left_menu_icon/edit.png"></li>
-        <li>Wyklucz<img src="img/left_menu_icon/delete.png"></li>
-        <li>Zawieś<img src="img/left_menu_icon/suspended.png"></li>
-        <li>Więcej<img src="img/left_menu_icon/more.png"></li>
+        <a href="/strazacy"><li>Przeglądaj<img src="/img/left_menu_icon/more.png"></li></a>
+        <a href="/szkolenia"><li><font size="-2">Badania/Szkolenia</font><img src="/img/left_menu_icon/more.png"></li></a>
     </ul>
 @stop
 
diff --git a/resources/views/operationAdd.blade.php b/resources/views/operationAdd.blade.php
index 12b01e2..6d9d622 100644
--- a/resources/views/operationAdd.blade.php
+++ b/resources/views/operationAdd.blade.php
@@ -3,7 +3,7 @@
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
 @section('left-menu')
     @parent<ul>
-        <a href="/wyjazdy/"><li>Wróć<img src="/img/left_menu_icon/add.png"></li></a>
+        <a href="/wyjazdy"><li>Przeglądaj<img src="/img/left_menu_icon/more.png"></li></a>
     </ul>
 @stop
 
@@ -44,7 +44,11 @@
                 <select name="operationLeader" class="form-control">
                     <option value="">--- Wybierz dowódcę ---</option>
                     @foreach ($fireFighters as $fireFighter)
-                        <option value="{{$fireFighter->id}}">{{ $fireFighter->name }} {{$fireFighter->surname }}</option>
+                        @if(Illuminate\Support\Facades\Input::old('operationLeader') == $fireFighter->id)
+                            <option value="{{$fireFighter->id}}" selected>{{ $fireFighter->name }} {{$fireFighter->surname }}</option>
+                        @else
+                            <option value="{{$fireFighter->id}}">{{ $fireFighter->name }} {{$fireFighter->surname }}</option>
+                        @endif
                     @endforeach
                 </select>
             </div>
@@ -162,6 +166,4 @@
 
 
     });
-</script>
-
-
+</script>
\ No newline at end of file
diff --git a/resources/views/operationEdit.blade.php b/resources/views/operationEdit.blade.php
index 2f183c1..1e089fe 100644
--- a/resources/views/operationEdit.blade.php
+++ b/resources/views/operationEdit.blade.php
@@ -3,7 +3,8 @@
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
 @section('left-menu')
     @parent<ul>
-        <a href="/wyjazdy/"><li>Wróc<img src="/img/left_menu_icon/add.png"></li></a>
+        <a href="/wyjazdy/add"><li>Dodaj<img src="/img/left_menu_icon/add.png"></li></a>
+        <a href="/wyjazdy"><li>Przeglądaj<img src="/img/left_menu_icon/more.png"></li></a>
     </ul>
 @stop
 
diff --git a/resources/views/trainings.blade.php b/resources/views/trainings.blade.php
index e13733d..d8a3cc9 100644
--- a/resources/views/trainings.blade.php
+++ b/resources/views/trainings.blade.php
@@ -8,9 +8,7 @@
 @section('left-menu')
     @parent
     <ul>
-        <a href="sprzet/add"><li>Dodaj<img src="/img/left_menu_icon/add.png"></li></a>
-        <li>Edytuj<img src="/img/left_menu_icon/edit.png"></li>
-        <li>Usuń<img src="/img/left_menu_icon/delete.png"></li>
+        <a href="/strazacy"><li>Strażacy<img src="/img/left_menu_icon/more.png"></li></a>
     </ul>
 @stop
 
@@ -25,7 +23,7 @@
             <form method="POST" action="/szkolenia">
                 {{ csrf_field() }}
                 <div class="form-group">
-                    <label for="name">Nazwa Szkolenia/Badana:</label>
+                    <label for="name">Nazwa nowego szkolenia/badania:</label>
                     <input type="text" class="form-control" id="name" name="name" value="{{ old('name') }} ">
                 </div>
 
@@ -157,7 +155,7 @@
 
     function deleteButton(trainingID){
         swal.fire({
-            title: "Czy chcesz usunąć wyjazd?",
+            title: "Czy chcesz usunąć badanie/szkolenie?",
             width: 'auto',
             confirmButtonText: 'Tak',
             cancelButtonText: 'Nie',
diff --git a/resources/views/trainingsAddFireFighters.blade.php b/resources/views/trainingsAddFireFighters.blade.php
index fc10f11..9e0055b 100644
--- a/resources/views/trainingsAddFireFighters.blade.php
+++ b/resources/views/trainingsAddFireFighters.blade.php
@@ -7,9 +7,8 @@
 @section('left-menu')
     @parent
     <ul>
-        <a href="sprzet/add"><li>Dodaj<img src="/img/left_menu_icon/add.png"></li></a>
-        <li>Edytuj<img src="/img/left_menu_icon/edit.png"></li>
-        <li>Usuń<img src="/img/left_menu_icon/delete.png"></li>
+        <a href="/strazacy"><li>Strażacy<img src="/img/left_menu_icon/more.png"></li></a>
+        <a href="/szkolenia"><li><font size="-2">Badania/Szkolenia</font><img src="/img/left_menu_icon/more.png"></li></a>
     </ul>
 @stop
 
diff --git a/resources/views/vehiclesAdd.blade.php b/resources/views/vehiclesAdd.blade.php
index bba2f95..e10fa12 100644
--- a/resources/views/vehiclesAdd.blade.php
+++ b/resources/views/vehiclesAdd.blade.php
@@ -3,7 +3,7 @@
 @section('left-menu')
     @parent
     <ul>
-        <a href="/pojazdy"><li>Przeglądaj<img src="img/left_menu_icon/add.png"></li></a>
+        <a href="/pojazdy"><li>Przeglądaj<img src="/img/left_menu_icon/more.png"></li></a>
     </ul>
 @stop
 
diff --git a/resources/views/vehiclesEdit.blade.php b/resources/views/vehiclesEdit.blade.php
index ab17b3a..eb9082d 100644
--- a/resources/views/vehiclesEdit.blade.php
+++ b/resources/views/vehiclesEdit.blade.php
@@ -3,10 +3,8 @@
 @section('left-menu')
     @parent
     <ul>
-        <a href="/pojazdy/add"><li>Dodaj<img src="img/left_menu_icon/add.png"></li></a>
-        <li>Edytuj<img src="img/left_menu_icon/edit.png"></li>
-        <li>Usuń<img src="img/left_menu_icon/delete.png"></li>
-        <li>Zawieś<img src="img/left_menu_icon/suspended.png"></li>
+        <a href="/pojazdy/add"><li>Dodaj<img src="/img/left_menu_icon/add.png"></li></a>
+        <a href="/pojazdy"><li>Przeglądaj<img src="/img/left_menu_icon/more.png"></li></a>
     </ul>
 @stop