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

Migrate to d3 v6

Browse Source
This commit is contained in:
Sebastian Serth
2020-12-14 13:02:39 +01:00
parent c6004a8e82
commit d547ae2c5a
4 changed files with 122 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/channels/la_exercises.js
View File

@ -64,6 +64,8 @@ $(document).on('turbolinks:load', function() {
function drawGraph(graph_data) {
const user_progress = graph_data['user_progress'];
const additional_user_data = graph_data['additional_user_data'];
const user_info = additional_user_data.length - 1;
const learners = additional_user_data[user_info]
function get_minutes (time_stamp) {
try {
@ -83,7 +85,7 @@ $(document).on('turbolinks:load', function() {
}
function learners_name(index) {
return additional_user_data[additional_user_data.length - 1][index]["name"] + ", ID: " + additional_user_data[additional_user_data.length - 1][index]["id"];
return additional_user_data[user_info][index]["name"] + ", ID: " + additional_user_data[user_info][index]["id"];
}
function learners_time(group, index) {
@ -201,7 +203,9 @@ $(document).on('turbolinks:load', function() {
let tip = d3.tip()
.attr('class', 'd3-tip')
.offset([-10, 0])
.html(function(d, i, a) {
.html(function(_event, _d) {
const e = rect.nodes();
const i = e.indexOf(this) % learners.length;
return "<strong>Student: </strong><span style='color:orange'>" + learners_name(i) + "</span><br/>" +
"0: " + learners_time(0, i) + "<br/>" +
"1: " + learners_time(1, i) + "<br/>" +

8
app/assets/javascripts/exercise_collections.js.erb
View File

@ -87,10 +87,10 @@ $(document).on('turbolinks:load', function() {
.enter()
.append("rect")
.attr("class", "value-bar")
.on("mousemove", function (d) {
.on("mousemove", function (event, d) {
tooltip
.style("left", d3.event.pageX - 50 + "px")
.style("top", d3.event.pageY + 50 + "px")
.style("left", event.pageX - 50 + "px")
.style("top", event.pageY + 50 + "px")
.style("display", "inline-block")
.html("<%= I18n.t('activerecord.models.exercise.one') %> ID: " + d.exercise_id + "<br>" +
"<%= I18n.t('activerecord.attributes.exercise.title') %>: " + d.exercise_title + "<br>" +
@ -99,7 +99,7 @@ $(document).on('turbolinks:load', function() {
.on("mouseout", function () {
tooltip.style("display", "none");
})
.on("click", function (d) {
.on("click", function (_event, d) {
Turbolinks.visit("/exercises/" + d.exercise_id + "/statistics");
})
.attr("x", function (d) {

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

@ -217,7 +217,7 @@ $(document).on('turbolinks:load', function() {
var tip = d3.tip()
.attr('class', 'd3-tip')
.offset([-10, 0])
.html(function(d) {
.html(function(_event, d) {
return "<strong>Students: </strong><span style='color:orange'>" + d + "</span>";
});