nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-20 17:02:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed missing days and sorting in traffic widget

Browse Source
This commit is contained in:
Čarodej
2022-02-28 09:03:57 +01:00
parent 2e80da830a
commit c2e4b50df5
5 changed files with 69 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/App/Users/Resources/UserStorageResource.php
View File

@@ -1,7 +1,10 @@
<?php
namespace App\Users\Resources;
use ByteUnits\Metric;
use Carbon\CarbonPeriod;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\DB;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -20,18 +23,18 @@ class UserStorageResource extends JsonResource
$totalCapacity = match (get_settings('subscription_type')) {
'metered' => $this->usedCapacity / 1000000000,
'fixed' => $this->limitations->max_storage_amount,
default => $this->limitations->max_storage_amount,
'fixed' => $this->limitations->max_storage_amount,
default => $this->limitations->max_storage_amount,
};
return [
'data' => [
'id' => (string) $this->id,
'id' => (string)$this->id,
'type' => 'storage',
'attributes' => [
'used' => Metric::bytes($this->usedCapacity)->format(),
'capacity' => format_gigabytes($totalCapacity),
'percentage' => (float) get_storage_percentage($this->usedCapacity, $totalCapacity),
'percentage' => (float)get_storage_percentage($this->usedCapacity, $totalCapacity),
],
'meta' => [
'traffic' => [
@@ -44,23 +47,23 @@ class UserStorageResource extends JsonResource
],
'images' => [
'used' => Metric::bytes($images)->format(),
'percentage' => (float) get_storage_percentage($images, $totalCapacity),
'percentage' => (float)get_storage_percentage($images, $totalCapacity),
],
'audios' => [
'used' => Metric::bytes($audios)->format(),
'percentage' => (float) get_storage_percentage($audios, $totalCapacity),
'percentage' => (float)get_storage_percentage($audios, $totalCapacity),
],
'videos' => [
'used' => Metric::bytes($videos)->format(),
'percentage' => (float) get_storage_percentage($videos, $totalCapacity),
'percentage' => (float)get_storage_percentage($videos, $totalCapacity),
],
'documents' => [
'used' => Metric::bytes($documents)->format(),
'percentage' => (float) get_storage_percentage($documents, $totalCapacity),
'percentage' => (float)get_storage_percentage($documents, $totalCapacity),
],
'others' => [
'used' => Metric::bytes($others)->format(),
'percentage' => (float) get_storage_percentage($others, $totalCapacity),
'percentage' => (float)get_storage_percentage($others, $totalCapacity),
],
],
],
@@ -130,18 +133,26 @@ class UserStorageResource extends JsonResource
->where('user_id', $this->id)
->where('created_at', '>', $period)
->orderBy('created_at')
->get();
->get(['upload', 'download', 'created_at'])
->each(fn($record) => $record->created_at = format_date($record->created_at, 'd. M. Y'))
->keyBy('created_at');
$upload = $trafficRecords->map(fn ($record) => [
'created_at' => format_date($record->created_at, 'd. M. '),
'percentage' => $uploadMax !== 0 ? round(($record->upload / $uploadMax) * 100, 2) : 0,
$mappedTrafficRecords = mapTrafficRecords($trafficRecords);
$upload = $mappedTrafficRecords->map(fn($record) => [
'created_at' => $record->created_at,
'amount' => Metric::bytes($record->upload)->format(),
'percentage' => $uploadMax !== 0
? round(($record->upload / $uploadMax) * 100, 2)
: 0,
]);
$download = $trafficRecords->map(fn ($record) => [
'created_at' => format_date($record->created_at, 'd. M. '),
'percentage' => $downloadMax !== 0 ? round(($record->download / $downloadMax) * 100, 2) : 0,
$download = $mappedTrafficRecords->map(fn($record) => [
'created_at' => $record->created_at,
'amount' => Metric::bytes($record->download)->format(),
'percentage' => $downloadMax !== 0
? round(($record->download / $downloadMax) * 100, 2)
: 0,
]);
return [$downloadTotal, $uploadTotal, $upload, $download];