diff --git a/web/app/models/NetUsage.java b/web/app/models/NetUsage.java index c1da149a6d9c734ed6c8e5af6696fdc07b8e4987..6fcb2d5e26707ae5f7e935460e7058d3315414d3 100644 --- a/web/app/models/NetUsage.java +++ b/web/app/models/NetUsage.java @@ -45,9 +45,9 @@ public class NetUsage implements java.io.Serializable { try { PreparedStatement st = conn.prepareStatement( "SELECT (dat_id + collect_time - interval '00:02:30'), " + - " sum(down_kbits)/1024/300*8::bigint, sum(up_kbits)/1024/300*8::bigint " + + " (sum(down_kbits)/300)::bigint, (sum(up_kbits)/300)::bigint " + "FROM fact_net_usage " + - "WHERE sch_id=? " + + "WHERE sch_id=? AND dat_id > (current_date - interval '6 months') " + "GROUP BY sch_id, dat_id, collect_time " + "ORDER BY dat_id, collect_time ASC;"); st.setLong(1, id); diff --git a/web/public/charts/network.js b/web/public/charts/network.js index 946ba7213ab99ccb3a6392924ba3bb4fac3061eb..fc7683182749ac0084644d1ee71311805daae87a 100644 --- a/web/public/charts/network.js +++ b/web/public/charts/network.js @@ -64,6 +64,7 @@ Charts.load = function(project, region, state, city) { tempInput.value = category; tempForm.appendChild(tempInput); + document.body.appendChild(tempForm); tempForm.submit(); }; } diff --git a/web/public/javascripts/school.js b/web/public/javascripts/school.js index e9772bbb66775a3d5ff5bf841981d1f0c22babd8..1fe2a2d0683cb4d918812e999a6437267d970876 100644 --- a/web/public/javascripts/school.js +++ b/web/public/javascripts/school.js @@ -138,6 +138,10 @@ $.fn.loadContent = function() { legend: { enabled: true }, + tooltip: { + shared: true, + pointFormat: '<span style="color:{series.color}">{series.name}</span>: <b>{point.y} Kbps</b><br/>' + }, series : [{ name : 'Download', data : data.download,