Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-27 11:37:41 +01:00
Code Issues Projects Releases Wiki Activity

"No Data" equivalent for no sessions (Sessions Tab, Overview Tab), Plugins tab fixed on Bungee

Browse Source
This commit is contained in:
Rsl1122 2017-09-25 16:25:02 +03:00
parent 7dd10a03ab
commit 22579ecf24
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/src/main/java/com/djrapitops/plan/systems/info/BungeeInformationManager.java
View File

@ -183,6 +183,10 @@ public class BungeeInformationManager extends InformationManager {
Map<UUID, String> perServerPluginsTab = pluginsTabContent.getOrDefault(uuid, new HashMap<>()); Map<UUID, String> perServerPluginsTab = pluginsTabContent.getOrDefault(uuid, new HashMap<>());
perServerPluginsTab.put(serverUUID, html); perServerPluginsTab.put(serverUUID, html);
pluginsTabContent.put(uuid, perServerPluginsTab); pluginsTabContent.put(uuid, perServerPluginsTab);
Response inspectResponse = PageCache.loadPage("inspectPage: " + uuid);
if (inspectResponse != null) {
((InspectPageResponse) inspectResponse).setInspectPagePluginsTab(getPluginsTabContent(uuid));
}
} }
private WebAPIManager getWebAPI() { private WebAPIManager getWebAPI() {

22
Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlStructure.java
View File

@ -4,6 +4,7 @@
*/ */
package main.java.com.djrapitops.plan.utilities.html; package main.java.com.djrapitops.plan.utilities.html;
import com.djrapitops.plugin.utilities.Verify;
import main.java.com.djrapitops.plan.data.Session; import main.java.com.djrapitops.plan.data.Session;
import main.java.com.djrapitops.plan.data.additional.AnalysisType; import main.java.com.djrapitops.plan.data.additional.AnalysisType;
import main.java.com.djrapitops.plan.data.additional.PluginData; import main.java.com.djrapitops.plan.data.additional.PluginData;
@ -58,6 +59,10 @@ public class HtmlStructure {
public static String createServerOverviewColumn(Map<String, List<Session>> sessions) { public static String createServerOverviewColumn(Map<String, List<Session>> sessions) {
StringBuilder builder = new StringBuilder("<div class=\"column\">"); StringBuilder builder = new StringBuilder("<div class=\"column\">");
if (Verify.isEmpty(sessions)) {
return "<div class=\"box-header\"><h2><i class=\"fa fa-server\" aria-hidden=\"true\"></i> No Sessions</h2> </div>" +
"<div class=\"box\" style=\"margin-bottom: 5px;\"><p>No sessions to calculate server specific playtime.</p></div>";
}
for (Map.Entry<String, List<Session>> entry : sessions.entrySet()) { for (Map.Entry<String, List<Session>> entry : sessions.entrySet()) {
String serverName = entry.getKey(); String serverName = entry.getKey();
List<Session> serverSessions = entry.getValue(); List<Session> serverSessions = entry.getValue();
@ -88,6 +93,14 @@ public class HtmlStructure {
public static String[] createSessionsTabContent(Map<String, List<Session>> sessions, List<Session> allSessions) throws FileNotFoundException { public static String[] createSessionsTabContent(Map<String, List<Session>> sessions, List<Session> allSessions) throws FileNotFoundException {
Map<Integer, String> serverNameIDRelationMap = new HashMap<>(); Map<Integer, String> serverNameIDRelationMap = new HashMap<>();
if (Verify.isEmpty(allSessions)) {
return new String[]{"<div class=\"session column\">" +
"<div class=\"session-header\">" +
"<div class=\"session-col\" style=\"width: 200%;\">" +
"<h3>No Sessions</h3>" +
"</div></div></div>", ""};
}
for (Map.Entry<String, List<Session>> entry : sessions.entrySet()) { for (Map.Entry<String, List<Session>> entry : sessions.entrySet()) {
String serverName = entry.getKey(); String serverName = entry.getKey();
List<Session> serverSessions = entry.getValue(); List<Session> serverSessions = entry.getValue();
@ -178,7 +191,14 @@ public class HtmlStructure {
public static String createInspectPageTabContent(String serverName, List<PluginData> plugins, Map<String, Serializable> replaceMap) { public static String createInspectPageTabContent(String serverName, List<PluginData> plugins, Map<String, Serializable> replaceMap) {
if (plugins.isEmpty()) { if (plugins.isEmpty()) {
return ""; return "<div class=\"plugins-server\">" +
"<div class=\"plugins-header\">" +
"<div class=\"row\">" +
"<div class=\"column\">" +
"<div class=\"box-header\">" +
"<h2><i class=\"fa fa-server\" aria-hidden=\"true\"></i> "+ serverName+
"</h2><p>No Compatible Plugins</p>" +
"</div></div></div></div></div>";
} }
Map<String, List<String>> placeholders = getPlaceholdersInspect(plugins); Map<String, List<String>> placeholders = getPlaceholdersInspect(plugins);