Commit c7dc7f2e authored by PERRIER Guillaume's avatar PERRIER Guillaume
Browse files

Merge branch 'userMetricsDisciplineChartsError' of...

Merge branch 'userMetricsDisciplineChartsError' of gitlab.in2p3.fr:opsportal/sf3 into userMetricsDisciplineChartsError
parents c02f57d7 74a7dedc
......@@ -168,6 +168,7 @@
<script src="{{ asset('build/js/jquery-ui.min.js') }}"></script>
<script src="{{ asset('build/vendor/datatables/js/dataTables.dataTables.min.js') }}"></script>
<script src="{{ asset('build/js/gstatic.charts.min.js') }}"></script>
<script src="{{ asset('build/js/jsapi.min.js') }}"></script>
<script>
google.load("visualization", "1", {packages:["timeline"]});
......@@ -263,8 +264,6 @@
});
console.log(chartEntries.length);
var rowHeight = 50;
var chartHeight = chartEntries.length * rowHeight;
......
......@@ -54,10 +54,9 @@
</section>
{% endblock %}
{% block javascripts %}
<script type="text/javascript" src="{{ asset('build/js/metrics/metrics.min.js') }}"></script>
<script type="text/javascript"
src="https://www.google.com/jsapi?autoload={'modules':[{'name':'visualization','version':'1.1','packages':['line', 'corechart']}]}"></script>
<script src="{{ asset('build/js/gstatic.charts.min.js') }}"></script>
<script src="{{ asset('build/js/metrics/metrics.min.js') }}"></script>
<script type="text/javascript" src="https://cdn.datatables.net/buttons/1.5.2/js/dataTables.buttons.min.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/buttons/1.5.2/js/buttons.bootstrap4.min.js"></script>
......@@ -70,14 +69,16 @@
<script>
google.load("visualization", "1.1", {packages:["line", "corechart"]});
google.setOnLoadCallback(function(){
buildUserMetricsChart("TOP 10 {{ entity }}s Users Numbers");
});
$(document).ready(function () {
//build report list tab
buildUsersMetricsTable();
buildUserMetricsChart("TOP 10 {{ entity }}s Users Numbers");
});
</script>
{% endblock %}
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