From fc9222c10487688f4ba71a10ba34c5b8b39d400f Mon Sep 17 00:00:00 2001
From: daisyonly <1241945585@qq.com>
Date: Tue, 9 Sep 2014 17:39:54 +0800
Subject: [PATCH] fix pir chart bug

fix pir chart bug
---
 .../org/bench4q/master/domain/entity/Script.java   |  1 -
 .../src/main/webapp/script/testResult/pieChart.js  | 14 ++++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/Script.java b/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/Script.java
index 096e0f73..c68a9749 100644
--- a/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/Script.java
+++ b/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/Script.java
@@ -109,7 +109,6 @@ public class Script {
 		}
 		for (MultipartFile multipartFile : paramFiles) {
 			try {
-				System.out.println(multipartFile.getOriginalFilename());
 				multipartFile.transferTo(new File(folderPath
 						+ Main.FILE_SEPARATOR
 						+ multipartFile.getOriginalFilename()));
diff --git a/Bench4Q-Web/src/main/webapp/script/testResult/pieChart.js b/Bench4Q-Web/src/main/webapp/script/testResult/pieChart.js
index 03fdfed1..ae4ff8b1 100644
--- a/Bench4Q-Web/src/main/webapp/script/testResult/pieChart.js
+++ b/Bench4Q-Web/src/main/webapp/script/testResult/pieChart.js
@@ -64,6 +64,7 @@ var getUrlContentTypeData = function (testPlanId, chart){
 	$.post( testPlanId + "/" + "urlContentTypeCount", 
 			{},
 			function(data) {
+				
 				if (data.success) {
 					addPieData(chart, data.result);
 				} else {
@@ -77,10 +78,15 @@ var getUrlContentTypeData = function (testPlanId, chart){
 
 var contentTypeDataFormat = function (data){
 	var points = new Array(); 
-	var sum = data[""] + data["text/html;charset=utf8"] + data["application/json;charset=UTF-8"];
-	points[0] = new PiePoint("image", data[""], data[""]/sum);
-	points[1] = new PiePoint("text/html", data["text/html;charset=utf8"], data["text/html;charset=utf8"]/sum);
-	points[2] = new PiePoint("text/html", data["application/json;charset=UTF-8"], data["application/json;charset=UTF-8"]/sum);
+	var dataKeys = Object.keys(data);
+	
+	var sum=0;
+	for( var i=0; i < dataKeys.length; i++){
+		sum = sum + data[dataKeys[i]];
+	}
+	for( var i=0; i < dataKeys.length; i++){
+		points[i] = new PiePoint(dataKeys[i], data[dataKeys[i]], data[dataKeys[i]]/sum);
+	}
 	return points;
 	
 }