stles added + d3 column added

This commit is contained in:
2017-03-16 11:18:46 +05:30
parent 984fab4703
commit a9b89a6f96
5 changed files with 139 additions and 27 deletions
+4
View File
@@ -52,12 +52,16 @@
</div> </div>
</div> </div>
<div class="chart-container"> <div class="chart-container">
<div class="chart"></div> <div class="chart"></div>
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript" src="lib/angular.min.js"></script> <script type="text/javascript" src="lib/angular.min.js"></script>
<script type="text/javascript" src="js/ng-drag.js"></script> <script type="text/javascript" src="js/ng-drag.js"></script>
<script type="text/javascript" src="lib/d3.v4.min.js"></script>
<script type="text/javascript" src="js/draw-chart.js"></script>
<script type="text/javascript" src="js/app.js"></script> <script type="text/javascript" src="js/app.js"></script>
</body> </body>
</html> </html>
+36 -24
View File
@@ -3,37 +3,37 @@ var app = angular.module("chart-builder",["ngDrag"]);
app.value("allData",{ app.value("allData",{
"values":{ "values":{
"Brand": { "Brand": {
"Nike": { "Sales":{
"Sales":5000, "Adidas": 3500,
"Orders":6, "Reebok": 4000,
"Revenue":800 "Nike": 7999
}, },
"Adidas": { "Orders":{
"Sales":4500, "Adidas": 680,
"Orders":3, "Reebok": 700,
"Revenue":753 "Nike": 500
}, },
"Reebok": { "Revenue":{
"Sales":7120, "Adidas": 4000,
"Orders":12, "Reebok": 12000,
"Revenue":1200 "Nike": 8000
} }
}, },
"Category": { "Category": {
"Laptop": { "Sales":{
"Sales":50000, "Laptop": 50000,
"Orders":600, "Mobile": 40000,
"Revenue":8000 "E-reader": 8000
}, },
"Mobile": { "Orders":{
"Sales":40000, "Laptop": 600,
"Orders":300, "Mobile": 300,
"Revenue":12000 "E-reader": 50
}, },
"E-reader": { "Revenue":{
"Sales":8000, "Laptop": 8000,
"Orders":50, "Mobile": 12000,
"Revenue":800 "E-reader": 800
} }
} }
}, },
@@ -128,4 +128,16 @@ app.controller("mainController", ["allData","$scope",function (allData,$scope) {
} }
$scope.$watchGroup(["data.values","data.chosenDimension","data.chosenMeasure"],function(){
if ($scope.data.chosenMeasure && $scope.data.chosenDimension){
var tmpData = $scope.data.values[$scope.data.chosenDimension][$scope.data.chosenMeasure];
var chartData = [];
var keys = Object.keys(tmpData);
for (var i = keys.length - 1; i >= 0; i--) {
chartData.push({"x":keys[i],"y":tmpData[keys[i]]});
}
drawChart(chartData);
}
});
}]); }]);
+46
View File
@@ -0,0 +1,46 @@
function drawChart(data)
{
var eleChart = d3.select(".chart").html(""),
eleChartBbox = eleChart.node().getBoundingClientRect(),
margin = {top: 20, right: 20, bottom: 30, left: 40},
width = +eleChartBbox.width - margin.left - margin.right,
height = +eleChartBbox.height - margin.top - margin.bottom;
var svg = eleChart.append("svg").attr("width",width).attr("height",height);
var x = d3.scaleBand().rangeRound([0, width]).padding(0.1),
y = d3.scaleLinear().rangeRound([height, 0]);
var g = svg.append("g")
.attr("transform", "translate(" + margin.left + "," + margin.top + ")");
x.domain(data.map(function(d) { return d.x; }));
y.domain([0, d3.max(data, function(d) { return d.y; })]);
g.append("g")
.attr("class", "axis axis-x")
.attr("transform", "translate(0," + height + ")")
.call(d3.axisBottom(x));
g.append("g")
.attr("class", "axis axis-y")
.call(d3.axisLeft(y).ticks(10, "%"))
.append("text")
.attr("transform", "rotate(-90)")
.attr("y", 6)
.attr("dy", "0.71em")
.attr("text-anchor", "end")
.text("y");
g.selectAll(".bar")
.data(data)
.enter().append("rect")
.attr("class", "bar")
.attr("x", function(d) { return x(d.x); })
.attr("y", function(d) { return y(d.y); })
.attr("width", x.bandwidth())
.attr("height", function(d) { return height - y(d.y); });
}
+8
View File
File diff suppressed because one or more lines are too long
+43 -1
View File
@@ -53,7 +53,7 @@ body
.chooser>*,.chosen>* .chooser>*,.chosen>*
{ {
padding: 0 .5em; padding: .5em;
} }
.main-content .main-content
@@ -93,6 +93,12 @@ body
width: 80%; width: 80%;
height: 80%; height: 80%;
}
.chart
{
width: 100%;
height: 100%;
background-color: lightgray; background-color: lightgray;
} }
@@ -104,3 +110,39 @@ ul.unstyled-list
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
.dim-header,.measure-header{
/*border: 2px solid black;*/
text-decoration: underline;
padding-bottom: 1em;
}
.chooser-dim,.chooser-measure,.chosen-dim,.chosen-measure
{
border: 2px solid black;
}
.chooser-measure{
border-top: none;
}
.chosen-dim,.chosen-measure
{
border-left: none;
}
.chosen-measure
{
border-top: none;
}
/* d3 styles*/
.bar {
fill: steelblue;
}
.bar:hover {
fill: brown;
}
.axis--x path {
display: none;
}