logicpowerhouse 4 سال پیش
والد
کامیت
37f50364f7

+ 3 - 3
app/Http/Controllers/PracticeManagementController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\AppSession;
-use App\Models\ClientBDTMeasurement;
+use App\Models\BDTMeasurement;
 use App\Models\Bill;
 use App\Models\Claim;
 use App\Models\Client;
@@ -486,8 +486,8 @@ class PracticeManagementController extends Controller
     }
 
     public function cellularMeasurements(Request $request){
-        $cbdtMeasurements = ClientBDTMeasurement::load('measurement')->orderBy('measurement.ts', 'desc')->paginate();
-        return view('app.practice-management.cellular-measurements', compact('cbdtMeasurements'));
+        $bdtMeasurements = BDTMeasurement::orderBy('ts', 'desc')->paginate();
+        return view('app.practice-management.cellular-measurements', compact('bdtMeasurements'));
     }
 
 }

+ 6 - 0
app/Models/BDTMeasurement.php

@@ -10,4 +10,10 @@ class BDTMeasurement extends Model
         return $this->hasOne(BDTDevice::class, 'id', 'device_id');
     }
 
+    public function clientBDTMeasurements()
+    {
+        return $this->hasMany(ClientBDTMeasurement::class, 'bdt_measurement_id', 'id')
+            ->orderBy('created_at', 'desc');
+    }
+
 }

+ 3 - 3
resources/views/app/practice-management/cellular-measurements.blade.php

@@ -35,9 +35,9 @@
                     </tr>
                     </thead>
                     <tbody>
-                    @foreach ($cbdtMeasurements as $c)
+                    @foreach ($bdtMeasurements as $b)
                         <tr class="">
-                            <td>{{$c->id}}</td>
+                            <td>{{$b->id}}</td>
                             <td></td>
                             <td></td>
                             <td></td>
@@ -46,7 +46,7 @@
                     </tbody>
                 </table>
                 <div>
-                    {{$cbdtMeasurements->links()}}
+                    {{$bdtMeasurements->links()}}
                 </div>
             </div>
         </div>