From 13668170b6880e9afa60bca62059497fe185448a Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 20 Jul 2019 15:21:07 +0300 Subject: [PATCH] Made player overview dynamic --- .../assets/plan/web/js/player-values.js | 96 ++ .../resources/assets/plan/web/player.html | 990 ++++++------------ 2 files changed, 388 insertions(+), 698 deletions(-) create mode 100644 Plan/common/src/main/resources/assets/plan/web/js/player-values.js diff --git a/Plan/common/src/main/resources/assets/plan/web/js/player-values.js b/Plan/common/src/main/resources/assets/plan/web/js/player-values.js new file mode 100644 index 000000000..65e34c913 --- /dev/null +++ b/Plan/common/src/main/resources/assets/plan/web/js/player-values.js @@ -0,0 +1,96 @@ +function loadPlayerOverviewValues(json, error) { + if (error) { + $("#player-overview").addClass("forbidden"); // TODO Figure out 403 + return; + } + + tab = $("#player-overview"); + + // Player information card + data = json.info; + element = $(tab).find("#data_player_info"); + + $(element).find("#data_online").replaceWith(data.online ? ' Online' : ' Offline'); + $(element).find("#data_titles").replaceWith((data.operator ? ' Operator' : '') + (data.banned ? ' Banned' : '')); + $(element).find("#data_kick_count").text(data.kick_count); + $(element).find("#data_player_kills").text(data.player_kill_count); + $(element).find("#data_mob_kills").text(data.mob_kill_count); + $(element).find("#data_deaths").text(data.death_count); + + $(element).find("#data_playtime").text(data.playtime); + $(element).find("#data_active_playtime").text(data.active_playtime); + $(element).find("#data_afk_time").text(data.afk_time); + $(element).find("#data_session_count").text(data.session_count); + $(element).find("#data_longest_session_lenght").text(data.longest_session_lenght); + $(element).find("#data_session_median").text(data.session_median); + + $(element).find("#data_activity_index").text(data.activity_index); + $(element).find("#data_activity_index_group").text(data.activity_index_group); + $(element).find("#data_favorite_server").text(data.favorite_server); + $(element).find("#data_average_ping").text(data.average_ping); + $(element).find("#data_best_ping").text(data.best_ping); + $(element).find("#data_worst_ping").text(data.worst_ping); + + $(element).find("#data_registered").text(data.registered); + $(element).find("#data_last_seen").text(data.last_seen); + + $('#data_nicknames').replaceWith(createNicknameTableBody(json.nicknames)); + + $('#data_connections').replaceWith(createConnectionsTableBody(json.connections)); + + // Online activity + data = json.online_activity; + element = $(tab).find("#data_online_activity"); + + $(element).find("#data_playtime_30d").text(data.playtime_30d); + $(element).find("#data_playtime_7d").text(data.playtime_7d); + $(element).find("#data_active_playtime_30d").text(data.active_playtime_30d); + $(element).find("#data_active_playtime_7d").text(data.active_playtime_7d); + $(element).find("#data_afk_time_30d").text(data.afk_time_30d); + $(element).find("#data_afk_time_7d").text(data.afk_time_7d); + $(element).find("#data_average_session_length_30d").text(data.average_session_length_30d); + $(element).find("#data_average_session_length_7d").text(data.average_session_length_7d); + $(element).find("#data_session_count_30d").text(data.session_count_30d); + $(element).find("#data_session_count_7d").text(data.session_count_7d); + $(element).find("#data_player_kills_30d").text(data.player_kill_count_30d); + $(element).find("#data_player_kills_7d").text(data.player_kill_count_7d); + $(element).find("#data_mob_kills_30d").text(data.mob_kill_count_30d); + $(element).find("#data_mob_kills_7d").text(data.mob_kill_count_7d); + $(element).find("#data_deaths_30d").text(data.death_count_30d); + $(element).find("#data_deaths_7d").text(data.death_count_7d) +} + +function createNicknameTableBody(nicknames) { + var table = ''; + + if (nicknames.length === 0) { + table += 'No Nicknames--' + } + + for (var i = 0; i < nicknames.length; i++) { + var nickname = nicknames[i]; + table += '' + nickname.nickname + '' + + '' + nickname.server + '' + + '' + nickname.date + '' + } + + table += ''; + return table; +} + +function createConnectionsTableBody(connections) { + var table = ''; + + if (connections.length === 0) { + table += 'No Connection Data-' + } + + for (var i = 0; i < connections.length; i++) { + var connection = connections[i]; + table += '' + connection.geolocation + '' + + '' + connection.date + '' + } + + table += ''; + return table; +} \ No newline at end of file diff --git a/Plan/common/src/main/resources/assets/plan/web/player.html b/Plan/common/src/main/resources/assets/plan/web/player.html index 6942d2941..970ba577c 100644 --- a/Plan/common/src/main/resources/assets/plan/web/player.html +++ b/Plan/common/src/main/resources/assets/plan/web/player.html @@ -9,7 +9,7 @@ - Plan | Player name + Plan | ${playerName}
  • - @@ -127,11 +127,12 @@
    -
    +
    -

    Player name +

    ${playerName} · Player Overview

    @@ -143,70 +144,74 @@
    -
    +
    -
    - Player name
    +
    + ${playerName}
    -
    +
    -

    Offline

    -

    Operator

    -

    Times Kicked: 0

    +

    +

    +

    Times Kicked:

    + src="https://cravatar.eu/avatar/${playerName}/120.png">

    Player Kills98

    + class="float-right">

    Mob Kills22

    -

    Deaths8

    + class="float-right">

    +

    Deaths

    Total Playtime 8h 5m 56s

    + class="float-right" id="data_playtime">

    Total Active 3h 39m 23s

    + class="float-right" id="data_active_playtime">

    Total AFK 4h 26m 32s

    + class="float-right" id="data_afk_time">

    Sessions 98

    + class="float-right">

    Longest Session 4h 33m 6s

    + class="float-right" id="data_longest_session_lenght">

    Session Median 23s

    + class="float-right" id="data_session_median">

    - RegisteredMay 30 2017, 15:02 + Registered

    Activity Index 0 (Inactive)

    + class="float-right"> ()

    Favorite Server Server 1

    + class="float-right" id="data_favorite_server">

     

    Average Ping Unavailable

    + class="float-right" id="data_average_ping">

    Best Ping Unavailable

    + class="float-right" id="data_best_ping">

    Worst Ping Unavailable

    + class="float-right" id="data_worst_ping">

    Last SeenOct 28 2018, 10:05

    + class="float-right" id="data_last_seen">

    @@ -224,14 +229,7 @@ Last Seen - - - - Rsl1122 - Server 1 - Oct 8 2017, 10:51 - - +
    @@ -246,13 +244,7 @@ Last Connected - - - - Local Machine - Oct 28 2018, 18:35 - - +
    @@ -265,8 +257,7 @@
    Punchcard
    -
    - +
    @@ -275,7 +266,7 @@ class="fa fa-fw col-blue fa-book-open"> Online Activity
    - +
    @@ -284,43 +275,44 @@ - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + +
    Last 30 Days
    Playtime8h 53m 24s8h 5m 56s
    Active Playtime6h 53m 24s (79.32%)6h 53m 56s (73.25%)
    AFK Time1h 53m 24s (19.32%)53m 56s (13.25%)
    Average Session Length5m 56s3m 24s Average Session Length +
    Sessions3532
    Player Kills3532
    Mob Kills5432654
    Deaths6432
    @@ -330,11 +322,12 @@
    -
    +
    -

    Player name +

    ${playerName} · Sessions

     @@ -375,454 +368,7 @@ Length Most played World - - - Server 1 - Oct 28 2018, 10:05 - 3s - World (100%) - - - - - - - - Server 1 - Oct 28 2018, 9:05 - 45s - World (100%) - - - -
    -
    -

    Session EndedOct 28 2018, 10:05 -

    -

    Session - Length3s

    -

    AFK-

    -

    Server______T


    -

    Player - Kills0

    -

    Mob Kills0

    -

    Deaths0

    - - - - - - - - - - - - - - - -
    TimeKilledWith
    No Kills--
    -
    -
    -
    -
    - - Created with Highstock 7.0.3 - - - - - - - - - - - - - - - - - - - - - Click the slices to view used - GameMode - - - - - - - - - world - - - - - - - Highcharts.com - - - - - - - - - world: - - 3s (100.00%) - - - -
    -
    - - - - -
    -
    - - - +
    @@ -834,7 +380,7 @@ class="far fa-fw fa-clock col-teal"> World Playtime
    -
    +
    @@ -845,7 +391,8 @@
    -

    Player name +

    ${playerName} · PvP & PvE

    @@ -993,7 +540,8 @@
    -

    Player name +

    ${playerName} · Servers Overview

     @@ -1065,56 +613,57 @@
    -
    - + Created with Highstock 7.0.3 - + + fill="#ffffff" height="265" rx="0" ry="0" + width="426" x="0" y="0"> - - + + - - + + + text-anchor="middle" x="213" y="24"> + text-anchor="middle" x="213" y="24"> Click the slices to view used GameMode @@ -1138,72 +684,69 @@ + fill="none" height="29" rx="0" ry="0" + visibility="visible" width="70" x="0" + y="0"> - + world + data-z-index="3" + fill="#0099C6" height="12" + rx="6" ry="6" width="12" + x="2" y="4"> - Highcharts.com - - - - + + + + + x="8" y="20"> world: 3s (100.00%) @@ -1229,10 +772,8 @@ data: [['SURVIVAL', 0], ['SPECTATOR', 0], ['CREATIVE', 3947], ['ADVENTURE', 0]] }]; - Inspect Page @@ -1285,56 +826,57 @@
    -
    - + Created with Highstock 7.0.3 - + + fill="#ffffff" height="265" rx="0" ry="0" + width="426" x="0" y="0"> - - + + - - + + + text-anchor="middle" x="213" y="24"> + text-anchor="middle" x="213" y="24"> Click the slices to view used GameMode @@ -1358,72 +897,69 @@ + fill="none" height="29" rx="0" ry="0" + visibility="visible" width="70" x="0" + y="0"> - + world + data-z-index="3" + fill="#0099C6" height="12" + rx="6" ry="6" width="12" + x="2" y="4"> - Highcharts.com - - - - + + + + + x="8" y="20"> world: 3s (100.00%) @@ -1475,7 +1011,8 @@
    -

    Player Name +

    ${playerName} · Server 1 Plugins

     @@ -1506,12 +1043,13 @@
    -

    Player Name +

    ${playerName} · Server 2 Plugins

     - - - + + + Network page
    @@ -1537,12 +1075,13 @@
    -

    Player Name +

    ${playerName} · Server 3 Plugins

    - - - + + + Network page
    @@ -1655,7 +1194,8 @@ v3.0

    Plan Wiki, + rel="noopener noreferrer" target="_blank"> Plan + Wiki, Tutorials & Documentation Report Issues @@ -1689,7 +1229,8 @@ Bukkit BungeeCord + rel="noopener noreferrer" target="_blank"> + BungeeCord Sponge
    @@ -1706,7 +1247,8 @@
    -
    @@ -1758,8 +1298,62 @@ +