htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #63 from openHPI/graph-fix

Browse Source 
Graph fix
This commit is contained in:
rteusner
2016-06-17 15:13:22 +02:00
committed by GitHub
parent 9e644563e3 5840b62692
commit 83d5e82e31
1 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/assets/javascripts/exercise_graphs.js
View File

@ -141,20 +141,13 @@ $(function() {
if(largestSubmittedTimeStamp.cause == "assess"){ if(largestSubmittedTimeStamp.cause == "assess"){
largestArrayForRange = submissionsScoreAndTimeAssess; largestArrayForRange = submissionsScoreAndTimeAssess;
indexForTime = 1;
} else if(largestSubmittedTimeStamp.cause == "submit"){
largestArrayForRange = submissionsScoreAndTimeSubmits;
indexForTime = 1;
} else if(largestSubmittedTimeStamp.cause == "run"){
largestArrayForRange = submissionsScoreAndTimeRuns;
indexForTime = 0;
x.domain([0,largestArrayForRange[largestArrayForRange.length - 1][1]]).clamp(true); x.domain([0,largestArrayForRange[largestArrayForRange.length - 1][1]]).clamp(true);
} else if(largestSubmittedTimeStamp.cause == "submit"){ } else if(largestSubmittedTimeStamp.cause == "submit"){
largestArrayForRange = submissionsScoreAndTimeSubmits; largestArrayForRange = submissionsScoreAndTimeSubmits;
x.domain([0,largestArrayForRange[largestArrayForRange.length - 1][1]]).clamp(true); x.domain([0,largestArrayForRange[largestArrayForRange.length - 1][1]]).clamp(true);
} else if(largestSubmittedTimeStamp.cause == "run"){ } else if(largestSubmittedTimeStamp.cause == "run"){
largestArrayForRange = submissionsScoreAndTimeRuns; largestArrayForRange = submissionsScoreAndTimeRuns;
x.domain([0,largestArrayForRange[largestArrayForRange.length - 1][1]]).clamp(true); x.domain([0,largestArrayForRange[largestArrayForRange.length - 1]]).clamp(true);
} else if(largestSubmittedTimeStamp.cause == "autosave"){ } else if(largestSubmittedTimeStamp.cause == "autosave"){
largestArrayForRange = submissionsAutosaves; largestArrayForRange = submissionsAutosaves;
x.domain([0,largestArrayForRange[largestArrayForRange.length - 1]]).clamp(true); x.domain([0,largestArrayForRange[largestArrayForRange.length - 1]]).clamp(true);
@ -162,12 +155,6 @@ $(function() {
largestArrayForRange = submissionsSaves; largestArrayForRange = submissionsSaves;
x.domain([0,largestArrayForRange[largestArrayForRange.length - 1]]).clamp(true); x.domain([0,largestArrayForRange[largestArrayForRange.length - 1]]).clamp(true);
} }
// x.domain(d3.extent(largestArrayForRange, function (d) {
// // console.log(d[1]);
// return (d[indexForTime]);
// }));
// take maximum value between assesses and submits // take maximum value between assesses and submits
var yDomain = submissionsScoreAndTimeAssess.concat(submissionsScoreAndTimeSubmits); var yDomain = submissionsScoreAndTimeAssess.concat(submissionsScoreAndTimeSubmits);
y.domain(d3.extent(yDomain, function (d) { y.domain(d3.extent(yDomain, function (d) {
@ -212,15 +199,15 @@ $(function() {
.style('font-size', 20) .style('font-size', 20)
.style('text-decoration', 'underline'); .style('text-decoration', 'underline');
//
// svg.append("path") svg.append("path")
// //.datum() //.datum()
// .attr("class", "line") .attr("class", "line")
// .attr('id', 'myPath')// new .attr('id', 'myPath')// new
// .attr("stroke", "black") .attr("stroke", "black")
// .attr("stroke-width", 5) .attr("stroke-width", 5)
// .attr("fill", "none")// end new .attr("fill", "none")// end new
// .attr("d", line(submissionsScoreAndTimeAssess));//--- .attr("d", line(submissionsScoreAndTimeAssess));//---
svg.append("path") svg.append("path")
.datum(submissionsScoreAndTimeAssess) .datum(submissionsScoreAndTimeAssess)
@ -239,20 +226,17 @@ $(function() {
.attr("cx", function(d) { return x(d[1]); }) .attr("cx", function(d) { return x(d[1]); })
.attr("cy", function(d) { return y(d[0]); }); .attr("cy", function(d) { return y(d[0]); });
if (submissionsScoreAndTimeSubmits.length > 0){
svg.append("path") // get rid of the 0 element at the beginning
.datum(submissionsScoreAndTimeSubmits) submissionsScoreAndTimeSubmits.shift();
.attr("class", "line2") }
.attr('id', 'myPath')// new
.attr("stroke", "blue")
.attr("stroke-width", 5)
.attr("fill", "none")// end new
.attr("d", line);//---
svg.selectAll("dot") // Add dots to submits svg.selectAll("dot") // Add dots to submits
.data(submissionsScoreAndTimeSubmits) .data(submissionsScoreAndTimeSubmits)
.enter().append("circle") .enter().append("circle")
.attr("r", 3.5) .attr("r", 6)
.attr("stroke", "black")
.attr("fill", "blue")
.attr("cx", function(d) { return x(d[1]); }) .attr("cx", function(d) { return x(d[1]); })
.attr("cy", function(d) { return y(d[0]); }); .attr("cy", function(d) { return y(d[0]); });