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

Fix working time graphs that were broken by d3 update

Browse Source
This commit is contained in:
Maximilian Grundke
2018-03-19 15:33:37 +01:00
parent 2fc46fe9ab
commit 36d0c2839d
2 changed files with 23 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,7 @@
$(function() { $(function() {
// http://localhost:3333/exercises/38/statistics good for testing // /exercises/38/statistics good for testing
// originally at--> localhost:3333/exercises/69/statistics
if ($.isController('exercises') && $('.graph-functions-2').isPresent()) { if ($.isController('exercises') && $('.graph-functions-2').isPresent()) {
// GET THE DATA
var submissions = $('#data').data('submissions'); var submissions = $('#data').data('submissions');
var submissions_length = submissions.length; var submissions_length = submissions.length;
@ -14,10 +12,7 @@ $(function() {
submissionsAutosaves = []; 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');
// console.log(submissions);
// console.log(wtimes);
for (var i = 0;i<submissions_length;i++){ for (var i = 0;i<submissions_length;i++){
var submission = submissions[i]; var submission = submissions[i];
@ -46,9 +41,6 @@ $(function() {
submissionsSaves.push(submissionArray[1]); submissionsSaves.push(submissionArray[1]);
} }
} }
// console.log(submissionsScoreAndTimeAssess.length);
// console.log(submissionsScoreAndTimeSubmits);
// console.log(submissionsScoreAndTimeRuns);
function get_minutes (time_stamp) { function get_minutes (time_stamp) {
try { try {
@ -94,33 +86,22 @@ $(function() {
height = (width * height_ratio) - margin.top - margin.bottom; height = (width * height_ratio) - margin.top - margin.bottom;
// Set the ranges // Set the ranges
var x = d3.scale.linear().range([0, width]); var x = d3.scaleLinear().range([0, width]);
var y = d3.scale.linear().range([height,0]); var y = d3.scaleLinear().range([height,0]);
//var x = d3.scale.linear() //var x = d3.scaleLinear()
// .range([0, width]); // .range([0, width]);
//var y = d3.scale.linear() //var y = d3.scaleLinear()
// .range([0,height]); // - (height/20 // .range([0,height]); // - (height/20
var xAxis = d3.svg.axis() var xAxis = d3.axisBottom(x).ticks(20);
.scale(x) var yAxis = d3.axisLeft()
.orient("bottom") .scale(d3.scaleLinear().domain([0,maximumValue]).range([height,0]))
.ticks(20);
var yAxis = d3.svg.axis()
.scale(d3.scale.linear().domain([0,maximumValue]).range([height,0]))//y
// .scale(y)
.orient("left")
.ticks(maximumValue) .ticks(maximumValue)
.innerTickSize(-width) .tickSizeInner(-width)
.outerTickSize(0); .tickSizeOuter(0);
//var line = d3.svg.line() var line = d3.line()
// .x(function(d) { return x(d.date); })
// .y(function(d) { return y(d.close); });
var line = d3.svg.line()
.x(function (d) { .x(function (d) {
// console.log(d[1]); // console.log(d[1]);
return x(d[1]); return x(d[1]);
@ -288,23 +269,12 @@ $(function() {
.text(color_hash[String(i)][0]); .text(color_hash[String(i)][0]);
}); });
// function type(d) {
// d.frequency = +d.frequency;
// return d;
// }
//.on("mousemove", mMove)//new again
//.append("title");
} }
try{ try{
graph_assesses(); graph_assesses();
} catch(err){ } catch(err){
alert("could not draw the graph"); console.error("Could not draw the graph", err);
} }
} }

37
app/assets/javascripts/working_time_graphs.js
View File

@ -38,18 +38,6 @@ $(function() {
} }
} }
// minutes_count[(maximum_minutes + 1)] = 0;
//$('.graph-functions').html("<p></p>")
// var minutes_count = new Array(10);
// var minutes_array_len = minutes_array.length;
// for (var i=0; i< minutes_count; i++){
//
// for (var j = 0; j < minutes_array_len; j++){
// if ()
// }
// }
function getWidth() { function getWidth() {
if (self.innerHeight) { if (self.innerHeight) {
return self.innerWidth; return self.innerWidth;
@ -81,22 +69,17 @@ $(function() {
//var formatDate = d3.time.format("%M"); //var formatDate = d3.time.format("%M");
var x = d3.scale.linear() var x = d3.scaleLinear()
.range([0, width]); .range([0, width]);
var y = d3.scale.linear() var y = d3.scaleLinear()
.range([height, 0]); // - (height/20 .range([height, 0]); // - (height/20
var xAxis = d3.svg.axis() var xAxis = d3.axisBottom(x).ticks(20);
.scale(x) var yAxis = d3.axisLeft(y)
.orient("bottom")
.ticks(20);
var yAxis = d3.svg.axis()
.scale(y)
.orient("left")
.ticks(20) .ticks(20)
.innerTickSize(-width) .tickSizeInner(-width)
.outerTickSize(0); .tickSizeOuter(0);
var line = d3.svg.line() var line = d3.line()
.x(function (d, i) { .x(function (d, i) {
return x(i); return x(i);
}) })
@ -225,7 +208,7 @@ $(function() {
var x = d3.scale.ordinal() var x = d3.scale.ordinal()
.rangeRoundBands([0, width], .1); .rangeRoundBands([0, width], .1);
var y = d3.scale.linear() var y = d3.scaleLinear()
.range([0,height-(margin.top + margin.bottom)]); .range([0,height-(margin.top + margin.bottom)]);
@ -236,7 +219,7 @@ $(function() {
var yAxis = d3.svg.axis() var yAxis = d3.svg.axis()
.scale(d3.scale.linear().domain([0,max_of_array]).range([height,0]))//y .scale(d3.scaleLinear().domain([0,max_of_array]).range([height,0]))//y
.orient("left") .orient("left")
.ticks(10) .ticks(10)
.innerTickSize(-width); .innerTickSize(-width);
@ -299,7 +282,7 @@ $(function() {
.text("Working Time (Minutes)") .text("Working Time (Minutes)")
.style('font-size', 14); .style('font-size', 14);
y = d3.scale.linear() y = d3.scaleLinear()
.domain([(0),max_of_array]) .domain([(0),max_of_array])
.range([0,height]); .range([0,height]);