Skip to content

Commit

Permalink
Merge pull request #392 from uw-it-aca/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
jlaney authored Jun 2, 2023
2 parents c4f82a9 + 3834aa9 commit c647fc7
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion course_grader/static/course_grader/js/status.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ var AdminSupport = {};
linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1},
stops: [
[0, Highcharts.getOptions().colors[0]],
[1, Highcharts.Color(Highcharts.getOptions().colors[0]).setOpacity(0).get('rgba')]
[1, new Highcharts.Color(Highcharts.getOptions().colors[0]).setOpacity(0).get('rgba')]
]
},
marker: {
Expand Down
2 changes: 1 addition & 1 deletion course_grader/templates/support/imports.html
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ <h3>Results: {% if grade_imports|length %}<span style="font-weight:normal; font-
chart_data: [{% for data in chart_data %}[Date.parse('{{ data.0 }}'), {{ data.1 }}]{% if not forloop.last %},{% endif %}{% endfor %}]
};
</script>
<script src="//code.highcharts.com/highcharts.js"></script>
<script src="//code.highcharts.com/10.3/highcharts.js"></script>
<script src="//cdn.datatables.net/1.10.4/js/jquery.dataTables.min.js"></script>
<script src="{% static "course_grader/js/search.js" %}"></script>
{% endblock extra_js %}
2 changes: 1 addition & 1 deletion course_grader/templates/support/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ <h3>Results: {% if graderosters|length %}<span style="font-weight:normal; font-s
chart_data: [{% for data in chart_data %}[Date.parse('{{ data.0 }}'), {{ data.1 }}]{% if not forloop.last %},{% endif %}{% endfor %}]
};
</script>
<script src="//code.highcharts.com/highcharts.js"></script>
<script src="//code.highcharts.com/10.3/highcharts.js"></script>
<script src="//cdn.datatables.net/1.10.4/js/jquery.dataTables.min.js"></script>
<script src="{% static "course_grader/js/search.js" %}"></script>
{% endblock extra_js %}
2 changes: 1 addition & 1 deletion course_grader/templates/support/status.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ <h2>GradePage Status for {{ selected_quarter }} {{ selected_year }}</h2>
charts: {{ chart_data|safe }}
};
</script>
<script src="//code.highcharts.com/highcharts.js"></script>
<script src="//code.highcharts.com/10.3/highcharts.js"></script>
<script src="{% static "course_grader/js/status.js" %}"></script>
{% endblock extra_js %}

0 comments on commit c647fc7

Please sign in to comment.