Jingga/jsOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/jsOMS.git synced 2026-02-12 23:58:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Init js vars

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-11-11 15:55:29 +01:00
parent 055df9df55
commit ceee8a41d8
9 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Chart/BarChart.js
View File

@ -111,10 +111,13 @@
this.chart.drawGrid(svg, xGrid, yGrid); this.chart.drawGrid(svg, xGrid, yGrid);
let dataPoint, dataPointEnter, let dataPoint = null,
dataPointEnter = null,
temp = this.drawData(svg, x, y, dataPointEnter, dataPoint); temp = this.drawData(svg, x, y, dataPointEnter, dataPoint);
dataPointEnter = temp[0]; dataPointEnter = temp[0];
dataPoint = temp[1]; dataPoint = temp[1];
this.chart.drawMarker(svg, x, y, dataPointEnter, dataPoint); this.chart.drawMarker(svg, x, y, dataPointEnter, dataPoint);
this.chart.drawLegend(svg, dataPointEnter, dataPoint); this.chart.drawLegend(svg, dataPointEnter, dataPoint);
this.chart.drawText(svg); this.chart.drawText(svg);

2
Chart/ChartAbstract.js
View File

@ -315,6 +315,8 @@
} }
if (this.dataSettings.info.visible && this.dataSettings.marker.visible) { if (this.dataSettings.info.visible && this.dataSettings.marker.visible) {
temp = dataPointEnter.append('g').attr('class', 'dots');
let div = this.chartSelect.append("div").attr("class", "charttooltip").style("opacity", 0); let div = this.chartSelect.append("div").attr("class", "charttooltip").style("opacity", 0);
div.html(self.axis.x.label.text + ': ' + 100 + "<br/>" + self.axis.y.label.text + ': ' + 100); div.html(self.axis.x.label.text + ': ' + 100 + "<br/>" + self.axis.y.label.text + ': ' + 100);

4
Chart/ColumnChart.js
View File

@ -111,7 +111,8 @@
this.chart.drawGrid(svg, xGrid, yGrid); this.chart.drawGrid(svg, xGrid, yGrid);
let dataPoint, dataPointEnter, let dataPoint = null,
dataPointEnter = null,
temp = this.drawData(svg, x, y, dataPointEnter, dataPoint); temp = this.drawData(svg, x, y, dataPointEnter, dataPoint);
dataPointEnter = temp[0]; dataPointEnter = temp[0];
dataPoint = temp[1]; dataPoint = temp[1];
@ -206,6 +207,7 @@
{ {
y.domain([yMin, yMax]); y.domain([yMin, yMax]);
// todo: n is undefined !!!!
rect.transition() rect.transition()
.duration(500) .duration(500)
.delay(function (d, i) .delay(function (d, i)

7
Chart/LineChart.js
View File

@ -127,6 +127,8 @@
{ {
return y(d.y); return y(d.y);
}); });
} else {
return;
} }
zoom = d3.behavior.zoom().x(x).scaleExtent([1, 2]).on('zoom', function () zoom = d3.behavior.zoom().x(x).scaleExtent([1, 2]).on('zoom', function ()
@ -190,10 +192,13 @@
//svg.selectAll('.x.axis').transition().duration(500).call(xAxis1); //svg.selectAll('.x.axis').transition().duration(500).call(xAxis1);
//svg.selectAll('.y.axis').transition().duration(500).call(yAxis1); //svg.selectAll('.y.axis').transition().duration(500).call(yAxis1);
let dataPoint, dataPointEnter, let dataPoint = null,
dataPointEnter = null,
temp = this.drawData(svg, line, dataPointEnter, dataPoint); temp = this.drawData(svg, line, dataPointEnter, dataPoint);
dataPointEnter = temp[0]; dataPointEnter = temp[0];
dataPoint = temp[1]; dataPoint = temp[1];
this.chart.drawMarker(svg, x, y, dataPointEnter, dataPoint); this.chart.drawMarker(svg, x, y, dataPointEnter, dataPoint);
this.chart.drawLegend(svg, dataPointEnter, dataPoint); this.chart.drawLegend(svg, dataPointEnter, dataPoint);
this.chart.drawText(svg); this.chart.drawText(svg);

3
Chart/PieChart.js
View File

@ -33,7 +33,8 @@
+ (this.chart.margin.left) + "," + (this.chart.margin.left) + ","
+ (this.chart.margin.top) + ")"); + (this.chart.margin.top) + ")");
let dataPoint, dataPointEnter, let dataPoint = null,
dataPointEnter = null,
temp = this.drawData(svg, dataPointEnter, dataPoint); temp = this.drawData(svg, dataPointEnter, dataPoint);
dataPointEnter = temp[0]; dataPointEnter = temp[0];
dataPoint = temp[1]; dataPoint = temp[1];

3
Chart/PyramidChart.js
View File

@ -145,7 +145,8 @@
this.chart.drawGrid(svg, xGrid, yGrid); this.chart.drawGrid(svg, xGrid, yGrid);
let dataPoint, dataPointEnter, let dataPoint = null,
dataPointEnter = null,
temp = this.drawData(svg, x, y, dataPointEnter, dataPoint); temp = this.drawData(svg, x, y, dataPointEnter, dataPoint);
dataPointEnter = temp[0]; dataPointEnter = temp[0];
dataPoint = temp[1]; dataPoint = temp[1];

3
Chart/ScatterplotChart.js
View File

@ -91,7 +91,8 @@
this.chart.drawGrid(svg, xGrid, yGrid); this.chart.drawGrid(svg, xGrid, yGrid);
let dataPoint, dataPointEnter, let dataPoint = null,
dataPointEnter = null,
temp = this.drawData(svg, x, y, dataPointEnter, dataPoint); temp = this.drawData(svg, x, y, dataPointEnter, dataPoint);
dataPointEnter = temp[0]; dataPointEnter = temp[0];
dataPoint = temp[1]; dataPoint = temp[1];

3
Chart/VWaterfallChart.js
View File

@ -103,7 +103,8 @@
this.chart.drawGrid(svg, xGrid, yGrid); this.chart.drawGrid(svg, xGrid, yGrid);
let dataPoint, dataPointEnter, let dataPoint = null,
dataPointEnter = null,
temp = this.drawData(svg, x, y, dataPointEnter, dataPoint); temp = this.drawData(svg, x, y, dataPointEnter, dataPoint);
dataPointEnter = temp[0]; dataPointEnter = temp[0];
dataPoint = temp[1]; dataPoint = temp[1];

3
Chart/WaterfallChart.js
View File

@ -103,7 +103,8 @@
this.chart.drawGrid(svg, xGrid, yGrid); this.chart.drawGrid(svg, xGrid, yGrid);
let dataPoint, dataPointEnter, let dataPoint = null,
dataPointEnter = null,
temp = this.drawData(svg, x, y, dataPointEnter, dataPoint); temp = this.drawData(svg, x, y, dataPointEnter, dataPoint);
dataPointEnter = temp[0]; dataPointEnter = temp[0];
dataPoint = temp[1]; dataPoint = temp[1];