diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.css b/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.css index c837aaa..ad7ded3 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.css +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.css @@ -1464,3 +1464,5 @@ +.badge-disk-type { display: inline-block; padding: 2px 6px; font-size: 11px; font-weight: bold; color: #fff; background-color: #607d8b; border-radius: 4px; margin-left: 8px; vertical-align: middle; } + \ No newline at end of file diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.html b/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.html index 2aee91a..b08c544 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.html +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.html @@ -104,7 +104,7 @@
- Disco {{ disk.diskNumber }} + Disco {{ disk.diskNumber }} {{ disk.diskType }} {{ (disk.totalDiskSize / 1024).toFixed(2) }} GB
diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.ts b/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.ts index 97adcac..13a868f 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.ts +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.ts @@ -17,6 +17,7 @@ import { MatTableDataSource } from '@angular/material/table'; interface Partition { uuid?: string; partitionNumber: number; + diskType?: string; size: number; partitionCode: string; filesystem: string; @@ -46,7 +47,7 @@ export class PartitionAssistantComponent implements OnInit, AfterViewInit, OnDes selectedDiskNumber: number | null = null; updateRequests: any[] = []; data: any = {}; - disks: { diskNumber: number; totalDiskSize: number; partitions: Partition[]; chartData: any[]; used: number; percentage: number }[] = []; + disks: { diskNumber: number; totalDiskSize: number; partitions: Partition[]; chartData: any[]; used: number; percentage: number; diskType?: string }[] = []; clientData: any = []; loading: boolean = false; runScriptContext: any = null; @@ -234,7 +235,7 @@ export class PartitionAssistantComponent implements OnInit, AfterViewInit, OnDes const partitionsFromData = this.data.partitions; this.originalPartitions = JSON.parse(JSON.stringify(partitionsFromData)); - const disksMap = new Map(); + const disksMap = new Map(); partitionsFromData.forEach((partition: any) => { if (!disksMap.has(partition.diskNumber)) { @@ -244,6 +245,7 @@ export class PartitionAssistantComponent implements OnInit, AfterViewInit, OnDes const disk = disksMap.get(partition.diskNumber); if (partition.partitionNumber === 0) { disk!.totalDiskSize = this.convertBytesToGB(partition.size); + disk!.diskType = partition.diskType; } else { const isFirstPartitionGPT = partition.partitionNumber === 1 && this.partitionCode === 'GPT'; const hasValidExistingData = partition.size > 0 && partition.partitionCode && partition.filesystem; @@ -297,7 +299,8 @@ export class PartitionAssistantComponent implements OnInit, AfterViewInit, OnDes partitions: disk.partitions, chartData: chartData, used: used, - percentage: percentage + percentage: percentage, + diskType: disk.diskType }); }); this.disks.forEach((disk) => { diff --git a/ogWebconsole/src/app/components/groups/groups.component.css b/ogWebconsole/src/app/components/groups/groups.component.css index 8d16db7..3730d39 100644 --- a/ogWebconsole/src/app/components/groups/groups.component.css +++ b/ogWebconsole/src/app/components/groups/groups.component.css @@ -1597,6 +1597,33 @@ mat-button-toggle-group { opacity: 1; } +.badge-net-speed { + display: flex; + align-items: center; + gap: 4px; + background-color: #e3f2fd; + color: #1976d2; + font-size: 0.75rem; + font-weight: 600; + padding: 2px 8px; + border-radius: 12px; + width: fit-content; + margin-top: 4px; +} + +.badge-net-speed .net-speed-icon { + font-size: 14px; + width: 14px; + height: 14px; +} + +.list-view-badge { + display: inline-flex; + margin-top: 0; + margin-left: 8px; + vertical-align: middle; +} + .stat-icon { display: flex; align-items: center; diff --git a/ogWebconsole/src/app/components/groups/groups.component.html b/ogWebconsole/src/app/components/groups/groups.component.html index 7252db4..568509c 100644 --- a/ogWebconsole/src/app/components/groups/groups.component.html +++ b/ogWebconsole/src/app/components/groups/groups.component.html @@ -419,6 +419,11 @@ {{ client.name }} {{ client.ip }} {{ client.mac }} + @if (client.netSpeed) { + + speed {{ client.netSpeed }} Mbps + + } @if (client.isRemotePcActive) { computer @@ -540,6 +545,11 @@
{{ client.ip }} {{ client.mac }} + @if (client.netSpeed) { + + speed {{ client.netSpeed }} Mbps + + }
diff --git a/ogWebconsole/src/app/components/groups/model/model.ts b/ogWebconsole/src/app/components/groups/model/model.ts index e4af7ea..d39973d 100644 --- a/ogWebconsole/src/app/components/groups/model/model.ts +++ b/ogWebconsole/src/app/components/groups/model/model.ts @@ -42,6 +42,8 @@ export interface Client { type: string; serialNumber: string; netiface: string; + netDriver?: string; + netSpeed?: number; organizationalUnit: OrganizationalUnit; partitions: any[]; createdAt: string;