Edit user PIREP

nabeelio · Dec 3, 2017 · 5593d01 · 5593d01
1 parent d7ed195
commit 5593d01
Show file tree

Hide file tree

Showing 15 changed files with 296 additions and 152 deletions.
diff --git a/.idea/runConfigurations/UtilsTest.xml b/.idea/runConfigurations/UtilsTest.xml
diff --git a/app/Http/Controllers/Admin/PirepController.php b/app/Http/Controllers/Admin/PirepController.php
@@ -5,23 +5,35 @@
 use App\Http\Requests\CreatePirepRequest;
 use App\Http\Requests\UpdatePirepRequest;
 use App\Repositories\AircraftRepository;
+use App\Repositories\AirlineRepository;
+use App\Repositories\AirportRepository;
 use App\Repositories\PirepRepository;
 use App\Services\PIREPService;
 use Illuminate\Http\Request;
 use Flash;
 use Log;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;
+use App\Facades\Utils;
+
 
 class PirepController extends BaseController
 {
-    private $pirepRepo, $aircraftRepo, $pirepSvc;
+    private $airportRepo,
+            $airlineRepo,
+            $pirepRepo,
+            $aircraftRepo,
+        $pirepSvc;
 
     public function __construct(
+        AirportRepository $airportRepo,
+        AirlineRepository $airlineRepo,
         AircraftRepository $aircraftRepo,
         PirepRepository $pirepRepo,
         PIREPService $pirepSvc
     ) {
+        $this->airportRepo = $airportRepo;
+        $this->airlineRepo = $airlineRepo;
         $this->aircraftRepo = $aircraftRepo;
         $this->pirepRepo = $pirepRepo;
         $this->pirepSvc = $pirepSvc;
@@ -128,15 +140,20 @@ public function show($id)
     public function edit($id)
     {
         $pirep = $this->pirepRepo->findWithoutFail($id);
-
         if (empty($pirep)) {
             Flash::error('Pirep not found');
             return redirect(route('admin.pireps.index'));
         }
 
+        $hms = Utils::secondsToTimeParts($pirep->flight_time);
+        $pirep->hours = $hms['h'];
+        $pirep->minutes = $hms['m'];
+
         return view('admin.pireps.edit', [
             'pirep' => $pirep,
-            'aircraft' => $this->aircraftList(),
+            'airports' => $this->airportRepo->selectBoxList(),
+            'airlines' => $this->airlineRepo->selectBoxList(),
+            'aircraft' => $this->aircraftRepo->selectBoxList(),
         ]);
     }
 
@@ -150,6 +167,9 @@ public function update($id, UpdatePirepRequest $request)
     {
         $pirep = $this->pirepRepo->findWithoutFail($id);
 
+        $pirep->flight_time = ((int)$request['hours'] * 60 * 60)
+                            + ((int)$request['minutes'] * 60);
+
         if (empty($pirep)) {
             Flash::error('Pirep not found');
             return redirect(route('admin.pireps.index'));

diff --git a/app/Http/Controllers/Frontend/PirepController.php b/app/Http/Controllers/Frontend/PirepController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Frontend;
 
+use App\Services\PIREPService;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
 
@@ -22,29 +23,31 @@ class PirepController extends Controller
             $aircraftRepo,
             $pirepRepo,
             $airportRepo,
-            $pirepFieldRepo;
+            $pirepFieldRepo,
+            $pirepSvc;
 
     public function __construct(
         AirlineRepository $airlineRepo,
         PirepRepository $pirepRepo,
         AircraftRepository $aircraftRepo,
         AirportRepository $airportRepo,
-        PirepFieldRepository $pirepFieldRepo
+        PirepFieldRepository $pirepFieldRepo,
+        PIREPService $pirepSvc
     ) {
         $this->airlineRepo = $airlineRepo;
         $this->aircraftRepo = $aircraftRepo;
         $this->pirepRepo = $pirepRepo;
         $this->airportRepo = $airportRepo;
         $this->pirepFieldRepo = $pirepFieldRepo;
+        $this->pirepSvc = $pirepSvc;
     }
 
     public function index(Request $request)
     {
         $user = Auth::user();
-        $pireps = $this->pirepRepo
-                    ->where('user_id', $user->id)
+        $pireps = Pirep::where('user_id', $user->id)
                     ->orderBy('created_at', 'desc')
-                    ->get();
+                    ->paginate();
 
         return $this->view('pireps.index', [
             'user' => $user,
@@ -54,11 +57,9 @@ public function index(Request $request)
 
     public function create()
     {
-        $aircraft = $this->aircraftList();
-
         return $this->view('pireps.create', [
             'airports' => $this->airportRepo->selectBoxList(),
-            'airlines' => $this->airlineRepo->all()->pluck('name', 'id'),
+            'airlines' => $this->airlineRepo->selectBoxList(),
             'aircraft' => $this->aircraftRepo->selectBoxList(),
             'pirepfields' => $this->pirepFieldRepo->all(),
             'fieldvalues' => [],
@@ -95,8 +96,7 @@ public function store(Request $request)
             ];
         }
 
-        $pirepSvc = app('\App\Services\PIREPService');
-        $pirep = $pirepSvc->create($pirep, $custom_fields);
+        $pirep = $this->pirepSvc->create($pirep, $custom_fields);
 
         //Flash::success('PIREP submitted successfully!');
         return redirect(route('frontend.pireps.index'));

diff --git a/app/Models/Pirep.php b/app/Models/Pirep.php
@@ -67,6 +67,21 @@ class Pirep extends Model
             'arr_airport_id' => 'required',
         ];
 
+    /**
+     * @return string
+     */
+    public function getFlightId()
+    {
+        $flight_id = $this->airline->code;
+        if($this->flight_id) {
+            $flight_id .= $this->flight->flight_number;
+        } else {
+            $flight_id .= $this->flight_number;
+        }
+
+        return $flight_id;
+    }
+
     /**
      * Foreign Keys
      */

diff --git a/public/assets/admin/css/paper-dashboard.css b/public/assets/admin/css/paper-dashboard.css
diff --git a/public/assets/admin/css/paper-dashboard.css.map b/public/assets/admin/css/paper-dashboard.css.map
diff --git a/public/assets/admin/sass/paper/_inputs.scss b/public/assets/admin/sass/paper/_inputs.scss
@@ -1,39 +1,61 @@
+input {
+    margin-top: 5px;
+    border: none;
+}
+
 .form-control::-moz-placeholder{
    @include placeholder($medium-gray,1);
 }
 .form-control:-moz-placeholder{
    @include placeholder($medium-gray,1);
-}  
+}
 .form-control::-webkit-input-placeholder{
-   @include placeholder($medium-gray,1); 
-} 
+   @include placeholder($medium-gray,1);
+}
 .form-control:-ms-input-placeholder{
    @include placeholder($medium-gray,1);
 }
 
 .form-control {
-    background-color: $gray-input-bg;
+    display: block;
+    width: 100%;
+    font-size: $font-size-base;
+    line-height: 1.846;
+    color: #666666;
+    border: medium none;
+    border-radius: $border-radius-base;
+    /*-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);*/
+    -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
+    -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+    @include input-size($padding-base-vertical, $padding-base-horizontal, $height-base);
+
+    /*background-color: $gray-input-bg;
     border: medium none;
     border-radius: $border-radius-base;
     color: $font-color;
     font-size: $font-size-base;
     transition: background-color 0.3s ease 0s;
     @include input-size($padding-base-vertical, $padding-base-horizontal, $height-base);
-    @include box-shadow(none);
-    
+    @include box-shadow(none);*/
+
     &:focus{
            background-color: $white-bg;
-           @include box-shadow(none);
-           outline: 0 !important;       
+           //@include box-shadow(none);
+           outline: 0 !important;
+            border-bottom: 2px solid #2196f3;
+            /*-webkit-box-shadow: inset 0 -2px 0 #2196f3;
+            box-shadow: inset 0 -2px 0 #2196f3;*/
     }
-    
+
     .has-success &,
     .has-error &,
     .has-success &:focus,
     .has-error &:focus{
         @include box-shadow(none);
     }
-    
+
     .has-success &{
         background-color: $success-input-bg;
         color: $success-color;
@@ -54,7 +76,7 @@
     .has-error &:focus{
         background-color: $white-bg;
     }
-    
+
     & + .form-control-feedback{
         border-radius: $border-radius-large;
         font-size: $font-size-base;
@@ -75,6 +97,9 @@
 .input-lg{
     height: 55px;
     padding: $padding-large-vertical $padding-large-horizontal;
+    font-size: 17px;
+    line-height: 1.3333333;
+    border-radius: 3px;
 }
 
 .has-error{
@@ -93,8 +118,7 @@
     background-color: $gray-input-bg;
     border: medium none;
     border-radius: $border-radius-base;
-
-
+
     .has-success &,
     .has-error &{
         background-color: $white-color;
@@ -110,7 +134,7 @@
         background-color: $white-color;
     }
 }
-.border-input{ 
+.border-input{
     .input-group-addon{
         border: solid 1px $table-line-color;
     }
@@ -123,15 +147,15 @@
         background-color: $light-gray;
     }
 }
-.input-group .form-control:first-child, 
-.input-group-addon:first-child,  
-.input-group-btn:first-child > .dropdown-toggle, 
+.input-group .form-control:first-child,
+.input-group-addon:first-child,
+.input-group-btn:first-child > .dropdown-toggle,
 .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
     border-right: 0 none;
 }
-.input-group .form-control:last-child, 
-.input-group-addon:last-child,  
-.input-group-btn:last-child > .dropdown-toggle, 
+.input-group .form-control:last-child,
+.input-group-addon:last-child,
+.input-group-btn:last-child > .dropdown-toggle,
 .input-group-btn:first-child > .btn:not(:first-child) {
     border-left: 0 none;
 }
@@ -145,10 +169,10 @@
 }
 .form-control[disabled]:-moz-placeholder{
    @include placeholder($medium-gray,1);
-}  
+}
 .form-control[disabled]::-webkit-input-placeholder{
-   @include placeholder($medium-gray,1); 
-} 
+   @include placeholder($medium-gray,1);
+}
 .form-control[disabled]:-ms-input-placeholder{
    @include placeholder($medium-gray,1);
 }