diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml
index 3f77384..f9ee452 100644
--- a/src/main/resources/hibernate.cfg.xml
+++ b/src/main/resources/hibernate.cfg.xml
@@ -14,6 +14,15 @@
utf-8
org.hibernate.dialect.MySQLDialect
update
+
+
+ 5
+ 30
+ 1800
+ 50
+ 1
+ 1200
+ true
diff --git a/src/main/webapp/WEB-INF/views/main.jsp b/src/main/webapp/WEB-INF/views/main.jsp
index 46eeeb5..89c9692 100644
--- a/src/main/webapp/WEB-INF/views/main.jsp
+++ b/src/main/webapp/WEB-INF/views/main.jsp
@@ -53,7 +53,6 @@
-
diff --git a/src/main/webapp/script/haflow.report.js b/src/main/webapp/script/haflow.report.js
index 1ce09e6..f0cfb60 100644
--- a/src/main/webapp/script/haflow.report.js
+++ b/src/main/webapp/script/haflow.report.js
@@ -753,6 +753,11 @@ HAFlow.Main.prototype.onReportModuleAdded = function(currentInstance, reportId,
name : "Sa",
file_path : 'hdfs://133.133.2.150:9000/user/root/new/source/donut.csv',
column_index : '0'
+ }, {
+ id : HAFlow.generateUUID(),
+ name : "Sb",
+ file_path : 'hdfs://133.133.2.150:9000/user/root/new/source/donut.csv',
+ column_index : '1'
}];
}else {
alert("unknown report");
@@ -996,15 +1001,28 @@ HAFlow.Main.prototype.initChart = function(chart, currentPortlet, legendDivId){
contentType : "application/json",
success : function(model, status) {
var ccmList = model.series;
- for ( var i = 0; i < ccmList.length; i++) {
- var ccm = ccmList[i];
-// _currentInstance.addToConsole(ccm.columnname + ": " + ccm.data, false);
+ if( currentPortlet.type == 'pie'){
+ var ccm = ccmList[0];
var series_data = new Array();
- for( var j = 0; j < ccm.data.length; j++ ){
- series_data.push({y:ccm.data[j], text: 'a', tooltip: 'b'});
-// series_data.push({x:Math.floor((Math.random()*10)+1), y:ccm.data[j], text: 'a', tooltip: 'b'});
+ for ( var j = 0; j < ccm.data.length; j++) {
+ series_data.push({
+ y : ccm.data[j],
+ text : ccmList[1].data[j],//todo
+ tooltip : '... ...'
+ });
}
chart.addSeries(ccm.columnname, series_data);
+ }else{
+ for ( var i = 0; i < ccmList.length; i++) {
+ var ccm = ccmList[i];
+ // _currentInstance.addToConsole(ccm.columnname + ": " + ccm.data, false);
+ var series_data = new Array();
+ for( var j = 0; j < ccm.data.length; j++ ){
+ series_data.push({y:ccm.data[j], text: 'a', tooltip: '... ...'});
+ // series_data.push({x:Math.floor((Math.random()*10)+1), y:ccm.data[j], text: 'a', tooltip: 'b'});
+ }
+ chart.addSeries(ccm.columnname, series_data);
+ }
}
chart.render();
if( dijit.byId(legendDivId) != null){