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

fixed graph sizing

Browse Source
This commit is contained in:
John Geiger
2016-06-08 13:55:09 +02:00
parent 34826cc406
commit 52ba35d0e4
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,8 @@ $(function() {
submissionsScoreAndTimeAssess = [[0,0]]; submissionsScoreAndTimeAssess = [[0,0]];
submissionsScoreAndTimeSubmits = [[0,0]]; submissionsScoreAndTimeSubmits = [[0,0]];
submissionsScoreAndTimeRuns = []; submissionsScoreAndTimeRuns = [];
submissionsSaves = [];
submissionsAutosaves = [];
var maximumValue = 0; var maximumValue = 0;
var wtimes = $('#wtimes').data('working_times'); //.hidden#wtimes data-working_times=ActiveSupport::JSON.encode(working_times_until) var wtimes = $('#wtimes').data('working_times'); //.hidden#wtimes data-working_times=ActiveSupport::JSON.encode(working_times_until)
@ -38,6 +40,10 @@ $(function() {
submissionsScoreAndTimeSubmits.push(submissionArray); submissionsScoreAndTimeSubmits.push(submissionArray);
} else if(submission.cause == "run"){ } else if(submission.cause == "run"){
submissionsScoreAndTimeRuns.push(submissionArray[1]); submissionsScoreAndTimeRuns.push(submissionArray[1]);
} else if(submission.cause == "autosave"){
submissionsAutosaves.push(submissionArray[1]);
} else if(submission.cause == "save"){
submissionsSaves.push(submissionArray[1]);
} }
} }
// console.log(submissionsScoreAndTimeAssess.length); // console.log(submissionsScoreAndTimeAssess.length);
@ -131,8 +137,8 @@ $(function() {
.attr("transform", "translate(" + margin.left + "," + margin.top + ")"); .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
var largestSubmittedTimeStamp = submissions[submissions_length-1]; var largestSubmittedTimeStamp = submissions[submissions_length-1];
var indexForTime;
var largestArrayForRange; var largestArrayForRange;
if(largestSubmittedTimeStamp.cause == "assess"){ if(largestSubmittedTimeStamp.cause == "assess"){
largestArrayForRange = submissionsScoreAndTimeAssess; largestArrayForRange = submissionsScoreAndTimeAssess;
indexForTime = 1; indexForTime = 1;
@ -142,17 +148,33 @@ $(function() {
} else if(largestSubmittedTimeStamp.cause == "run"){ } else if(largestSubmittedTimeStamp.cause == "run"){
largestArrayForRange = submissionsScoreAndTimeRuns; largestArrayForRange = submissionsScoreAndTimeRuns;
indexForTime = 0; 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);
} else if(largestSubmittedTimeStamp.cause == "autosave"){
largestArrayForRange = submissionsAutosaves;
x.domain([0,largestArrayForRange[largestArrayForRange.length - 1]]).clamp(true);
} else if(largestSubmittedTimeStamp.cause == "save"){
largestArrayForRange = submissionsSaves;
x.domain([0,largestArrayForRange[largestArrayForRange.length - 1]]).clamp(true);
} }
x.domain(d3.extent(largestArrayForRange, function (d) { // x.domain(d3.extent(largestArrayForRange, function (d) {
// console.log(d[1]); // // console.log(d[1]);
return (d[indexForTime]); // return (d[indexForTime]);
})); // }));
y.domain(d3.extent(submissionsScoreAndTimeAssess, function (d) {
// take maximum value between assesses and submits
var yDomain = submissionsScoreAndTimeAssess.concat(submissionsScoreAndTimeSubmits);
y.domain(d3.extent(yDomain, function (d) {
// console.log(d[0]); // console.log(d[0]);
return (d[0]); return (d[0]);
})); }));
// y.domain([0,2]).clamp(true);
svg.append("g") //x axis svg.append("g") //x axis
.attr("class", "x axis") .attr("class", "x axis")
@ -298,7 +320,7 @@ $(function() {
try{ try{
graph_assesses(); graph_assesses();
} catch(err){ } catch(err){
// not enough data alert("could not draw the graph");
} }
} }