From 0b5779531617e8aab9fc42cc1687a647d9ec3376 Mon Sep 17 00:00:00 2001
From: "Eduardo L. Buratti" <elb09@c3sl.ufpr.br>
Date: Mon, 17 Mar 2014 11:14:47 -0300
Subject: [PATCH] Fix a series of small bugs
Signed-off-by: Eduardo L. Buratti <elb09@c3sl.ufpr.br>
---
web/app/models/NetUsage.java | 4 ++--
web/public/charts/network.js | 1 +
web/public/javascripts/school.js | 4 ++++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/web/app/models/NetUsage.java b/web/app/models/NetUsage.java
index c1da149..6fcb2d5 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 946ba72..fc76831 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 e9772bb..1fe2a2d 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,
--
GitLab