#931 Updating code to align witn new code standard

This commit is contained in:
knsv
2019-09-12 12:57:36 -07:00
parent a2e3f3d900
commit cf05a8d8fa
4 changed files with 746 additions and 686 deletions

View File

@@ -1,9 +1,9 @@
import * as d3 from 'd3'
import * as d3 from 'd3';
import { parser } from './parser/gantt'
import ganttDb from './ganttDb'
import { parser } from './parser/gantt';
import ganttDb from './ganttDb';
parser.yy = ganttDb
parser.yy = ganttDb;
const conf = {
titleTopMargin: 25,
@@ -15,287 +15,316 @@ const conf = {
gridLineStartPadding: 35,
fontSize: 11,
fontFamily: '"Open-Sans", "sans-serif"'
}
export const setConf = function (cnf) {
const keys = Object.keys(cnf)
};
export const setConf = function(cnf) {
const keys = Object.keys(cnf);
keys.forEach(function (key) {
conf[key] = cnf[key]
})
}
let w
export const draw = function (text, id) {
parser.yy.clear()
parser.parse(text)
keys.forEach(function(key) {
conf[key] = cnf[key];
});
};
let w;
export const draw = function(text, id) {
parser.yy.clear();
parser.parse(text);
const elem = document.getElementById(id)
w = elem.parentElement.offsetWidth
const elem = document.getElementById(id);
w = elem.parentElement.offsetWidth;
if (typeof w === 'undefined') {
w = 1200
w = 1200;
}
if (typeof conf.useWidth !== 'undefined') {
w = conf.useWidth
w = conf.useWidth;
}
const taskArray = parser.yy.getTasks()
const taskArray = parser.yy.getTasks();
// Set height based on number of tasks
const h = taskArray.length * (conf.barHeight + conf.barGap) + 2 * conf.topPadding
const h = taskArray.length * (conf.barHeight + conf.barGap) + 2 * conf.topPadding;
elem.setAttribute('height', '100%')
elem.setAttribute('height', '100%');
// Set viewBox
elem.setAttribute('viewBox', '0 0 ' + w + ' ' + h)
const svg = d3.select(`[id="${id}"]`)
elem.setAttribute('viewBox', '0 0 ' + w + ' ' + h);
const svg = d3.select(`[id="${id}"]`);
// Set timescale
const timeScale = d3.scaleTime()
.domain([d3.min(taskArray, function (d) {
return d.startTime
}),
d3.max(taskArray, function (d) {
return d.endTime
})])
.rangeRound([0, w - conf.leftPadding - conf.rightPadding])
const timeScale = d3
.scaleTime()
.domain([
d3.min(taskArray, function(d) {
return d.startTime;
}),
d3.max(taskArray, function(d) {
return d.endTime;
})
])
.rangeRound([0, w - conf.leftPadding - conf.rightPadding]);
let categories = []
let categories = [];
for (let i = 0; i < taskArray.length; i++) {
categories.push(taskArray[i].type)
categories.push(taskArray[i].type);
}
const catsUnfiltered = categories // for vert labels
const catsUnfiltered = categories; // for vert labels
categories = checkUnique(categories)
categories = checkUnique(categories);
makeGant(taskArray, w, h)
makeGant(taskArray, w, h);
if (typeof conf.useWidth !== 'undefined') {
elem.setAttribute('width', w)
elem.setAttribute('width', w);
}
svg.append('text')
svg
.append('text')
.text(parser.yy.getTitle())
.attr('x', w / 2)
.attr('y', conf.titleTopMargin)
.attr('class', 'titleText')
.attr('class', 'titleText');
function makeGant (tasks, pageWidth, pageHeight) {
const barHeight = conf.barHeight
const gap = barHeight + conf.barGap
const topPadding = conf.topPadding
const leftPadding = conf.leftPadding
function makeGant(tasks, pageWidth, pageHeight) {
const barHeight = conf.barHeight;
const gap = barHeight + conf.barGap;
const topPadding = conf.topPadding;
const leftPadding = conf.leftPadding;
const colorScale = d3.scaleLinear()
const colorScale = d3
.scaleLinear()
.domain([0, categories.length])
.range(['#00B9FA', '#F95002'])
.interpolate(d3.interpolateHcl)
.interpolate(d3.interpolateHcl);
makeGrid(leftPadding, topPadding, pageWidth, pageHeight)
drawRects(tasks, gap, topPadding, leftPadding, barHeight, colorScale, pageWidth, pageHeight)
vertLabels(gap, topPadding, leftPadding, barHeight, colorScale)
drawToday(leftPadding, topPadding, pageWidth, pageHeight)
makeGrid(leftPadding, topPadding, pageWidth, pageHeight);
drawRects(tasks, gap, topPadding, leftPadding, barHeight, colorScale, pageWidth, pageHeight);
vertLabels(gap, topPadding, leftPadding, barHeight, colorScale);
drawToday(leftPadding, topPadding, pageWidth, pageHeight);
}
function drawRects (theArray, theGap, theTopPad, theSidePad, theBarHeight, theColorScale, w, h) {
function drawRects(theArray, theGap, theTopPad, theSidePad, theBarHeight, theColorScale, w, h) {
// Draw background rects covering the entire width of the graph, these form the section rows.
svg.append('g')
svg
.append('g')
.selectAll('rect')
.data(theArray)
.enter()
.append('rect')
.attr('x', 0)
.attr('y', function (d, i) {
return i * theGap + theTopPad - 2
.attr('y', function(d, i) {
return i * theGap + theTopPad - 2;
})
.attr('width', function () {
return w - conf.rightPadding / 2
.attr('width', function() {
return w - conf.rightPadding / 2;
})
.attr('height', theGap)
.attr('class', function (d) {
.attr('class', function(d) {
for (let i = 0; i < categories.length; i++) {
if (d.type === categories[i]) {
return 'section section' + (i % conf.numberSectionStyles)
return 'section section' + (i % conf.numberSectionStyles);
}
}
return 'section section0'
})
return 'section section0';
});
// Draw the rects representing the tasks
const rectangles = svg.append('g')
const rectangles = svg
.append('g')
.selectAll('rect')
.data(theArray)
.enter()
.enter();
rectangles.append('rect')
.attr('id', function (d) { return d.id })
rectangles
.append('rect')
.attr('id', function(d) {
return d.id;
})
.attr('rx', 3)
.attr('ry', 3)
.attr('x', function (d) {
.attr('x', function(d) {
if (d.milestone) {
return timeScale(d.startTime) + theSidePad + (0.5 * (timeScale(d.endTime) - timeScale(d.startTime))) - (0.5 * theBarHeight)
return (
timeScale(d.startTime) +
theSidePad +
0.5 * (timeScale(d.endTime) - timeScale(d.startTime)) -
0.5 * theBarHeight
);
}
return timeScale(d.startTime) + theSidePad
return timeScale(d.startTime) + theSidePad;
})
.attr('y', function (d, i) {
return i * theGap + theTopPad
.attr('y', function(d, i) {
return i * theGap + theTopPad;
})
.attr('width', function (d) {
.attr('width', function(d) {
if (d.milestone) {
return theBarHeight
return theBarHeight;
}
return (timeScale(d.renderEndTime || d.endTime) - timeScale(d.startTime))
return timeScale(d.renderEndTime || d.endTime) - timeScale(d.startTime);
})
.attr('height', theBarHeight)
.attr('transform-origin', function (d, i) {
return (timeScale(d.startTime) + theSidePad + 0.5 * (timeScale(d.endTime) - timeScale(d.startTime))).toString() + 'px ' + (i * theGap + theTopPad + 0.5 * theBarHeight).toString() + 'px'
.attr('transform-origin', function(d, i) {
return (
(
timeScale(d.startTime) +
theSidePad +
0.5 * (timeScale(d.endTime) - timeScale(d.startTime))
).toString() +
'px ' +
(i * theGap + theTopPad + 0.5 * theBarHeight).toString() +
'px'
);
})
.attr('class', function (d) {
const res = 'task'
.attr('class', function(d) {
const res = 'task';
let classStr = ''
let classStr = '';
if (d.classes.length > 0) {
classStr = d.classes.join(' ')
classStr = d.classes.join(' ');
}
let secNum = 0
let secNum = 0;
for (let i = 0; i < categories.length; i++) {
if (d.type === categories[i]) {
secNum = (i % conf.numberSectionStyles)
secNum = i % conf.numberSectionStyles;
}
}
let taskClass = ''
let taskClass = '';
if (d.active) {
if (d.crit) {
taskClass += ' activeCrit'
taskClass += ' activeCrit';
} else {
taskClass = ' active'
taskClass = ' active';
}
} else if (d.done) {
if (d.crit) {
taskClass = ' doneCrit'
taskClass = ' doneCrit';
} else {
taskClass = ' done'
taskClass = ' done';
}
} else {
if (d.crit) {
taskClass += ' crit'
taskClass += ' crit';
}
}
if (taskClass.length === 0) {
taskClass = ' task'
taskClass = ' task';
}
if (d.milestone) {
taskClass = ' milestone ' + taskClass
taskClass = ' milestone ' + taskClass;
}
taskClass += secNum
taskClass += secNum;
taskClass += ' ' + classStr
taskClass += ' ' + classStr;
return res + taskClass
})
return res + taskClass;
});
// Append task labels
rectangles.append('text')
.attr('id', function (d) { return d.id + '-text' })
.text(function (d) {
return d.task
rectangles
.append('text')
.attr('id', function(d) {
return d.id + '-text';
})
.text(function(d) {
return d.task;
})
.attr('font-size', conf.fontSize)
.attr('x', function (d) {
let startX = timeScale(d.startTime)
let endX = timeScale(d.renderEndTime || d.endTime)
.attr('x', function(d) {
let startX = timeScale(d.startTime);
let endX = timeScale(d.renderEndTime || d.endTime);
if (d.milestone) {
startX += (0.5 * (timeScale(d.endTime) - timeScale(d.startTime))) - (0.5 * theBarHeight)
startX += 0.5 * (timeScale(d.endTime) - timeScale(d.startTime)) - 0.5 * theBarHeight;
}
if (d.milestone) {
endX = startX + theBarHeight
endX = startX + theBarHeight;
}
const textWidth = this.getBBox().width
const textWidth = this.getBBox().width;
// Check id text width > width of rectangle
if (textWidth > (endX - startX)) {
if (textWidth > endX - startX) {
if (endX + textWidth + 1.5 * conf.leftPadding > w) {
return startX + theSidePad - 5
return startX + theSidePad - 5;
} else {
return endX + theSidePad + 5
return endX + theSidePad + 5;
}
} else {
return (endX - startX) / 2 + startX + theSidePad
return (endX - startX) / 2 + startX + theSidePad;
}
})
.attr('y', function (d, i) {
return i * theGap + (conf.barHeight / 2) + (conf.fontSize / 2 - 2) + theTopPad
.attr('y', function(d, i) {
return i * theGap + conf.barHeight / 2 + (conf.fontSize / 2 - 2) + theTopPad;
})
.attr('text-height', theBarHeight)
.attr('class', function (d) {
const startX = timeScale(d.startTime)
let endX = timeScale(d.endTime)
.attr('class', function(d) {
const startX = timeScale(d.startTime);
let endX = timeScale(d.endTime);
if (d.milestone) {
endX = startX + theBarHeight
endX = startX + theBarHeight;
}
const textWidth = this.getBBox().width
const textWidth = this.getBBox().width;
let classStr = ''
let classStr = '';
if (d.classes.length > 0) {
classStr = d.classes.join(' ')
classStr = d.classes.join(' ');
}
let secNum = 0
let secNum = 0;
for (let i = 0; i < categories.length; i++) {
if (d.type === categories[i]) {
secNum = (i % conf.numberSectionStyles)
secNum = i % conf.numberSectionStyles;
}
}
let taskType = ''
let taskType = '';
if (d.active) {
if (d.crit) {
taskType = 'activeCritText' + secNum
taskType = 'activeCritText' + secNum;
} else {
taskType = 'activeText' + secNum
taskType = 'activeText' + secNum;
}
}
if (d.done) {
if (d.crit) {
taskType = taskType + ' doneCritText' + secNum
taskType = taskType + ' doneCritText' + secNum;
} else {
taskType = taskType + ' doneText' + secNum
taskType = taskType + ' doneText' + secNum;
}
} else {
if (d.crit) {
taskType = taskType + ' critText' + secNum
taskType = taskType + ' critText' + secNum;
}
}
if (d.milestone) {
taskType += ' milestoneText'
taskType += ' milestoneText';
}
// Check id text width > width of rectangle
if (textWidth > (endX - startX)) {
if (textWidth > endX - startX) {
if (endX + textWidth + 1.5 * conf.leftPadding > w) {
return classStr + ' taskTextOutsideLeft taskTextOutside' + secNum + ' ' + taskType
return classStr + ' taskTextOutsideLeft taskTextOutside' + secNum + ' ' + taskType;
} else {
return classStr + ' taskTextOutsideRight taskTextOutside' + secNum + ' ' + taskType
return classStr + ' taskTextOutsideRight taskTextOutside' + secNum + ' ' + taskType;
}
} else {
return classStr + ' taskText taskText' + secNum + ' ' + taskType
return classStr + ' taskText taskText' + secNum + ' ' + taskType;
}
})
});
}
function makeGrid (theSidePad, theTopPad, w, h) {
let xAxis = d3.axisBottom(timeScale)
function makeGrid(theSidePad, theTopPad, w, h) {
let xAxis = d3
.axisBottom(timeScale)
.tickSize(-h + theTopPad + conf.gridLineStartPadding)
.tickFormat(d3.timeFormat(parser.yy.getAxisFormat() || conf.axisFormat || '%Y-%m-%d'))
.tickFormat(d3.timeFormat(parser.yy.getAxisFormat() || conf.axisFormat || '%Y-%m-%d'));
svg.append('g')
svg
.append('g')
.attr('class', 'grid')
.attr('transform', 'translate(' + theSidePad + ', ' + (h - 50) + ')')
.call(xAxis)
@@ -304,90 +333,92 @@ export const draw = function (text, id) {
.attr('fill', '#000')
.attr('stroke', 'none')
.attr('font-size', 10)
.attr('dy', '1em')
.attr('dy', '1em');
}
function vertLabels (theGap, theTopPad) {
const numOccurances = []
let prevGap = 0
function vertLabels(theGap, theTopPad) {
const numOccurances = [];
let prevGap = 0;
for (let i = 0; i < categories.length; i++) {
numOccurances[i] = [categories[i], getCount(categories[i], catsUnfiltered)]
numOccurances[i] = [categories[i], getCount(categories[i], catsUnfiltered)];
}
svg.append('g') // without doing this, impossible to put grid lines behind text
svg
.append('g') // without doing this, impossible to put grid lines behind text
.selectAll('text')
.data(numOccurances)
.enter()
.append('text')
.text(function (d) {
return d[0]
.text(function(d) {
return d[0];
})
.attr('x', 10)
.attr('y', function (d, i) {
.attr('y', function(d, i) {
if (i > 0) {
for (let j = 0; j < i; j++) {
prevGap += numOccurances[i - 1][1]
return d[1] * theGap / 2 + prevGap * theGap + theTopPad
prevGap += numOccurances[i - 1][1];
return (d[1] * theGap) / 2 + prevGap * theGap + theTopPad;
}
} else {
return d[1] * theGap / 2 + theTopPad
return (d[1] * theGap) / 2 + theTopPad;
}
})
.attr('class', function (d) {
.attr('class', function(d) {
for (let i = 0; i < categories.length; i++) {
if (d[0] === categories[i]) {
return 'sectionTitle sectionTitle' + (i % conf.numberSectionStyles)
return 'sectionTitle sectionTitle' + (i % conf.numberSectionStyles);
}
}
return 'sectionTitle'
})
return 'sectionTitle';
});
}
function drawToday (theSidePad, theTopPad, w, h) {
const todayG = svg.append('g')
.attr('class', 'today')
function drawToday(theSidePad, theTopPad, w, h) {
const todayG = svg.append('g').attr('class', 'today');
const today = new Date()
const today = new Date();
todayG.append('line')
todayG
.append('line')
.attr('x1', timeScale(today) + theSidePad)
.attr('x2', timeScale(today) + theSidePad)
.attr('y1', conf.titleTopMargin)
.attr('y2', h - conf.titleTopMargin)
.attr('class', 'today')
.attr('class', 'today');
}
// from this stackexchange question: http://stackoverflow.com/questions/1890203/unique-for-arrays-in-javascript
function checkUnique (arr) {
const hash = {}
const result = []
function checkUnique(arr) {
const hash = {};
const result = [];
for (let i = 0, l = arr.length; i < l; ++i) {
if (!hash.hasOwnProperty(arr[i])) { // it works with objects! in FF, at least
hash[arr[i]] = true
result.push(arr[i])
if (!hash.hasOwnProperty(arr[i])) {
// it works with objects! in FF, at least
hash[arr[i]] = true;
result.push(arr[i]);
}
}
return result
return result;
}
// from this stackexchange question: http://stackoverflow.com/questions/14227981/count-how-many-strings-in-an-array-have-duplicates-in-the-same-array
function getCounts (arr) {
let i = arr.length // const to loop over
const obj = {} // obj to store results
function getCounts(arr) {
let i = arr.length; // const to loop over
const obj = {}; // obj to store results
while (i) {
obj[arr[--i]] = (obj[arr[i]] || 0) + 1 // count occurrences
obj[arr[--i]] = (obj[arr[i]] || 0) + 1; // count occurrences
}
return obj
return obj;
}
// get specific from everything
function getCount (word, arr) {
return getCounts(arr)[word] || 0
function getCount(word, arr) {
return getCounts(arr)[word] || 0;
}
}
};
export default {
setConf,
draw
}
};