p78543092
/
haflow
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fix.

This commit is contained in:
zhaowei8188127 2014-02-21 15:12:36 +08:00
parent 3a619acd5e
commit b7f35fb0a2
3 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/resources/hibernate.cfg.xml
View File

@ -14,6 +14,15 @@
<property name="connection.characterEncoding">utf-8 </property>
<property name="hibernate.dialect">org.hibernate.dialect.MySQLDialect </property>
<property name="hibernate.hbm2ddl.auto">update</property>
<!-- <property name="hibernate.connection.provider_class">org.hibernate.connection.C3P0ConnectionProvider</property> -->
<property name="c3p0.min_size">5</property>
<property name="c3p0.max_size">30</property>
<property name="c3p0.time_out">1800</property> <!-- seconds --><!-- default: 0 -->
<property name="c3p0.max_statement">50</property> <!-- default: 0 -->
<property name="c3p0.acquire_increment">1</property> <!-- default: 1 -->
<property name="c3p0.idle_test_period">1200</property> <!-- seconds --><!-- default: 0 -->
<property name="c3p0.validate">true</property>
<mapping class="haflow.dto.entity.Edge" />
<mapping class="haflow.dto.entity.Flow" />

1
src/main/webapp/WEB-INF/views/main.jsp
View File

@ -53,7 +53,6 @@
<script type="text/javascript" src="<%=basePath%>/script/haflow.hdfs.js"></script>
<script type="text/javascript" src="<%=basePath%>/script/haflow.report_list.js"></script>
<script type="text/javascript" src="<%=basePath%>/script/haflow.report.js"></script>
<script type="text/javascript" src="<%=basePath%>/script/haflow.report_float.js"></script>
<script type="text/javascript" src="<%=basePath%>/script/haflow.jsplumb.js"></script>
<script type="text/javascript" src="<%=basePath%>/script/haflow.oozie_hive.js"></script>
<script type="text/javascript" src="<%=basePath%>/script/haflow.toolbar.js"></script>

30
src/main/webapp/script/haflow.report.js
View File

@ -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){