Browse Source

fixes

master
gsd 2 weeks ago
parent
commit
fd6dbcabdb
  1. 2
      src/app/entities/graph/GraphData.ts
  2. 3
      src/app/pages/internal-components/abstract-search-table.component.ts
  3. 10
      src/app/pages/statistic-page/statistic-page.component.ts
  4. 3
      src/app/services/server.service.ts
  5. 4
      src/styles.scss

2
src/app/entities/graph/GraphData.ts

@ -22,4 +22,6 @@ export class GraphData {
)
return g;
}
}

3
src/app/pages/internal-components/abstract-search-table.component.ts

@ -60,8 +60,9 @@ export abstract class AbstractSearchTable<T,U extends SearchFilter> implements A
this.updateData();
this.serverService.servers.subscribe(
(res) => {
const keys = Object.keys(res.data);
const keys = res.data ? Object.keys(res.data) : [];
for (const key of keys) {
// @ts-ignore
this.serverList.push({name: res.data[key].name, server_id: key});
}
console.log(this.serverList);

10
src/app/pages/statistic-page/statistic-page.component.ts

@ -61,14 +61,12 @@ export class StatisticPageComponent implements OnInit {
}
getServers() {
this.serverService.servers.subscribe(
this.serverService.getServers().subscribe(
(res) => {
console.log(res);
const keys = Object.keys(res.data);
for (const key of keys) {
this.serverList.push({name: res.data[key].name, server_id: key});
}
console.log(this.serverList)
}
)
}
@ -84,14 +82,14 @@ export class StatisticPageComponent implements OnInit {
switch (this.selectedPeriod.value) {
case 'days': {
this.graphService.getOnlineStatsOfDays(this.selectedDays, this.selectedServer?this.selectedServer.server_id:'%').subscribe(
(d) => this.processingData(GraphData.fromStatsOfPeakOfDay(d, "red")),
(d) => this.processingData(GraphData.fromStatsOfPeakOfDay(d.reverse(), "red")),
(err) => this.actionService.showSnack('Произошла ошибка во время загрузки данных, попробуй позже'),
() => this.loading = false
); break;
}
case 'minutes': {
this.graphService.getOnlineStatsOfMinutes(this.selectedMinute, this.selectedDays, this.selectedServer?this.selectedServer.server_id:'%').subscribe(
(d) => this.processingData(GraphData.fromStatsOfPeakOfPerFiveMinutes(d, "red")),
(d) => this.processingData(GraphData.fromStatsOfPeakOfPerFiveMinutes(d.reverse(), "red")),
(err) => this.actionService.showSnack('Произошла ошибка во время загрузки данных, попробуй позже'),
() => this.loading = false
); break;
@ -99,7 +97,7 @@ export class StatisticPageComponent implements OnInit {
}
}
processingData(data:GraphData) {
processingData(data:GraphData, reversed: boolean = true) {
if (this.chart)
this.chart.destroy();

3
src/app/services/server.service.ts

@ -2,12 +2,13 @@ import { Injectable } from '@angular/core';
import {HttpClient} from "@angular/common/http";
import {map, Observable, of} from "rxjs";
import {StatExporter} from "../entities/servers/StatExporter";
import {Server} from "../entities/servers/Server";
@Injectable({
providedIn: 'root'
})
export class ServerService {
public servers: Observable<StatExporter<any>> = of();
public servers: Observable<StatExporter<{[srv_name: string]:Server|any}>> = of();
constructor(private http: HttpClient) {
this.getServers().subscribe((res) => {

4
src/styles.scss

@ -389,3 +389,7 @@ span {
width: 65%;
}
}
.mat-dialog-content {
padding-bottom: 1% !important;
}

Loading…
Cancel
Save