diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts index 4a38dd5..bce425c 100644 --- a/ui/src/app/app.module.ts +++ b/ui/src/app/app.module.ts @@ -26,6 +26,7 @@ import {NetworkStatusComponent} from "./components/packet/NetworkStatus.componen import {MatRadioModule} from "@angular/material/radio"; import {DatePipe} from "@angular/common"; import {NodesMapComponent} from "./components/nodes/nodes-map.component"; +import {MatTooltipModule} from "@angular/material/tooltip"; @NgModule({ declarations: [ @@ -37,29 +38,30 @@ import {NodesMapComponent} from "./components/nodes/nodes-map.component"; NetworkStatusComponent, NodesMapComponent ], - imports: [ - BrowserModule, - AppRoutingModule, - BrowserAnimationsModule, - MatToolbarModule, - MatIconModule, - MatSidenavModule, - MatButtonModule, - HttpClientModule, - MatDialogModule, - MatTabsModule, - MatInputModule, - MatAutocompleteModule, - ReactiveFormsModule, - FormsModule, - MatSnackBarModule, - MatDividerModule, - MatCardModule, - NodeDtoSortPipe, - MatSelectModule, - NodeDtoSearchPipe, - MatRadioModule - ], + imports: [ + BrowserModule, + AppRoutingModule, + BrowserAnimationsModule, + MatToolbarModule, + MatIconModule, + MatSidenavModule, + MatButtonModule, + HttpClientModule, + MatDialogModule, + MatTabsModule, + MatInputModule, + MatAutocompleteModule, + ReactiveFormsModule, + FormsModule, + MatSnackBarModule, + MatDividerModule, + MatCardModule, + NodeDtoSortPipe, + MatSelectModule, + NodeDtoSearchPipe, + MatRadioModule, + MatTooltipModule + ], providers: [{ provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, diff --git a/ui/src/app/components/nodes/nodes-list.component.ts b/ui/src/app/components/nodes/nodes-list.component.ts index 4c6927e..bd2651a 100644 --- a/ui/src/app/components/nodes/nodes-list.component.ts +++ b/ui/src/app/components/nodes/nodes-list.component.ts @@ -37,16 +37,24 @@ import {numToColor} from "../../utils/Utils"; *ngFor="let node of nodes | NodeDtoSort: sort.type | NodeDtoSearch: search.type: searchContent" [style]="{'background-color':numToColor(node.num)}"> - {{node.long_name}} - {{node.short_name}} ({{node.num}}) + + {{node.long_name}} + done + add_location + battery_unknown + + + {{node.short_name}} ({{node.num}}) + {{node.ts * 1000 | date:"HH:mm dd.MM.yyyy"}} - 0">Прыжков: {{node.hops_away}} - SNR: {{node.snr}} + {{node.hops_away > 0 ? node.hops_away : "Прямая"}} + {{node.snr}}dB + {{node.rssi}}dB Статистика @@ -65,6 +73,9 @@ export class NodesListComponent implements OnInit { sortVars:{name: string, type: string}[] = [ {name: "Последнему пингу", type: "ts"}, {name: "SNR", type: "snr"}, + {name: "RSSI", type: "rssi"}, + {name: "Хопам", type: "hops_away"}, + {name: "Наличию пакетов", type: "view_in_packets"} //{name: "Имени", type: "long_name"} ] sort: {name: string, type: string} = this.sortVars[0] diff --git a/ui/src/app/entities/NodeDTO.ts b/ui/src/app/entities/NodeDTO.ts index 5de8f2a..fb105ee 100644 --- a/ui/src/app/entities/NodeDTO.ts +++ b/ui/src/app/entities/NodeDTO.ts @@ -4,10 +4,13 @@ import {DeviceMetricsDTO} from "./node/DeviceMetricsDTO"; export interface NodeDTO extends NodeMiniDTO { snr: number, + rssi: number, hops_away: number, ts: number havePosition:boolean, position: PositionDTO, haveMetrics:boolean, - device_metrics: DeviceMetricsDTO + device_metrics: DeviceMetricsDTO, + last_portnum: number, + view_in_packets: boolean }
{{node.long_name}}
done
add_location
battery_unknown
{{node.short_name}} ({{node.num}})