Commit 0f3f72ef authored by Edileuton Henrique de Oliveira's avatar Edileuton Henrique de Oliveira
Browse files

Merge branch 'master' of git:./proinfodata/unstable

parents af83b27d 7509fb94
......@@ -205,7 +205,7 @@ private static String createInventoryQuery(String table, String inep,
sb.append(table);
sb.append(" (project, inep, macaddr, os_type, os_distro, os_kernel,");
sb.append(" processor, memory, disk1_model, disk1_size, disk1_used,");
sb.append(" disk2_models, disk2_size, disk2_used, extra_hds) VALUES (");
sb.append(" disk2_model, disk2_size, disk2_used, extra_hds) VALUES (");
/* Project */
sb.append(createValueString(project, "int", 1));
......
......@@ -43,7 +43,7 @@ public class ComboOptions implements java.io.Serializable {
try {
PreparedStatement st = conn.prepareStatement(
"SELECT DISTINCT(cit.region) FROM search s, dim_school sch, dim_city cit " +
"SELECT DISTINCT(cit.region) FROM search_school s, dim_school sch, dim_city cit " +
" WHERE s.contacted_once='true' " +
" AND sch.id = s.sch_id AND cit.id = sch.cit_id ORDER BY cit.region ASC;"
);
......@@ -77,7 +77,7 @@ public class ComboOptions implements java.io.Serializable {
try {
PreparedStatement st = conn.prepareStatement(
"SELECT DISTINCT(cit.state) FROM search s, dim_school sch, dim_city cit " +
"SELECT DISTINCT(cit.state) FROM search_school s, dim_school sch, dim_city cit " +
" WHERE s.contacted_once='true' AND cit.region=? " +
" AND sch.id = s.sch_id AND cit.id = sch.cit_id ORDER BY cit.state ASC;"
);
......@@ -112,7 +112,7 @@ public class ComboOptions implements java.io.Serializable {
try {
PreparedStatement st = conn.prepareStatement(
"SELECT DISTINCT(cit.id),cit.name FROM search s, dim_school sch, dim_city cit " +
"SELECT DISTINCT(cit.id),cit.name FROM search_school s, dim_school sch, dim_city cit " +
" WHERE s.contacted_once='true' AND cit.state=? " +
" AND sch.id = s.sch_id AND cit.id = sch.cit_id ORDER BY cit.name ASC;"
);
......
......@@ -141,7 +141,7 @@ Charts.load = function(project, region, state) {
Charts.histChart.xAxis[0].setCategories(data.categories);
Charts.histChart.addSeries({
name: 'Último contato à menos de 10 dias',
name: 'Último contato menos de 10 dias',
data: data.green
}, false);
......@@ -151,7 +151,7 @@ Charts.load = function(project, region, state) {
}, false);
Charts.histChart.addSeries({
name: 'Último contato à mais de 30 dias',
name: 'Último contato mais de 30 dias',
data: data.red
}, false);
......
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