Changeset 1fe89ea in OpenWorkouts-current for ow/static/js/ow.js

Timestamp:

Jan 29, 2019, 12:54:29 PM (5 years ago)

Author:

Segundo Fdez <segun.2@…>

Branches:

current, feature/docs, master

Children:

3e48af6

Parents:

d0fc76b

Message:

update dashboard layout ui

File:

• ow/static/js/ow.js (modified) (2 diffs)

ow/static/js/ow.js

@@ -148 +148 @@
          */
         var chart = d3.select("svg"),
-            margin = {top: 20, right: 20, bottom: 30, left: 50},
+            margin = {top: 17, right: 0, bottom: 20, left: 0},
             width = +chart.attr("width") - margin.left - margin.right,
             height = +chart.attr("height") - margin.top - margin.bottom,
@@ -211 +211 @@
                 })
                 .attr("y", function (d) {
-                    return y(Number(d.distance) + 5);
-                })
+                    /*
+                      Get the value for the current bar, then get the maximum
+                      value to be displayed in the bar, which is used to
+                      calculate the proper position of the label for this bar,
+                      relatively to its height (1% above the bar)
+                     */
+                    var max = y.domain()[1];
+                    return y(d.distance + y.domain()[1] * 0.02);
+            })
                 .text(function(d) {
                     if (Number(d.distance) > 0) {