diff options
| author | Glukhov Mikhail <mikl@greenfil.ru> | 2022-12-24 12:16:53 +0300 |
|---|---|---|
| committer | Glukhov Mikhail <mikl@greenfil.ru> | 2023-02-14 08:18:42 +0300 |
| commit | d0b078f692fc02578b0bfbc3868ce81516c71dd3 (patch) | |
| tree | b645511c121a8c3f583b6019f0b76f868d529f6b /src/views/HardwareStatus/Inventory | |
| parent | 713dae09ac29fe53ca76e44b7b3a75f114479eca (diff) | |
| download | webui-vue-d0b078f692fc02578b0bfbc3868ce81516c71dd3.tar.xz | |
Reducing values to a common format
I use this patch to convert all values into the
format <Description>:<Value><Unit of Measure>.
I put the units of measure in a separate
localization area in order to use them in
the sensor page in the future.
Change-Id: Ic6554860c4185bc4d681a97205051799c6637b5c
Signed-off-by: Glukhov Mikhail <mikl@greenfil.ru>
Diffstat (limited to 'src/views/HardwareStatus/Inventory')
6 files changed, 48 insertions, 12 deletions
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue b/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue index b49cec7f..4c557fa2 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue @@ -100,10 +100,16 @@ <dl> <!-- Min power --> <dt>{{ $t('pageInventory.table.minPowerWatts') }}:</dt> - <dd>{{ dataFormatter(item.minPowerWatts) }}</dd> + <dd> + {{ dataFormatter(item.minPowerWatts) }} + {{ $t('unit.W') }} + </dd> <!-- Max power --> <dt>{{ $t('pageInventory.table.maxPowerWatts') }}:</dt> - <dd>{{ dataFormatter(item.maxPowerWatts) }}</dd> + <dd> + {{ dataFormatter(item.maxPowerWatts) }} + {{ $t('unit.W') }} + </dd> </dl> </b-col> </b-row> diff --git a/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue b/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue index d29f6f8e..459d3bb3 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue @@ -95,7 +95,10 @@ <dl> <!-- Capacity MiB --> <dt>{{ $t('pageInventory.table.capacityMiB') }}:</dt> - <dd>{{ dataFormatter(item.capacityMiB) }}</dd> + <dd> + {{ dataFormatter(item.capacityMiB) }} + {{ $t('unit.MiB') }} + </dd> </dl> <dl> <!-- Status--> @@ -132,17 +135,26 @@ <dl> <!-- Bus Width Bits --> <dt>{{ $t('pageInventory.table.busWidthBits') }}:</dt> - <dd>{{ dataFormatter(item.busWidthBits) }}</dd> + <dd> + {{ dataFormatter(item.busWidthBits) }} + {{ $t('unit.bit') }} + </dd> </dl> <dl> <!-- Data Width Bits --> <dt>{{ $t('pageInventory.table.dataWidthBits') }}:</dt> - <dd>{{ dataFormatter(item.dataWidthBits) }}</dd> + <dd> + {{ dataFormatter(item.dataWidthBits) }} + {{ $t('unit.bit') }} + </dd> </dl> <dl> <!-- Operating Speed Mhz --> <dt>{{ $t('pageInventory.table.operatingSpeedMhz') }}:</dt> - <dd>{{ dataFormatter(item.operatingSpeedMhz) }} MHz</dd> + <dd> + {{ dataFormatter(item.operatingSpeedMhz) }} + {{ $t('unit.MHz') }} + </dd> </dl> </b-col> </b-row> diff --git a/src/views/HardwareStatus/Inventory/InventoryTableFans.vue b/src/views/HardwareStatus/Inventory/InventoryTableFans.vue index fe788c53..9e26d903 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTableFans.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTableFans.vue @@ -73,7 +73,10 @@ <dl> <!-- Fan speed --> <dt>{{ $t('pageInventory.table.fanSpeed') }}:</dt> - <dd>{{ dataFormatter(item.speed) }}</dd> + <dd> + {{ dataFormatter(item.speed) }} + {{ $t('unit.RPM') }} + </dd> </dl> </b-col> <b-col sm="6" xl="4"> diff --git a/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue b/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue index aed7871a..df03fdf2 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue @@ -83,10 +83,16 @@ <dd>{{ dataFormatter(item.statusHealth) }}</dd> <!-- Efficiency percent --> <dt>{{ $t('pageInventory.table.efficiencyPercent') }}:</dt> - <dd>{{ dataFormatter(item.efficiencyPercent) }}</dd> + <dd> + {{ dataFormatter(item.efficiencyPercent) }} + {{ $t('unit.Percent') }} + </dd> <!-- Power input watts --> <dt>{{ $t('pageInventory.table.powerInputWatts') }}:</dt> - <dd>{{ dataFormatter(item.powerInputWatts) }}</dd> + <dd> + {{ dataFormatter(item.powerInputWatts) }} + {{ $t('unit.W') }} + </dd> </dl> </b-col> </b-row> diff --git a/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue b/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue index 7d5dd700..793dbd86 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue @@ -127,10 +127,16 @@ <dl> <!-- Min Speed MHz --> <dt>{{ $t('pageInventory.table.minSpeedMHz') }}:</dt> - <dd>{{ dataFormatter(item.minSpeedMHz) }}</dd> + <dd> + {{ dataFormatter(item.minSpeedMHz) }} + {{ $t('unit.MHz') }} + </dd> <!-- Max Speed MHz --> <dt>{{ $t('pageInventory.table.maxSpeedMHz') }}:</dt> - <dd>{{ dataFormatter(item.maxSpeedMHz) }}</dd> + <dd> + {{ dataFormatter(item.maxSpeedMHz) }} + {{ $t('unit.MHz') }} + </dd> <!-- Total Cores --> <dt>{{ $t('pageInventory.table.totalCores') }}:</dt> <dd>{{ dataFormatter(item.totalCores) }}</dd> diff --git a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue index cf2cf020..e62f5006 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue @@ -115,7 +115,10 @@ <dd>{{ dataFormatter(item.memorySummaryHealthRollup) }}</dd> <!-- Total system memory --> <dt>{{ $t('pageInventory.table.totalSystemMemoryGiB') }}:</dt> - <dd>{{ dataFormatter(item.totalSystemMemoryGiB) }}GB</dd> + <dd> + {{ dataFormatter(item.totalSystemMemoryGiB) }} + {{ $t('unit.GiB') }} + </dd> </dl> <!-- Processor Summary --> <p class="mt-1 mb-2 h6 float-none m-0"> |