Commit c2fb804e by Tim Krones

Address review comments.

parent cc0fda93
...@@ -6,12 +6,12 @@ function PlotBlock(runtime, element) { ...@@ -6,12 +6,12 @@ function PlotBlock(runtime, element) {
var margins = {top: 20, right: 20, bottom: 20, left: 20}; var margins = {top: 20, right: 20, bottom: 20, left: 20};
// Define width and height of SVG viewport // Define width and height of SVG viewport
var width = 440; var width = 440,
var height = 440; height = 440;
// Define dimensions of plot area // Define dimensions of plot area
var plotWidth = width - margins.left - margins.right; var plotWidth = width - margins.left - margins.right,
var plotHeight = height - margins.top - margins.bottom; plotHeight = height - margins.top - margins.bottom;
// Preselect target DOM element for plot. // Preselect target DOM element for plot.
// This is necessary because when using a CSS selector, // This is necessary because when using a CSS selector,
...@@ -56,32 +56,32 @@ function PlotBlock(runtime, element) { ...@@ -56,32 +56,32 @@ function PlotBlock(runtime, element) {
// Buttons // Buttons
var defaultButton = $('.plot-default', element); var defaultButton = $('.plot-default', element),
var averageButton = $('.plot-average', element); averageButton = $('.plot-average', element),
var quadrantsButton = $('.plot-quadrants', element); quadrantsButton = $('.plot-quadrants', element);
// Claims // Claims
var defaultClaims = defaultButton.data('claims'); var defaultClaims = defaultButton.data('claims'),
var averageClaims = averageButton.data('claims'); averageClaims = averageButton.data('claims');
// Colors // Colors
var defaultColor = defaultButton.data('point-color'); var defaultColor = defaultButton.data('point-color'),
var averageColor = averageButton.data('point-color'); averageColor = averageButton.data('point-color');
// Quadrant labels // Quadrant labels
var q1Label = quadrantsButton.data('q1-label'); var q1Label = quadrantsButton.data('q1-label'),
var q2Label = quadrantsButton.data('q2-label'); q2Label = quadrantsButton.data('q2-label'),
var q3Label = quadrantsButton.data('q3-label'); q3Label = quadrantsButton.data('q3-label'),
var q4Label = quadrantsButton.data('q4-label'); q4Label = quadrantsButton.data('q4-label');
// Event handlers // Event handlers
function toggleOverlay(claims, color, klass, refresh) { function toggleOverlay(claims, color, klass, refresh) {
var selector = "." + klass; var selector = "." + klass,
var selection = svgContainer.selectAll(selector); selection = svgContainer.selectAll(selector);
if (selection.empty()) { if (selection.empty()) {
showOverlay(selection, claims, color, klass); showOverlay(selection, claims, color, klass);
} else { } else {
...@@ -116,8 +116,8 @@ function PlotBlock(runtime, element) { ...@@ -116,8 +116,8 @@ function PlotBlock(runtime, element) {
} }
function toggleBorderColor(button, color, refresh) { function toggleBorderColor(button, color, refresh) {
var $button = $(button); var $button = $(button),
var overlayOn = $button.data("overlay-on"); overlayOn = $button.data("overlay-on");
if (overlayOn && !refresh) { if (overlayOn && !refresh) {
$button.css("border-color", "rgb(237, 237, 237)"); // Default color: grey $button.css("border-color", "rgb(237, 237, 237)"); // Default color: grey
$button.data("overlay-on", false); $button.data("overlay-on", false);
...@@ -128,8 +128,8 @@ function PlotBlock(runtime, element) { ...@@ -128,8 +128,8 @@ function PlotBlock(runtime, element) {
} }
function toggleQuadrantLabels() { function toggleQuadrantLabels() {
var selection = svgContainer.selectAll(".quadrant-label"); var selection = svgContainer.selectAll(".quadrant-label"),
var quadrantLabelsOn = quadrantsButton.val() === 'On'; quadrantLabelsOn = quadrantsButton.val() === 'On';
if (quadrantLabelsOn) { if (quadrantLabelsOn) {
selection.remove(); selection.remove();
quadrantsButton.val("Off"); quadrantsButton.val("Off");
......
...@@ -2,7 +2,7 @@ function MentoringStepBlock(runtime, element) { ...@@ -2,7 +2,7 @@ function MentoringStepBlock(runtime, element) {
var children = runtime.children(element); var children = runtime.children(element);
var plots = []; var plots = [];
for (var i = 0; i < children.length; i++) { for (var i in children) {
var child = children[i]; var child = children[i];
var blockType = $(child.element).data('block-type'); var blockType = $(child.element).data('block-type');
if (blockType === 'sb-plot') { if (blockType === 'sb-plot') {
...@@ -102,7 +102,7 @@ function MentoringStepBlock(runtime, element) { ...@@ -102,7 +102,7 @@ function MentoringStepBlock(runtime, element) {
updatePlots: function() { updatePlots: function() {
if (plots) { if (plots) {
for (var i = 0; i < plots.length; i++) { for (var i in plots) {
var plot = plots[i]; var plot = plots[i];
plot.update(); plot.update();
} }
......
...@@ -544,7 +544,6 @@ class StepBuilderTest(MentoringAssessmentBaseTest): ...@@ -544,7 +544,6 @@ class StepBuilderTest(MentoringAssessmentBaseTest):
controls.quadrants_button.value_of_css_property('border-bottom-color'), controls.quadrants_button.value_of_css_property('border-bottom-color'),
controls.quadrants_button.value_of_css_property('border-left-color'), controls.quadrants_button.value_of_css_property('border-left-color'),
] ]
print(quadrants_button_border_colors)
if hidden: if hidden:
self.assertEquals(quadrant_labels, []) self.assertEquals(quadrant_labels, [])
# rgba(255, 0, 0, 1): "red" # rgba(255, 0, 0, 1): "red"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment