From 93a094251964b26e2d6d68403ceb6b395f8fe570 Mon Sep 17 00:00:00 2001 From: Sanders DeNardi Date: Mon, 15 Aug 2016 23:01:31 -0400 Subject: [PATCH 1/2] add custom border-radius setting, add baseClass setting --- gantt-chart-d3.js | 84 +++++++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 32 deletions(-) diff --git a/gantt-chart-d3.js b/gantt-chart-d3.js index c79dad3..f4e1b39 100644 --- a/gantt-chart-d3.js +++ b/gantt-chart-d3.js @@ -6,13 +6,15 @@ d3.gantt = function() { var FIT_TIME_DOMAIN_MODE = "fit"; var FIXED_TIME_DOMAIN_MODE = "fixed"; - + var margin = { top : 20, right : 40, bottom : 20, left : 150 }; + var radius = 5; + var baseClass = ''; var selector = 'body'; var timeDomainStart = d3.time.day.offset(new Date(),-3); var timeDomainEnd = d3.time.hour.offset(new Date(),+3); @@ -35,7 +37,7 @@ d3.gantt = function() { var x = d3.time.scale().domain([ timeDomainStart, timeDomainEnd ]).range([ 0, width ]).clamp(true); var y = d3.scale.ordinal().domain(taskTypes).rangeRoundBands([ 0, height - margin.top - margin.bottom ], .1); - + var xAxis = d3.svg.axis().scale(x).orient("bottom").tickFormat(d3.time.format(tickFormat)).tickSubdivide(true) .tickSize(8).tickPadding(8); @@ -67,12 +69,12 @@ d3.gantt = function() { yAxis = d3.svg.axis().scale(y).orient("left").tickSize(0); }; - + function gantt(tasks) { - + initTimeDomain(tasks); initAxis(); - + var svg = d3.select(selector) .append("svg") .attr("class", "chart") @@ -83,74 +85,78 @@ d3.gantt = function() { .attr("width", width + margin.left + margin.right) .attr("height", height + margin.top + margin.bottom) .attr("transform", "translate(" + margin.left + ", " + margin.top + ")"); - - svg.selectAll(".chart") + + var selectors = svg.selectAll(".chart") .data(tasks, keyFunction).enter() .append("rect") - .attr("rx", 5) - .attr("ry", 5) - .attr("class", function(d){ + .attr("rx", radius) + .attr("ry", radius) + .attr("class", function(d){ if(taskStatus[d.status] == null){ return "bar";} return taskStatus[d.status]; - }) + }) .attr("y", 0) .attr("transform", rectTransform) .attr("height", function(d) { return y.rangeBand(); }) - .attr("width", function(d) { - return Math.max(1,(x(d.endDate) - x(d.startDate))); + .attr("width", function(d) { + return Math.max(1,(x(d.endDate) - x(d.startDate))); }); - - + + if (baseClass) { selectors.classed(baseClass, true); } + svg.append("g") .attr("class", "x axis") .attr("transform", "translate(0, " + (height - margin.top - margin.bottom) + ")") .transition() .call(xAxis); - + svg.append("g").attr("class", "y axis").transition().call(yAxis); - + return gantt; }; - + gantt.redraw = function(tasks) { initTimeDomain(tasks); initAxis(); - + var svg = d3.select(".chart"); var ganttChartGroup = svg.select(".gantt-chart"); var rect = ganttChartGroup.selectAll("rect").data(tasks, keyFunction); - - rect.enter() + + var newSelectors = rect.enter() .insert("rect",":first-child") - .attr("rx", 5) - .attr("ry", 5) - .attr("class", function(d){ + .attr("rx", radius) + .attr("ry", radius) + .attr("class", function(d){ if(taskStatus[d.status] == null){ return "bar";} return taskStatus[d.status]; - }) + }) .transition() .attr("y", 0) .attr("transform", rectTransform) .attr("height", function(d) { return y.rangeBand(); }) - .attr("width", function(d) { - return Math.max(1,(x(d.endDate) - x(d.startDate))); + .attr("width", function(d) { + return Math.max(1,(x(d.endDate) - x(d.startDate))); }); + if (baseClass) { selectors.classed(baseClass, true); } + + rect.transition() .attr("transform", rectTransform) .attr("height", function(d) { return y.rangeBand(); }) - .attr("width", function(d) { - return Math.max(1,(x(d.endDate) - x(d.startDate))); + .attr("width", function(d) { + return Math.max(1,(x(d.endDate) - x(d.startDate))); }); - + rect.exit().remove(); svg.select(".x").transition().call(xAxis); svg.select(".y").transition().call(yAxis); - + return gantt; }; @@ -187,7 +193,7 @@ d3.gantt = function() { taskTypes = value; return gantt; }; - + gantt.taskStatus = function(value) { if (!arguments.length) return taskStatus; @@ -223,5 +229,19 @@ d3.gantt = function() { return gantt; }; + gantt.radius = function(value) { + if (!arguments.length) + return radius; + radius = value; + return gantt; + }; + + gantt.baseClass = function(value) { + if (!arguments.length) + return baseClass; + baseClass = value; + return gantt; + }; + return gantt; }; From 0883571fdebf572a57086f5ed6e5a7192e10929c Mon Sep 17 00:00:00 2001 From: Sanders DeNardi Date: Mon, 15 Aug 2016 23:40:48 -0400 Subject: [PATCH 2/2] allow custom key function --- gantt-chart-d3.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gantt-chart-d3.js b/gantt-chart-d3.js index f4e1b39..ab7da0d 100644 --- a/gantt-chart-d3.js +++ b/gantt-chart-d3.js @@ -243,5 +243,12 @@ d3.gantt = function() { return gantt; }; + gantt.keyFunction = function(value) { + if (!arguments.length) + return keyFunction + keyFunction = value; + return gantt; + } + return gantt; };