]> git.rm.cloudns.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: de2c743)
Initial player damage view.
authorAnt Zucaro <azucaro@gmail.com>
Thu, 5 Sep 2013 18:52:14 +0000 (14:52 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Thu, 5 Sep 2013 18:52:14 +0000 (14:52 -0400)
xonstat/static/js/weaponCharts.js [new file with mode: 0644] patch | blob
xonstat/templates/nvd3_damage.mako patch | blob | history

diff --git a/xonstat/static/js/weaponCharts.js b/xonstat/static/js/weaponCharts.js
new file mode 100644 (file)
index 0000000..9977c4a
--- /dev/null
+++ b/xonstat/static/js/weaponCharts.js
@@ -0,0 +1,50 @@
+    var drawDamageChart = function(data) {
+      // the chart should fill the "damageChart" div
+      var width = document.getElementById("damageChart").offsetWidth;
+
+      // transform the dataset into something nvd3 can use
+      var transformedData = d3.nest()
+        .key(function(d) { return d.weapon_cd; }).entries(data.weapon_stats);
+
+      // transform games list into a map such that games[game_id] = linear sequence
+      var games = {};
+      data.games.forEach(function(v,i){ games[v] = i; });
+
+      // margin model
+      var margin = {top: 20, right: 30, bottom: 30, left: 40},
+          height = 500 - margin.top - margin.bottom;
+
+      width -= margin.left - margin.right;
+
+      // colors
+      var colors = d3.scale.category20();
+      keyColor = function(d, i) {return colors(d.key)};
+
+      var chart;
+      nv.addGraph(function() {
+        chart = nv.models.stackedAreaChart()
+          .margin(margin)
+          .width(width)
+          .height(height)
+          .x(function(d) { return games[d.game_id] })
+          .y(function(d) { return d.actual })
+          .color(keyColor);
+
+        chart.xAxis
+          .axisLabel("Game ID")
+          .showMaxMin(false)
+          .ticks(5)
+          .tickFormat(function(d) { return data.games[d]; });
+
+        chart.yAxis
+          .tickFormat(d3.format(',02d'));
+
+        d3.select('#damageChartSVG')
+          .datum(transformedData)
+          .transition().duration(500).call(chart);
+
+        nv.utils.windowResize(chart.update);
+
+        return chart;
+      });
+    }
diff --git a/xonstat/templates/nvd3_damage.mako b/xonstat/templates/nvd3_damage.mako
index 6ec21ab709dcb2f28d243d30f67a9033f905b904..363cfc490c9820e56a94aba16bc9a3db8025d274 100644 (file)
--- a/xonstat/templates/nvd3_damage.mako
+++ b/xonstat/templates/nvd3_damage.mako
@@ -1,10 +1,19 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
+<%inherit file="base.mako"/>
+<%namespace name="nav" file="nav.mako" />
 
+<%block name="navigation">
+${nav.nav('players')}
+</%block>
+
+<%block name="title">
+Player Damage
+</%block>
+
+<%block name="css">
+${parent.css()}
 <link href="/static/css/nv.d3.css" rel="stylesheet" type="text/css">
 
 <style>
-
 body {
   overflow-y:scroll;
 }
@@ -13,75 +22,33 @@ text {
   font: 12px sans-serif;
 }
 
-#chart1, #chart2 {
+#damageChartSVG {
   height: 500px;
 }
-
 </style>
-<body>
-
-  <div id="damageGraph">
-    <svg id="chart1"></svg>
-  </div>
+</%block>
 
+<%block name="js">
+${parent.js()}
 <script src="/static/js/d3.v3.js"></script>
 <script src="/static/js/nv.d3.min.js"></script>
+<script src="/static/js/weaponCharts.js"></script>
 <script>
-    var doDamageGraph = function(data){
-        // the chart should fill the "damageGraph" div
-        var width = document.getElementById("damageGraph").offsetWidth;
-
-        // transform the dataset into something nvd3 can use
-        var transformedData = d3.nest()
-            .key(function(d) { return d.weapon_cd; }).entries(data.weapon_stats);
-
-        // transform games list into a map such that games[game_id] = linear sequence
-        var games = {};
-        data.games.forEach(function(v,i){ games[v] = i; });
-
-        // margin model
-        var margin = {top: 20, right: 30, bottom: 30, left: 40},
-            height = 500 - margin.top - margin.bottom;
-
-        width -= margin.left - margin.right;
-
-        // colors
-        var colors = d3.scale.category20();
-        keyColor = function(d, i) {return colors(d.key)};
-
-        var chart;
-        nv.addGraph(function() {
-          chart = nv.models.stackedAreaChart()
-                        .margin(margin)
-                        .width(width)
-                        .height(height)
-                        .x(function(d) { return games[d.game_id] })
-                        .y(function(d) { return d.actual })
-                        .color(keyColor);
-
-          chart.xAxis
-              .axisLabel("Game ID")
-              .showMaxMin(false)
-              .ticks(5)
-              .tickFormat(function(d) { return data.games[d]; });
-
-          chart.yAxis
-              .tickFormat(d3.format(',02d'));
-
-          d3.select('#chart1')
-            .datum(transformedData)
-              .transition().duration(500).call(chart);
-
-          nv.utils.windowResize(chart.update);
-
-          return chart;
-        });
-
-    }
-
     % if game_type_cd is not None:
-        d3.json("${request.route_url('player_weaponstats_data_json', id=player_id, _query={'limit':limit, 'game_type':game_type_cd})}", doDamageGraph);
+        d3.json("${request.route_url('player_weaponstats_data_json', id=player_id, _query={'limit':limit, 'game_type':game_type_cd})}", drawDamageChart);
     % else:
-        d3.json("${request.route_url('player_weaponstats_data_json', id=player_id, _query={'limit':limit})}", doDamageGraph);
+        d3.json("${request.route_url('player_weaponstats_data_json', id=player_id, _query={'limit':limit})}", drawDamageChart);
     % endif
 </script>
+
+</%block>
+
+<div class="row">
+  <div class="span12">
+
+    <div id="damageChart">
+      <svg id="damageChartSVG"></svg>
+    </div>
+
+  </div>
+</div>