<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12791] CalendarServer/trunk/calendarserver/webadmin/work.xhtml</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12791">12791</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-03 21:56:16 -0800 (Mon, 03 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Works!</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminworkxhtml">CalendarServer/trunk/calendarserver/webadmin/work.xhtml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverwebadminworkxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/work.xhtml (12790 => 12791)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-03-04 03:31:01 UTC (rev 12790)
+++ CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-03-04 05:56:16 UTC (rev 12791)
</span><span class="lines">@@ -11,16 +11,28 @@
</span><span class="cx">
</span><span class="cx"> <style>
</span><span class="cx">
</span><del>- #work_queues_chart rect {
</del><ins>+ .bar {
</ins><span class="cx"> fill: steelblue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- #work_queues_chart text {
- fill: white;
</del><ins>+ .bar:hover {
+ fill: brown;
+ }
+
+ .axis text {
</ins><span class="cx"> font: 10px sans-serif;
</span><del>- text-anchor: end;
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+ .axis path, .axis line {
+ fill: none;
+ stroke: #000;
+ shape-rendering: crispEdges;
+ }
+
+ .x.axis path {
+ display: none;
+ }
+
</ins><span class="cx"> </style>
</span><span class="cx">
</span><span class="cx"> <script src="http://d3js.org/d3.v3.min.js"></script>
</span><span class="lines">@@ -83,58 +95,110 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var width = 960;
- var height = 500;
</del><ins>+ var outerWidth = 960;
+ var outerHeight = 500;
+ var margin = { top: 20, right: 30, bottom: 30, left: 160 };
</ins><span class="cx">
</span><del>- // var barHeight = 20;
</del><ins>+ var innerWidth = outerWidth - margin.left - margin.right;
+ var innerHeight = outerHeight - margin.top - margin.bottom;
</ins><span class="cx">
</span><ins>+ var xInset = 1;
+
</ins><span class="cx"> var xLocation =
</span><span class="cx"> d3.scale.linear()
</span><span class="cx"> .domain([0, d3.max(items, function(i) { return i.count; })])
</span><del>- .range([0, width]);
</del><ins>+ .range([xInset, innerWidth])
+ ;
</ins><span class="cx">
</span><span class="cx"> var yLocation =
</span><span class="cx"> d3.scale.ordinal()
</span><del>- .domain(items.map(function(i) { return i.name; }))
- .rangeRoundBands([0, height], 0.1);
</del><ins>+ .domain(items.map(function(i) { return i.description; }))
+ .rangeRoundBands([0, innerHeight], 0.1)
+ ;
</ins><span class="cx">
</span><ins>+ var xAxis =
+ d3.svg.axis()
+ .scale(xLocation)
+ .orient("bottom")
+ ;
+
+ var yAxis =
+ d3.svg.axis()
+ .scale(yLocation)
+ .orient("left")
+ ;
+
+ // Select chart
</ins><span class="cx"> var chart =
</span><span class="cx"> d3.select("#work_queues_chart")
</span><del>- .attr("width", width)
- .attr("height", height);
</del><ins>+ .attr("width", outerWidth)
+ .attr("height", outerHeight)
+ ;
</ins><span class="cx">
</span><ins>+ // Select inner
+ var inner =
+ chart.selectAll(".inner")
+ .data([0])
+ ;
+
+ // Enter inner selection
+ inner.enter().append("g");
+
+ // Update inner selection
+ inner
+ .attr("class", "inner")
+ .attr("transform", "translate(" + margin.left + "," + margin.top + ")")
+ ;
+
+ // Select, enter, update, exit x-axis
+ var x_axis = inner.selectAll(".x.axis").data([0]);
+ x_axis.enter().append("g");
+ x_axis
+ .attr("class", "x axis")
+ .attr("transform", "translate(" + xInset + "," + innerHeight + ")")
+ .call(xAxis)
+ ;
+ x_axis.exit().remove();
+
+ // Select, enter, update, exit y-axis
+ var y_axis = inner.selectAll(".y.axis").data([0]);
+ y_axis.enter().append("g");
+ y_axis
+ .attr("class", "y axis")
+ .call(yAxis)
+ ;
+ y_axis.exit().remove();
+
+ // Select bars
</ins><span class="cx"> var bars =
</span><del>- chart.selectAll("g")
</del><ins>+ inner.selectAll(".bar")
</ins><span class="cx"> .data(items);
</span><span class="cx">
</span><del>- // Enter selection
- bars.enter().append("g");
</del><ins>+ // Enter bars selection
+ bars.enter().append("rect");
</ins><span class="cx">
</span><del>- // Update selection
- bars.attr(
- "transform",
- function(i) { return "translate(0," + yLocation(i.name) + ")"; }
- );
-
- bars.append("rect")
</del><ins>+ // Update bars selection
+ bars
+ .attr("class", "bar")
</ins><span class="cx"> .attr("width", function(i) { return xLocation(i.count); })
</span><del>- .attr("height", yLocation.rangeBand());
</del><ins>+ .attr("height", yLocation.rangeBand())
+ .attr(
+ "transform",
+ function(i) { return "translate(" + xInset + "," + yLocation(i.description) + ")"; }
+ );
</ins><span class="cx">
</span><del>- bars.append("text")
- .attr("x", function(i) { return xLocation(i.count) - 3; })
- .attr("y", yLocation.rangeBand() / 2)
- .attr("dy", "0.35em")
- .text(function(i) { return i.count; });
</del><ins>+ // Exit bars selection
+ bars.exit().remove();
</ins><span class="cx">
</span><del>- // Exit selection
- bars.exit().remove();
</del><ins>+ // Exit inner selection
+ inner.exit().remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function initChart() {
</del><ins>+ function initChart() {
</ins><span class="cx"> data = {};
</span><span class="cx">
</span><span class="cx"> for (key in workTableDescriptions) {
</span><del>- data[key] = 0;
</del><ins>+ data[key] = 30;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> drawChart(data);
</span><span class="lines">@@ -148,7 +212,6 @@
</span><span class="cx"> function(e) { drawChart(JSON.parse(e.data)); },
</span><span class="cx"> false
</span><span class="cx"> );
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>