|
|
@@ -118,11 +118,7 @@ class Client extends Model
|
|
|
return $this->hasMany(Measurement::class, 'client_id', 'id')
|
|
|
/*->distinct('label')*/
|
|
|
->where('is_removed', false)
|
|
|
-<<<<<<< HEAD
|
|
|
- ->orderBy('ts', 'desc');
|
|
|
-=======
|
|
|
->orderByRaw('ts DESC NULLS LAST');
|
|
|
->>>>>>> ca71bbebc0f2ae7462c9b4b4a6248431147ac0f0
|
|
|
}
|
|
|
|
|
|
public function nonZeroMeasurements()
|
=