Fixed WorldPie for sessions

Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java

@@ -90,7 +90,9 @@ public class InspectPageParser extends PageParser {
                     .sorted(new SessionStartComparator())
                     .collect(Collectors.toList());
 
-            addValue("contentSessions", HtmlStructure.createSessionsTabContent(sessions, allSessions));
+            String[] sessionsTabContent = HtmlStructure.createSessionsTabContent(sessions, allSessions);
+            addValue("contentSessions", sessionsTabContent[0]);
+            addValue("sessionTabGraphViewFunctions", sessionsTabContent[1]);
             addValue("contentServerOverview", HtmlStructure.createServerOverviewColumn(sessions));
 
             long now = MiscUtils.getTime();

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

@@ -84,7 +84,7 @@ public class HtmlStructure {
         return builder.toString();
     }
 
-    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<>();
 
         for (Map.Entry<String, List<Session>> entry : sessions.entrySet()) {
@@ -95,7 +95,8 @@ public class HtmlStructure {
             }
         }
 
-        StringBuilder builder = new StringBuilder();
+        StringBuilder html = new StringBuilder();
+        StringBuilder viewScript = new StringBuilder();
         int i = 0;
         for (Session session : allSessions) {
             if (i >= 50) {
@@ -109,7 +110,7 @@ public class HtmlStructure {
             String dotSeparated = separateWithDots(sessionStart, sessionLength);
 
             // Session-column starts & header.
-            builder.append("<div class=\"session column\">")
+            html.append("<div class=\"session column\">")
                     .append("<div class=\"session-header\">")
                     .append("<div class=\"session-col\" style=\"width: 200%;\">")
                     .append("<h3>").append(dotSeparated).append("</h3>")
@@ -120,57 +121,58 @@ public class HtmlStructure {
             String serverName = serverNameIDRelationMap.get(session.getSessionID());
 
             // Left side of Session box
-            builder.append("<div class=\"session-content\">")
+            html.append("<div class=\"session-content\">")
                     .append("<div class=\"row\">") //
                     .append("<div class=\"session-col\" style=\"padding: 0px;\">");
 
             // Left side header
-            builder.append("<div class=\"box-header\" style=\"margin: 0px;\">")
+            html.append("<div class=\"box-header\" style=\"margin: 0px;\">")
                     .append("<h2><i class=\"fa fa-calendar\" aria-hidden=\"true\"></i> ")
                     .append(sessionStart)
                     .append("</h2>")
                     .append("</div>");
 
             // Left side content
-            builder.append("<div class=\"box\" style=\"margin: 0px;\">")
+            html.append("<div class=\"box\" style=\"margin: 0px;\">")
                     .append("<p>Session Length: ").append(sessionLength).append("<br>")
                     .append("Session Ended: ").append(sessionEnd).append("<br>")
                     .append("Server: ").append(serverName).append("<br><br>")
                     .append("Mob Kills: ").append(session.getMobKills()).append("<br>")
                     .append("Deaths: ").append(session.getDeaths()).append("</p>");
 
-            builder.append(KillsTableCreator.createTable(session.getPlayerKills()))
+            html.append(KillsTableCreator.createTable(session.getPlayerKills()))
                     .append("</div>"); // Left Side content ends
 
             // Left side ends & Right side starts
-            builder.append("</div>")
+            html.append("</div>")
                     .append("<div class=\"session-col\">");
 
             String id = "worldPie" + session.getSessionStart();
 
-            builder.append("<div id=\"").append(id).append("\" style=\"width: 100%; height: 400px;\"></div>");
+            html.append("<div id=\"").append(id).append("\" style=\"width: 100%; height: 400px;\"></div>");
 
             String[] worldData = WorldPieCreator.createSeriesData(session.getWorldTimes());
 
-            builder.append("<script>")
+            html.append("<script>")
                     .append("var ").append(id).append("series = {name:'World Playtime',colorByPoint:true,data:").append(worldData[0]).append("};")
                     .append("var ").append(id).append("gmseries = ").append(worldData[1]).append(";")
-                    .append("$( document ).ready(function() {worldPie(")
+                    .append("</script>");
+
+            viewScript.append("worldPie(")
                     .append(id).append(", ")
                     .append(id).append("series, ")
                     .append(id).append("gmseries")
-                    .append(");})")
+                    .append(");");
-                    .append("</script>");
 
             // Session-col, Row, Session-Content, Session-column ends.
-            builder.append("</div>")
+            html.append("</div>")
                     .append("</div>")
                     .append("</div>")
                     .append("</div>");
 
             i++;
         }
-        return builder.toString();
+        return new String[]{html.toString(), viewScript.toString()};
     }
 
     public static String createInspectPageTabContent(String serverName, List<PluginData> plugins, Map<String, String> replaceMap) {

Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldPieCreator.java

@@ -52,9 +52,10 @@ public class WorldPieCreator {
 
         Map<String, GMTimes> gmTimesMap = worldTimes.getWorldTimes();
         if (gmTimesMap.isEmpty()) {
-            return "{[]}";
+            return "[{[]}]";
         }
         int size = gmTimesMap.size();
+        drilldownBuilder.append("[");
         for (Map.Entry<String, GMTimes> world : gmTimesMap.entrySet()) {
             drilldownBuilder.append("{name:'").append(world.getKey())
                     .append("', id:'").append(world.getKey())
@@ -68,6 +69,7 @@ public class WorldPieCreator {
             }
             i++;
         }
+        drilldownBuilder.append("]");
         return drilldownBuilder.toString();
     }
 
@@ -78,6 +80,7 @@ public class WorldPieCreator {
         for (Map.Entry<String, Long> entry : gmTimes.entrySet()) {
             Long time = entry.getValue();
             if (time == 0) {
+                j++;
                 continue;
             }
             drilldownBuilder.append("['")

Plan/src/main/resources/Placeholders.txt

@@ -32,6 +32,7 @@ ${sessionLengthLongestDay} timeamount
 ${sessionLengthLongestWeek} timeamount
 
 ${contentSessions} See example page
+${sessionTabGraphViewFunctions} function calls that call the graphs to be viewed.
 ${contentServerOverview} See example page
 
 ${tabContentPlugins} See example page

Plan/src/main/resources/html/player.html

@@ -225,6 +225,7 @@
 
             worldPie('worldPie', worldSeries, gmSeries);
             punchCard('punchcard', punchcardSeries);
+            ${sessionTabGraphViewFunctions}
 
             openFunc(slideIndex)();
 

Plan/src/main/resources/js/worldPie.js

@@ -27,7 +27,7 @@ function worldPie(id, worldSeries, gmSeries) {
         },
         series: [worldSeries],
         drilldown: {
-            series: [gmSeries]
+            series: gmSeries
         }
     });
 }

Plan/test/main/java/com/djrapitops/plan/utilities/html/HtmlStructureTest.java

@@ -52,10 +52,10 @@ public class HtmlStructureTest {
     @Test
     public void createSessionsTabContent() throws Exception {
         List<Session> allSessions = sessions.values().stream().flatMap(Collection::stream).collect(Collectors.toList());
-        String sessionsTab = HtmlStructure.createSessionsTabContent(sessions, allSessions);
+        String[] sessionsTab = HtmlStructure.createSessionsTabContent(sessions, allSessions);
 
-        int opened = StringUtils.countMatches(sessionsTab, "<div");
+        int opened = StringUtils.countMatches(sessionsTab[0], "<div");
-        int closed = StringUtils.countMatches(sessionsTab, "</div");
+        int closed = StringUtils.countMatches(sessionsTab[0], "</div");
 
         assertEquals(opened, closed);
     }