Upstream
/
Plan
mirror of https://github.com/plan-player-analytics/Plan.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Network > Servers Overview Quick View players online graph 

Affects issues:
- Fixed #2908
This commit is contained in:
Aurora Lahtela 2023-03-10 07:28:24 +02:00
parent d96dce8c14
commit c1684a55df
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/JSONFactory.java
View File

@ -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.lang.GenericLang;
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.Database;
import com.djrapitops.plan.storage.database.queries.analysis.PlayerCountQueries;
@ -67,6 +69,7 @@ public class JSONFactory {
private final DBSystem dbSystem;
private final ServerInfo serverInfo;
private final ServerUptimeCalculator serverUptimeCalculator;
private final Theme theme;
private final Graphs graphs;
private final Formatters formatters;
@ -77,6 +80,7 @@ public class JSONFactory {
DBSystem dbSystem,
ServerInfo serverInfo,
ServerUptimeCalculator serverUptimeCalculator,
Theme theme,
Graphs graphs,
Formatters formatters
) {
@ -85,6 +89,7 @@ public class JSONFactory {
this.dbSystem = dbSystem;
this.serverInfo = serverInfo;
this.serverUptimeCalculator = serverUptimeCalculator;
this.theme = theme;
this.graphs = graphs;
this.formatters = formatters;
}
@ -219,6 +224,7 @@ public class JSONFactory {
Map<String, Object> server = new HashMap<>();
server.put("name", entry.getValue().getIdentifiableName());
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>> allTimePeak = db.query(TPSQueries.fetchAllTimePeakPlayerCount(serverUUID));

2
Plan/react/dashboard/src/components/cards/network/QuickViewGraphCard.js
View File

@ -11,7 +11,7 @@ const QuickViewGraphCard = ({server}) => {
<Card>
<CardHeader icon={faChartArea} color={'light-blue'}
label={server.name + ' ' + t('html.label.onlineActivity') + ' (' + t('html.label.thirtyDays') + ')'}/>
<PlayersOnlineGraph data={server.playersOnline}/>
<PlayersOnlineGraph data={{playersOnline: server.playersOnline, color: server.playersOnlineColor}}/>
</Card>
)
};