mirror of
https://github.com/plan-player-analytics/Plan.git
synced 2025-03-02 11:11:21 +01:00
Fix Network > Servers Overview Quick View players online graph
Affects issues: - Fixed #2908
This commit is contained in:
parent
d96dce8c14
commit
c1684a55df
@ -38,6 +38,8 @@ import com.djrapitops.plan.settings.config.paths.TimeSettings;
|
|||||||
import com.djrapitops.plan.settings.locale.Locale;
|
import com.djrapitops.plan.settings.locale.Locale;
|
||||||
import com.djrapitops.plan.settings.locale.lang.GenericLang;
|
import com.djrapitops.plan.settings.locale.lang.GenericLang;
|
||||||
import com.djrapitops.plan.settings.locale.lang.HtmlLang;
|
import com.djrapitops.plan.settings.locale.lang.HtmlLang;
|
||||||
|
import com.djrapitops.plan.settings.theme.Theme;
|
||||||
|
import com.djrapitops.plan.settings.theme.ThemeVal;
|
||||||
import com.djrapitops.plan.storage.database.DBSystem;
|
import com.djrapitops.plan.storage.database.DBSystem;
|
||||||
import com.djrapitops.plan.storage.database.Database;
|
import com.djrapitops.plan.storage.database.Database;
|
||||||
import com.djrapitops.plan.storage.database.queries.analysis.PlayerCountQueries;
|
import com.djrapitops.plan.storage.database.queries.analysis.PlayerCountQueries;
|
||||||
@ -67,6 +69,7 @@ public class JSONFactory {
|
|||||||
private final DBSystem dbSystem;
|
private final DBSystem dbSystem;
|
||||||
private final ServerInfo serverInfo;
|
private final ServerInfo serverInfo;
|
||||||
private final ServerUptimeCalculator serverUptimeCalculator;
|
private final ServerUptimeCalculator serverUptimeCalculator;
|
||||||
|
private final Theme theme;
|
||||||
private final Graphs graphs;
|
private final Graphs graphs;
|
||||||
private final Formatters formatters;
|
private final Formatters formatters;
|
||||||
|
|
||||||
@ -77,6 +80,7 @@ public class JSONFactory {
|
|||||||
DBSystem dbSystem,
|
DBSystem dbSystem,
|
||||||
ServerInfo serverInfo,
|
ServerInfo serverInfo,
|
||||||
ServerUptimeCalculator serverUptimeCalculator,
|
ServerUptimeCalculator serverUptimeCalculator,
|
||||||
|
Theme theme,
|
||||||
Graphs graphs,
|
Graphs graphs,
|
||||||
Formatters formatters
|
Formatters formatters
|
||||||
) {
|
) {
|
||||||
@ -85,6 +89,7 @@ public class JSONFactory {
|
|||||||
this.dbSystem = dbSystem;
|
this.dbSystem = dbSystem;
|
||||||
this.serverInfo = serverInfo;
|
this.serverInfo = serverInfo;
|
||||||
this.serverUptimeCalculator = serverUptimeCalculator;
|
this.serverUptimeCalculator = serverUptimeCalculator;
|
||||||
|
this.theme = theme;
|
||||||
this.graphs = graphs;
|
this.graphs = graphs;
|
||||||
this.formatters = formatters;
|
this.formatters = formatters;
|
||||||
}
|
}
|
||||||
@ -219,6 +224,7 @@ public class JSONFactory {
|
|||||||
Map<String, Object> server = new HashMap<>();
|
Map<String, Object> server = new HashMap<>();
|
||||||
server.put("name", entry.getValue().getIdentifiableName());
|
server.put("name", entry.getValue().getIdentifiableName());
|
||||||
server.put("serverUUID", entry.getValue().getUuid().toString());
|
server.put("serverUUID", entry.getValue().getUuid().toString());
|
||||||
|
server.put("playersOnlineColor", theme.getValue(ThemeVal.GRAPH_PLAYERS_ONLINE));
|
||||||
|
|
||||||
Optional<DateObj<Integer>> recentPeak = db.query(TPSQueries.fetchPeakPlayerCount(serverUUID, now - TimeUnit.DAYS.toMillis(2L)));
|
Optional<DateObj<Integer>> recentPeak = db.query(TPSQueries.fetchPeakPlayerCount(serverUUID, now - TimeUnit.DAYS.toMillis(2L)));
|
||||||
Optional<DateObj<Integer>> allTimePeak = db.query(TPSQueries.fetchAllTimePeakPlayerCount(serverUUID));
|
Optional<DateObj<Integer>> allTimePeak = db.query(TPSQueries.fetchAllTimePeakPlayerCount(serverUUID));
|
||||||
|
@ -11,7 +11,7 @@ const QuickViewGraphCard = ({server}) => {
|
|||||||
<Card>
|
<Card>
|
||||||
<CardHeader icon={faChartArea} color={'light-blue'}
|
<CardHeader icon={faChartArea} color={'light-blue'}
|
||||||
label={server.name + ' ' + t('html.label.onlineActivity') + ' (' + t('html.label.thirtyDays') + ')'}/>
|
label={server.name + ' ' + t('html.label.onlineActivity') + ' (' + t('html.label.thirtyDays') + ')'}/>
|
||||||
<PlayersOnlineGraph data={server.playersOnline}/>
|
<PlayersOnlineGraph data={{playersOnline: server.playersOnline, color: server.playersOnlineColor}}/>
|
||||||
</Card>
|
</Card>
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user