From fd0cdfd843dd92d2a883b790d1335ee2c92e102e Mon Sep 17 00:00:00 2001 From: rylon Date: Fri, 20 Jun 2014 16:31:46 +0200 Subject: [PATCH] online graphic --- mojotrollz/api/api_mojotrollz.php | 7 +++++- mojotrollz/api/realm/realm.php | 4 +++- mojotrollz/api/world/world.php | 4 +++- mojotrollz/autoload.inc.php | 5 ++--- mojotrollz/dbd/autoload.inc.php | 1 + mojotrollz/dbd/qq/ONLINE_STATS.php | 18 +++++++++++++++ mojotrollz/log/WOW_STATS_OFLINE.php | 2 ++ mojotrollz/log/WOW_STATS_ONLINE.php | 2 ++ mojotrollz/log/WOW_STATS_PLAYER.php | 6 +++++ mojotrollz/log/autoload.inc.php | 2 ++ mojotrollz/page/default_page/default_page.php | 3 +++ .../page/default_page/default_page_login.tpl | 3 ++- .../page/default_page/js/onlinegraphic.js | 22 +++++++++++++++++++ mojotrollz/page/default_page/js/wizard.js | 1 + 14 files changed, 73 insertions(+), 7 deletions(-) create mode 100644 mojotrollz/dbd/qq/ONLINE_STATS.php create mode 100644 mojotrollz/log/WOW_STATS_OFLINE.php create mode 100644 mojotrollz/log/WOW_STATS_ONLINE.php create mode 100644 mojotrollz/log/WOW_STATS_PLAYER.php create mode 100644 mojotrollz/log/autoload.inc.php create mode 100644 mojotrollz/page/default_page/js/onlinegraphic.js diff --git a/mojotrollz/api/api_mojotrollz.php b/mojotrollz/api/api_mojotrollz.php index 4f25d0c..9f28360 100644 --- a/mojotrollz/api/api_mojotrollz.php +++ b/mojotrollz/api/api_mojotrollz.php @@ -1,2 +1,7 @@ &1');} + $res = shell_exec('/home/mojotrolls/mojo_zero/realm status 2>&1'); + $res == '1' ? new WOW_STATS_ONLINE() : new WOW_STATS_OFLINE(); + return $res == '1' ? 'on' : 'off';} } \ No newline at end of file diff --git a/mojotrollz/api/world/world.php b/mojotrollz/api/world/world.php index 892bfd7..684d0a2 100644 --- a/mojotrollz/api/world/world.php +++ b/mojotrollz/api/world/world.php @@ -1,5 +1,7 @@ &1');} + $res = shell_exec('/home/mojotrolls/mojo_zero/world status 2>&1'); + $res == '1' ? new WOW_STATS_ONLINE() : new WOW_STATS_OFLINE(); + return $res == '1' ? 'on' : 'off';} } diff --git a/mojotrollz/autoload.inc.php b/mojotrollz/autoload.inc.php index d7f0970..3ce5a8f 100644 --- a/mojotrollz/autoload.inc.php +++ b/mojotrollz/autoload.inc.php @@ -1,9 +1,8 @@ registerFolder(dirname(__FILE__).'/tbl/definitions/','DBD\DEFINITIONS'); //$autoload->registerFolder(dirname(__FILE__).'/tbl/data/','DBD\DATA'); //$autoload->registerFolder(dirname(__FILE__).'/tbl/data_processed/','DBD\DATA_PROCESSED'); \ No newline at end of file diff --git a/mojotrollz/dbd/qq/ONLINE_STATS.php b/mojotrollz/dbd/qq/ONLINE_STATS.php new file mode 100644 index 0000000..463ca88 --- /dev/null +++ b/mojotrollz/dbd/qq/ONLINE_STATS.php @@ -0,0 +1,18 @@ +'. ''. ''. + ''. + ''. ''. + ''. ''. ''; } diff --git a/mojotrollz/page/default_page/default_page_login.tpl b/mojotrollz/page/default_page/default_page_login.tpl index 1bfdd11..d3073cd 100644 --- a/mojotrollz/page/default_page/default_page_login.tpl +++ b/mojotrollz/page/default_page/default_page_login.tpl @@ -27,4 +27,5 @@ type="submit" id="login_submit">${basic_login} - \ No newline at end of file + +
\ No newline at end of file diff --git a/mojotrollz/page/default_page/js/onlinegraphic.js b/mojotrollz/page/default_page/js/onlinegraphic.js new file mode 100644 index 0000000..78952b1 --- /dev/null +++ b/mojotrollz/page/default_page/js/onlinegraphic.js @@ -0,0 +1,22 @@ +function load_visualisation(id){ + $.getJSON('./api.php?call=stats',function(json){ + if(!json || json.status != true || !json.result){ + return; + } + json = json.result; + var data = new google.visualization.DataTable(); + first = true; + $.each(json[0], function(key, value){ + if(first){ + data.addColumn('datetime',key); + first = false; + } else { + data.addColumn('number',key); + } + }); + $.each(json, function(key, value){first = true; data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [(v == null || parseFloat(v) <= 0) ? 0 : parseFloat(v)];}}));}); + + var options = {title: id, backgroundColor: 'darkslategrey', aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{left:20,top:40}, interpolateNulls: false, height: "200"}; + new google.visualization.LineChart(document.getElementById(id)).draw(data, options); + }); +} \ No newline at end of file diff --git a/mojotrollz/page/default_page/js/wizard.js b/mojotrollz/page/default_page/js/wizard.js index d5b6602..2aabff2 100644 --- a/mojotrollz/page/default_page/js/wizard.js +++ b/mojotrollz/page/default_page/js/wizard.js @@ -22,6 +22,7 @@ $(document).ready(function() { $('#start a').click(function() { load_wizard_details();}); + load_visualisation('onlinestats'); }); function load_wizard_details(){