Admin updates

app/Http/Controllers/AdminController.php

@@ -670,7 +670,11 @@ class AdminController extends Controller
 
     public function orderTestResults(StoreOrder $order)
     {
-        $testResults = TestResult::where('store_order_id', $order->id)->orderBy('created_at', 'DESC')->get();
+        $ordersIDS = [$order->id];
+        $associatedOrdersIDs = StoreOrder::where('parent_order_id', $order->id)->pluck('id')->toArray();
+        $ordersIDS = array_merge($ordersIDS, $associatedOrdersIDs);
+
+        $testResults = TestResult::whereIn('store_order_id', $ordersIDS)->whereRaw('is_deleted IS NOT TRUE')->orderBy('created_at', 'DESC')->get();
         return view('app.my-account.admin.orders.sub.test-results', compact('order', 'testResults'));
     }
 }

app/Models/TestResult.php

@@ -16,4 +16,20 @@ class TestResult extends BaseModel
         return $this->hasOne(StoreOrder::class, 'id', 'store_order_id');
     }
 
+    public function detailJson($toArray = false)
+    {
+        if($toArray){
+            return json_decode($this->detail_json ?? '{}', true);
+        }
+        return json_decode($this->detail_json ?? '{}');
+    }
+
+    public function getDetailJsonValue($field)
+    {
+        $parsed = $this->detailJson(true);
+        if (isset($parsed[$field])) {
+            return $parsed[$field];
+        }
+        return null;
+    }
 }

resources/views/app/my-account/admin/orders/forms/create-test-result.blade.php

@@ -10,6 +10,7 @@
             <label>Result Category</label>
             <select name="resultCategory" class="form-control form-control-sm">
                 <option></option>
+                <option value="Pending">Pending</option>
                 <option value="Normal">Normal</option>
                 <option value="Abnormal">Abnormal</option>
                 <option value="Not Detected">Not Detected</option>

resources/views/app/my-account/admin/orders/forms/update-test-result.blade.php

@@ -5,11 +5,15 @@
         <div class="mb-2">
             <label>Test Name</label>
             <input type="text" name="testName" class="form-control form-control-sm" value="{{ $tr->test_name }}" />
+            @if(@$test_quest_name_for_pdf)
+                <div class="text-muted">{{ @$test_quest_code_for_pdf }} - {{ @$test_quest_name_for_pdf }}</div>
+            @endif
         </div>
         <div class="mb-2">
             <label>Result Category</label>
             <select name="resultCategory" class="form-control form-control-sm">
                 <option></option>
+                <option value="Pending" {{ $tr->result_category === 'Pending' ? 'selected':'' }}>Pending</option>
                 <option value="Normal" {{ $tr->result_category === 'Normal' ? 'selected':'' }}>Normal</option>
                 <option value="Abnormal" {{ $tr->result_category === 'Abnormal' ? 'selected':'' }}>Abnormal</option>
                 <option value="Not Detected" {{ $tr->result_category === 'Not Detected' ? 'selected':'' }}>Not Detected</option>

resources/views/app/my-account/admin/orders/partials/sidebar.blade.php

@@ -10,9 +10,9 @@ $currentMenu = \Illuminate\Support\Facades\Request::segment(4);
             <li class="nav-item">
                 <a class="nav-link {{\Illuminate\Support\Facades\Route::getCurrentRoute()->getName() === 'admin.orders.view.dashboard' ? 'active' : ''}}" href="{{ route('admin.orders.view.dashboard', $order) }}">Dashboard</a>
             </li>
-            {{-- <li class="nav-item">
+            <li class="nav-item">
                 <a class="nav-link {{\Illuminate\Support\Facades\Route::getCurrentRoute()->getName() === 'admin.orders.view.test-results' ? 'active' : ''}}" href="{{ route('admin.orders.view.test-results', $order) }}">Test Results</a>
-            </li> --}}
+            </li>
             <li class="nav-item">
                 <a class="nav-link {{\Illuminate\Support\Facades\Route::getCurrentRoute()->getName() === 'admin.orders.view.financial-transactions' ? 'active' : ''}}" href="{{ route('admin.orders.view.financial-transactions', $order) }}">Financial Transactions</a>
             </li>

resources/views/app/my-account/admin/orders/sub/test-results.blade.php

@@ -26,9 +26,18 @@
             </thead>
             <tbody>
                 @foreach($testResults as $tr)
+                <?php
+                    $test_quest_name_for_pdf = $tr->getDetailJsonValue('test_quest_name_for_pdf');
+                    $test_quest_code_for_pdf = $tr->getDetailJsonValue('test_quest_code_for_pdf');
+                ?>
                 <tr>
                     <td>{{friendly_date($tr->created_at)}}</td>
-                    <td>{{ $tr->test_name }}</td>
+                    <td>
+                        <div>{{ $tr->test_name }}</div>
+                        @if(@$test_quest_name_for_pdf)
+                        <div class="text-muted">{{ @$test_quest_code_for_pdf }} - {{ @$test_quest_name_for_pdf }}</div>
+                        @endif
+                    </td>
                     <td>{{ $tr->result_category }}</td>
                     <td>{{ $tr->result_color }}</td>
                     <td>{{ $tr->numeric_value_and_units }}</td>