diff --git a/app/assets/javascripts/exercise_graphs.js b/app/assets/javascripts/exercise_graphs.js index f5640788..f98509b3 100644 --- a/app/assets/javascripts/exercise_graphs.js +++ b/app/assets/javascripts/exercise_graphs.js @@ -141,20 +141,13 @@ $(function() { if(largestSubmittedTimeStamp.cause == "assess"){ 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); } else if(largestSubmittedTimeStamp.cause == "submit"){ largestArrayForRange = submissionsScoreAndTimeSubmits; x.domain([0,largestArrayForRange[largestArrayForRange.length - 1][1]]).clamp(true); } else if(largestSubmittedTimeStamp.cause == "run"){ 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"){ largestArrayForRange = submissionsAutosaves; x.domain([0,largestArrayForRange[largestArrayForRange.length - 1]]).clamp(true); @@ -162,12 +155,6 @@ $(function() { largestArrayForRange = submissionsSaves; 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 var yDomain = submissionsScoreAndTimeAssess.concat(submissionsScoreAndTimeSubmits); y.domain(d3.extent(yDomain, function (d) { @@ -212,15 +199,15 @@ $(function() { .style('font-size', 20) .style('text-decoration', 'underline'); - // - // svg.append("path") - // //.datum() - // .attr("class", "line") - // .attr('id', 'myPath')// new - // .attr("stroke", "black") - // .attr("stroke-width", 5) - // .attr("fill", "none")// end new - // .attr("d", line(submissionsScoreAndTimeAssess));//--- + + svg.append("path") + //.datum() + .attr("class", "line") + .attr('id', 'myPath')// new + .attr("stroke", "black") + .attr("stroke-width", 5) + .attr("fill", "none")// end new + .attr("d", line(submissionsScoreAndTimeAssess));//--- svg.append("path") .datum(submissionsScoreAndTimeAssess)