From 64cb718ac4d5290d6c276d2fb36b0b92cbc39612 Mon Sep 17 00:00:00 2001
From: Matt Burchett <matt@mattburchett.com>
Date: Wed, 7 Apr 2021 01:07:09 -0700
Subject: [PATCH] DB Migrations, adding ship type

---
 app/Http/Controllers/ShipsController.php |  4 +++-
 app/Models/Ships.php                     |  2 +-
 resources/views/ships/index.blade.php    | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/ShipsController.php b/app/Http/Controllers/ShipsController.php
index 70ced6b..37a73fb 100644
--- a/app/Http/Controllers/ShipsController.php
+++ b/app/Http/Controllers/ShipsController.php
@@ -24,6 +24,7 @@ class ShipsController extends Controller
                 $ship->shipId = strtoupper(request('shipId'));
                 $ship->shipName = request('shipName');
                 $ship->shipOwner = request('shipOwner');
+                $ship->shipType = request('shipType');
                 $ship->created_at = now();
                 $ship->save();
             }catch(\Exception $e){
@@ -54,7 +55,8 @@ class ShipsController extends Controller
                 DB::table('ships')->where('id', $request->get('editShip'))->update(array(
                     'shipId' => strtoupper(request('shipId')),
                     'shipName' => request('shipName'),
-                    'shipOwner' => request('shipOwner')
+                    'shipOwner' => request('shipOwner'),
+                    'shipType' => request('shipType')
                 ));
             }catch(\Exception $e){
                 Log::error($e);
diff --git a/app/Models/Ships.php b/app/Models/Ships.php
index 17d85aa..868bd6f 100644
--- a/app/Models/Ships.php
+++ b/app/Models/Ships.php
@@ -10,6 +10,6 @@ use Kyslik\ColumnSortable\Sortable;
 class Ships extends Model
 {
     use Sortable;
-    public $sortable = ['shipId', 'shipName', 'shipOwner'];
+    public $sortable = ['shipId', 'shipName', 'shipOwner', 'shipType'];
     protected $casts = ['id' => 'string'];
 }
diff --git a/resources/views/ships/index.blade.php b/resources/views/ships/index.blade.php
index 644e203..57011c7 100644
--- a/resources/views/ships/index.blade.php
+++ b/resources/views/ships/index.blade.php
@@ -58,6 +58,7 @@
                 <tr>
                     <th scope="col">@sortablelink('shipId', 'Ship ID')</th>
                     <th scope="col">@sortablelink('shipName', 'Ship Name')</th>
+                    <th scope="col">@sortablelink('shipType', 'Ship Type')</th>
                     <th scope="col">@sortablelink('shipOwner', 'Ship Owner')</th>
                     <th scope="col">Actions</th>
                 </tr>
@@ -67,6 +68,7 @@
                     <tr>
                         <td>{{ $ship->shipId }}</td>
                         <td>{{ $ship->shipName }}</td>
+                        <td>{{ $ship->shipType }}</td>
                         <td>{{ $ship->shipOwner }}</td>
                         <td>
                             <button type="button" class="btn bi bi-wrench" data-target="#editShip-{{ $ship->id }}" data-toggle="modal"><x-bi-tools/></button>
@@ -93,11 +95,15 @@
                                         </div>
                                         <div class="form-group">
                                             <label for="shipName">Ship Name</label>
-                                            <input name="shipName" type="text" class="form-control" id="shipName" value="{{ $ship->shipName }}"required>
+                                            <input name="shipName" type="text" class="form-control" id="shipName" value="{{ $ship->shipName }}" required>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="shipType">Ship Type</label>
+                                            <input name="shipType" type="text" class="form-control" id="shipType" value="{{ $ship->shipType }}" required>
                                         </div>
                                         <div class="form-group">
                                             <label for="shipOwner">Ship Owner</label>
-                                            <input name="shipOwner" type="text" class="form-control" id="shipOwner" value="{{ $ship->shipOwner }}"required>
+                                            <input name="shipOwner" type="text" class="form-control" id="shipOwner" value="{{ $ship->shipOwner }}" required>
                                         </div>
                                         <div class="modal-footer">
                                             <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
@@ -158,6 +164,10 @@
                             <label for="shipName">Ship Name</label>
                             <input name="shipName" type="text" class="form-control" id="shipName" required>
                         </div>
+                        <div class="form-group">
+                            <label for="shipType">Ship Type</label>
+                            <input name="shipType" type="text" class="form-control" id="shipType" required>
+                        </div>
                         <div class="form-group">
                             <label for="shipOwner">Ship Owner</label>
                             <input name="shipOwner" type="text" class="form-control" id="shipOwner" required>