diff --git a/templates/objectives/skills/list.html b/templates/objectives/skills/list.html index 1e2b4124fd..455d2312ff 100644 --- a/templates/objectives/skills/list.html +++ b/templates/objectives/skills/list.html @@ -80,7 +80,7 @@ paging: false, searching: false, ordering: false, - "bInfo" : false, + // "bInfo" : false, }); }); diff --git a/templates/objectives/skills/tree.html b/templates/objectives/skills/tree.html index 176863f951..d6469bc250 100644 --- a/templates/objectives/skills/tree.html +++ b/templates/objectives/skills/tree.html @@ -3,10 +3,12 @@ {% block header %} {% endblock %} @@ -37,26 +39,33 @@ + (string.split(/j/g).length - 1) + (string.split(/l/g).length - 1) + (string.split(/t/g).length - 1) - + (string.split(/\//g).length - 1); + + (string.split(/\//g).length - 1) + + (string.split(/,/g).length - 1) + + (string.split(/\(/g).length - 1) + + (string.split(/\)/g).length - 1); number_of_big_char = (string.split(/½/g).length - 1) + (string.split(/¾/g).length - 1) + (string.split(/B/g).length - 1) - + (string.split(/O/g).length - 1); - return string.length + (number_of_big_char / 2) - (number_of_spaces + (number_of_small_char / 2)); + + (string.split(/O/g).length - 1) + + (string.split(/ { const data = [ {% for key, value in node_dict.items %} { - "id": "{{ key.short_label }}", + "id": "{{ key.id }}", + "label": "{% autoescape off %}{{ key.short_label }}{% endautoescape %}", "parentIds": [ - {% for prerequisite in value %} - "{{ prerequisite.short_label }}", - {% endfor %} + {% for prerequisite in value %}"{{ prerequisite.id }}", {% endfor %} ] - }, - {% endfor %} + },{% endfor %} ] const dag = d3.dagStratify()(data); @@ -162,12 +171,8 @@ // Add text to nodes nodes .append("text") - .text((d) => d.data.id) - // .attr("font-size", "8") - // .attr("font-size", function(d) { return Math.min(2 * d.r, (2 * d.r - 8) / this.getComputedTextLength() * 24) + "px"; }) - // .attr("font-size", function(d) {return (1 / d.data.id.length) * 60;}) - // .attr("font-size", set_font_size(d.data.id)) - .attr("font-size", function(d) {return (1 / compute_font_size(d.data.id)) * 80;}) + .text((d) => d.data.label) + .attr("font-size", function(d) {return Math.min(define_font_size(d.data.label), 24);}) .attr("font-weight", "bold") .attr("font-family", "sans-serif") .attr("text-anchor", "middle") diff --git a/templates/ultron/dashboard/dashboard.html b/templates/ultron/dashboard/dashboard.html index 355e0102a7..b1deafb656 100644 --- a/templates/ultron/dashboard/dashboard.html +++ b/templates/ultron/dashboard/dashboard.html @@ -11,7 +11,7 @@