diff --git a/app/Filament/Resources/ResultResource.php b/app/Filament/Resources/ResultResource.php index 857c0d7bd..6e23339fc 100644 --- a/app/Filament/Resources/ResultResource.php +++ b/app/Filament/Resources/ResultResource.php @@ -57,14 +57,14 @@ public static function form(Form $form): Form }) ->columnSpan(2), Forms\Components\TextInput::make('download') - ->label('Download (Mbps)') - ->afterStateHydrated(function (TextInput $component, $state) { - $component->state(! blank($state) ? toBits(convertSize($state), 4) : ''); + ->label('Download') + ->afterStateHydrated(function (TextInput $component, Result $record) { + $component->state(! blank($record->download) ? Number::fileSizeBits(bits: $record->download_bits, precision: 2, perSecond: true) : ''); }), Forms\Components\TextInput::make('upload') - ->label('Upload (Mbps)') - ->afterStateHydrated(function (TextInput $component, $state) { - $component->state(! blank($state) ? toBits(convertSize($state), 4) : ''); + ->label('Upload') + ->afterStateHydrated(function (TextInput $component, Result $record) { + $component->state(! blank($record->upload) ? Number::fileSizeBits(bits: $record->upload_bits, precision: 2, perSecond: true) : ''); }), Forms\Components\TextInput::make('ping') ->label('Ping (Ms)'), diff --git a/app/Helpers/Number.php b/app/Helpers/Number.php index 2f9c3c386..dc2f2ac70 100644 --- a/app/Helpers/Number.php +++ b/app/Helpers/Number.php @@ -16,8 +16,8 @@ public static function fileSizeBits(int|float $bits, int $precision = 0, ?int $m default => ['B', 'Kb', 'Mb', 'Gb', 'Tb', 'Pb', 'Eb', 'Zb', 'Yb'] }; - for ($i = 0; ($bits / 1024) > 0.9 && ($i < count($units) - 1); $i++) { - $bits /= 1024; + for ($i = 0; ($bits / 1000) > 0.9 && ($i < count($units) - 1); $i++) { + $bits /= 1000; } return sprintf('%s %s', static::format($bits, $precision, $maxPrecision), $units[$i]);