From 42c6a11780f55347969b089c062eda8dd8ecae21 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Wed, 9 May 2018 17:58:51 -0500
Subject: [PATCH] Don't show in progress PIREPs in admin and order the map data

---
 app/Http/Controllers/Admin/PirepController.php | 7 ++++++-
 app/Models/Pirep.php                           | 3 ++-
 app/Repositories/AcarsRepository.php           | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/PirepController.php b/app/Http/Controllers/Admin/PirepController.php
index 21a7a79c..633c1aa4 100644
--- a/app/Http/Controllers/Admin/PirepController.php
+++ b/app/Http/Controllers/Admin/PirepController.php
@@ -8,6 +8,7 @@ use App\Http\Requests\UpdatePirepRequest;
 use App\Interfaces\Controller;
 use App\Models\Enums\PirepSource;
 use App\Models\Enums\PirepState;
+use App\Models\Enums\PirepStatus;
 use App\Models\Pirep;
 use App\Models\PirepComment;
 use App\Repositories\AircraftRepository;
@@ -190,7 +191,11 @@ class PirepController extends Controller
         $this->pirepRepo->pushCriteria($criterea);
 
         $pireps = $this->pirepRepo
-            ->whereNotInOrder('status', [PirepState::CANCELLED, PirepState::DRAFT], 'created_at', 'desc')
+            ->whereNotInOrder('status', [
+                PirepState::CANCELLED,
+                PirepState::DRAFT,
+                PirepState::IN_PROGRESS
+            ], 'created_at', 'desc')
             ->paginate();
 
         return view('admin.pireps.index', [
diff --git a/app/Models/Pirep.php b/app/Models/Pirep.php
index ab5c8f60..950e4642 100644
--- a/app/Models/Pirep.php
+++ b/app/Models/Pirep.php
@@ -240,7 +240,8 @@ class Pirep extends Model
      */
     public function getReadOnlyAttribute(): bool
     {
-        return $this->state !== PirepState::PENDING;
+        return $this->state !== PirepState::PENDING
+                && $this->state != PirepState::IN_PROGRESS;
     }
 
     /**
diff --git a/app/Repositories/AcarsRepository.php b/app/Repositories/AcarsRepository.php
index 126665b8..ee43d9b7 100644
--- a/app/Repositories/AcarsRepository.php
+++ b/app/Repositories/AcarsRepository.php
@@ -57,6 +57,7 @@ class AcarsRepository extends Repository
     {
         return Pirep::with(['airline', 'position', 'aircraft'])
             ->where(['state' => PirepState::IN_PROGRESS])
+            ->orderBy('created_at', 'desc')
             ->get();
     }