diff --git a/db/update18.8.sql b/db/update18.8.sql
index e95b3f8cf8..455bc475bc 100644
--- a/db/update18.8.sql
+++ b/db/update18.8.sql
@@ -69,6 +69,20 @@ UPDATE `zt_chart` SET `type` = 'cluBarY', `settings` = '[{\"type\":\"cluBarY\",\
 UPDATE `zt_chart` SET `type` = 'cluBarY', `settings` = '[{\"type\":\"cluBarY\",\"xaxis\":[{\"field\":\"realname\",\"name\":\"realname\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"consumed\",\"name\":\"\\u8017\\u65f6\",\"valOrAgg\":\"sum\"}]}]', `fields` = '{\"year\":{\"name\":\"year\",\"object\":\"user\",\"field\":\"year\",\"type\":\"number\"},\"realname\":{\"name\":\"realname\",\"object\":\"zt_user\",\"field\":\"realname\",\"type\":\"string\"},\"consumed\":{\"name\":\"\\u8017\\u65f6\",\"object\":\"effort\",\"field\":\"consumed\",\"type\":\"number\"}}', `filters` = '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', `langs` = '{\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"},\"realname\":{\"zh-cn\":\"\\u59d3\\u540d\",\"zh-tw\":\"\",\"en\":\"realname\",\"de\":\"\",\"fr\":\"\"},\"consumed\":{\"zh-cn\":\"\\u8017\\u65f6\",\"zh-tw\":\"\",\"en\":\"consumed\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT YEAR(t1.date) AS `year`, t2.realname, ROUND(SUM(t1.consumed),1) AS consumed\nFROM zt_effort AS t1 LEFT JOIN zt_user AS t2 ON t1.account = t2.account\nWHERE t1.deleted = \'0\' AND t2.deleted = \'0\'\nGROUP BY `year`, realname\nORDER BY `year`, consumed DESC', `stage` = 'published', `builtin` = 0 WHERE `id` = 1109;
 UPDATE `zt_chart` SET `type` = 'cluBarY', `settings` = '[{\"type\":\"cluBarY\",\"xaxis\":[{\"field\":\"realname\",\"name\":\"realname\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"count\",\"name\":\"count\",\"valOrAgg\":\"sum\"}]}]', `fields` = '{\"year\":{\"name\":\"year\",\"object\":\"user\",\"field\":\"year\",\"type\":\"number\"},\"realname\":{\"name\":\"realname\",\"object\":\"zt_action\",\"field\":\"realname\",\"type\":\"string\"},\"count\":{\"name\":\"count\",\"object\":\"user\",\"field\":\"count\",\"type\":\"string\"}}', `filters` = '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', `langs` = '{\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"},\"realname\":{\"zh-cn\":\"\\u59d3\\u540d\",\"zh-tw\":\"\",\"en\":\"realname\",\"de\":\"\",\"fr\":\"\"},\"count\":{\"zh-cn\":\"\\u8ba1\\u6570\",\"zh-tw\":\"\",\"en\":\"count\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT YEAR(t1.date) AS `year`,IFNULL(t2.realname,t1.actor) AS realname,count(1) AS count\nFROM zt_action t1 LEFT JOIN zt_user AS t2 ON t1.actor=t2.account\nGROUP BY `year`,t1.actor\nORDER BY `year`, `count` DESC', `stage` = 'published', `builtin` = 0 WHERE `id` = 1110;
 
+-- 升级水球图
+UPDATE `zt_chart` SET `type` = 'waterpolo', `settings` = '[{\"type\":\"waterpolo\",\"calc\":\"count\",\"goal\":\"id\",\"conditions\":[{\"field\":\"bugstatus\",\"condition\":\"eq\",\"value\":\"done\"}]}]', `fields` = '{\"id\":{\"name\":\"\\u7f16\\u53f7\",\"object\":\"story\",\"field\":\"id\",\"type\":\"number\"},\"bugstatus\":{\"name\":\"bugstatus\",\"object\":\"story\",\"field\":\"bugstatus\",\"type\":\"string\"}}', `filters` = '[]', `langs` = '{\"id\":{\"zh-cn\":\"\\u7f16\\u53f7\",\"zh-tw\":\"\",\"en\":\"id\",\"de\":\"\",\"fr\":\"\"},\"bugstatus\":{\"zh-cn\":\"Bug\\u72b6\\u6001\",\"zh-tw\":\"\",\"en\":\"bugstatus\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT id, IF(closedReason=\'done\', \'done\', \'undone\') AS bugstatus FROM zt_story WHERE deleted=\'0\' AND (status != \'closed\' OR closedReason=\'done\')', `stage` = 'published', `builtin` = 0 WHERE `id` = 1031;
+UPDATE `zt_chart` SET `type` = 'waterpolo', `settings` = '[{\"type\":\"waterpolo\",\"calc\":\"count\",\"goal\":\"id\",\"conditions\":[{\"field\":\"bugstatus\",\"condition\":\"eq\",\"value\":\"done\"}]}]', `fields` = '{\"id\":{\"name\":\"Bug\\u7f16\\u53f7\",\"object\":\"bug\",\"field\":\"id\",\"type\":\"number\"},\"bugstatus\":{\"name\":\"bugstatus\",\"object\":\"bug\",\"field\":\"bugstatus\",\"type\":\"string\"}}', `filters` = '[]', `langs` = '{\"id\":{\"zh-cn\":\"Bug\\u7f16\\u53f7\",\"zh-tw\":\"\",\"en\":\"id\",\"de\":\"\",\"fr\":\"\"},\"bugstatus\":{\"zh-cn\":\"Bug\\u72b6\\u6001\",\"zh-tw\":\"\",\"en\":\"bugstatus\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT id, IF(`status`=\'closed\' AND resolution=\'fixed\', \'done\', \'undone\') AS bugstatus FROM zt_bug WHERE deleted=\'0\' AND (status = \'active\' OR resolution in (\'fixed\', \'postponed\'))', `stage` = 'published', `builtin` = 0 WHERE `id` = 1032;
+
+UPDATE `zt_chart` SET `type` = 'waterpolo', `settings` = '[{\"type\":\"waterpolo\",\"calc\":\"count\",\"goal\":\"id\",\"conditions\":[{\"field\":\"projectstatus\",\"condition\":\"eq\",\"value\":\"done\"}]}]', `fields` = '{\"id\":{\"name\":\"\\u9879\\u76eeID\",\"object\":\"project\",\"field\":\"id\",\"type\":\"number\"},\"projectstatus\":{\"name\":\"projectstatus\",\"object\":\"project\",\"field\":\"projectstatus\",\"type\":\"string\"},\"year\":{\"name\":\"year\",\"object\":\"project\",\"field\":\"year\",\"type\":\"string\"}}', `filters` = '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', `langs` = '{\"id\":{\"zh-cn\":\"\\u9879\\u76eeID\",\"zh-tw\":\"\",\"en\":\"id\",\"de\":\"\",\"fr\":\"\"},\"projectstatus\":{\"zh-cn\":\"\\u9879\\u76ee\\u72b6\\u6001\",\"zh-tw\":\"\",\"en\":\"projectstatus\",\"de\":\"\",\"fr\":\"\"},\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT t1.id,IF(t1.realEnd<=t1.end,\'done\',\'undone\') AS \'projectstatus\', YEAR(`closedDate`) AS \'year\' FROM(SELECT id, begin, end, IF(LEFT(realEnd, 4) = \'0000\', LEFT(closedDate,10), realEnd) AS realEnd, closedDate FROM zt_project WHERE deleted=\'0\' AND type=\'project\' AND status=\'closed\') t1', `stage` = 'published', `builtin` = 0 WHERE `id` = 10014;
+UPDATE `zt_chart` SET `type` = 'waterpolo', `settings` = '[{\"type\":\"waterpolo\",\"calc\":\"count\",\"goal\":\"id\",\"conditions\":[{\"field\":\"projectstatus\",\"condition\":\"eq\",\"value\":\"done\"}]}]', `fields` = '{\"id\":{\"name\":\"\\u9879\\u76eeID\",\"object\":\"project\",\"field\":\"id\",\"type\":\"number\"},\"projectstatus\":{\"name\":\"projectstatus\",\"object\":\"project\",\"field\":\"projectstatus\",\"type\":\"string\"},\"year\":{\"name\":\"year\",\"object\":\"project\",\"field\":\"year\",\"type\":\"string\"}}', `filters` = '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', `langs` = '{\"id\":{\"zh-cn\":\"\\u6267\\u884cID\",\"zh-tw\":\"\",\"en\":\"id\",\"de\":\"\",\"fr\":\"\"},\"projectstatus\":{\"zh-cn\":\"\\u6267\\u884c\\u72b6\\u6001\",\"zh-tw\":\"\",\"en\":\"projectstatus\",\"de\":\"\",\"fr\":\"\"},\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT t1.id,IF(t1.realEnd<=t1.end,\'done\',\'undone\') AS \'projectstatus\', YEAR(`closedDate`) AS \'year\' FROM (SELECT id, begin, end, IF(LEFT(realEnd,4)=\'0000\',LEFT(closedDate,10), realEnd) AS realEnd, closedDate FROM zt_project WHERE deleted=\'0\' and type=\'sprint\' and status=\'closed\') t1', `stage` = 'published', `builtin` = 0 WHERE `id` = 10015;
+UPDATE `zt_chart` SET `type` = 'waterpolo', `settings` = '[{\"type\":\"waterpolo\",\"calc\":\"count\",\"goal\":\"id\",\"conditions\":[{\"field\":\"projectstatus\",\"condition\":\"eq\",\"value\":\"undone\"}]}]', `fields` = '{\"id\":{\"name\":\"\\u9879\\u76eeID\",\"object\":\"project\",\"field\":\"id\",\"type\":\"number\"},\"projectstatus\":{\"name\":\"projectstatus\",\"object\":\"project\",\"field\":\"projectstatus\",\"type\":\"string\"},\"year\":{\"name\":\"year\",\"object\":\"project\",\"field\":\"year\",\"type\":\"string\"}}', `filters` = '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', `langs` = '{\"id\":{\"zh-cn\":\"\\u9879\\u76eeID\",\"zh-tw\":\"\",\"en\":\"id\",\"de\":\"\",\"fr\":\"\"},\"projectstatus\":{\"zh-cn\":\"\\u9879\\u76ee\\u72b6\\u6001\",\"zh-tw\":\"\",\"en\":\"projectstatus\",\"de\":\"\",\"fr\":\"\"},\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT t1.id,IF(t1.realEnd>t1.end ,\'done\',\'undone\') AS \'projectstatus\', YEAR(`closedDate`) AS \'year\' FROM (SELECT id, begin, end, IF(LEFT(realEnd, 4) = \'0000\', LEFT(closedDate,10), realEnd) AS realEnd, closedDate FROM zt_project WHERE deleted=\'0\' AND type=\'project\' AND status=\'closed\') t1', `stage` = 'published', `builtin` = 0 WHERE `id` = 10016;
+UPDATE `zt_chart` SET `type` = 'waterpolo', `settings` = '[{\"type\":\"waterpolo\",\"calc\":\"count\",\"goal\":\"id\",\"conditions\":[{\"field\":\"projectstatus\",\"condition\":\"eq\",\"value\":\"undone\"}]}]', `fields` = '{\"id\":{\"name\":\"\\u9879\\u76eeID\",\"object\":\"project\",\"field\":\"id\",\"type\":\"number\"},\"projectstatus\":{\"name\":\"projectstatus\",\"object\":\"project\",\"field\":\"projectstatus\",\"type\":\"string\"},\"year\":{\"name\":\"year\",\"object\":\"project\",\"field\":\"year\",\"type\":\"string\"}}', `filters` = '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', `langs` = '{\"id\":{\"zh-cn\":\"\\u6267\\u884cID\",\"zh-tw\":\"\",\"en\":\"id\",\"de\":\"\",\"fr\":\"\"},\"projectstatus\":{\"zh-cn\":\"\\u6267\\u884c\\u72b6\\u6001\",\"zh-tw\":\"\",\"en\":\"projectstatus\",\"de\":\"\",\"fr\":\"\"},\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT t1.id,IF(t1.realEnd>t1.end,\'done\',\'undone\') AS \'projectstatus\', YEAR(`closedDate`) AS \'year\' FROM(SELECT id, begin, end, IF(LEFT(realEnd, 4) = \'0000\', LEFT(closedDate,10), realEnd) AS realEnd, closedDate FROM zt_project WHERE deleted=\'0\' and type=\'sprint\' and status=\'closed\') t1', `stage` = 'published', `builtin` = 0 WHERE `id` = 10017;
+
+UPDATE `zt_chart` SET `type` = 'waterpolo', `settings` = '[{\"type\":\"waterpolo\",\"calc\":\"sum\",\"goal\":\"fixpercent\",\"conditions\":[{\"field\":\"havecase\",\"condition\":\"eq\",\"value\":\"havecase\"}]}]', `fields` = '{\"fixpercent\":{\"name\":\"fixpercent\",\"object\":\"testcase\",\"field\":\"fixpercent\",\"type\":\"number\"},\"havecase\":{\"name\":\"havecase\",\"object\":\"testcase\",\"field\":\"havecase\",\"type\":\"string\"}}', `filters` = '[]', `langs` = '{\"fixpercent\":{\"zh-cn\":\"\\u7528\\u4f8b\\u8986\\u76d6\\u7387\",\"zh-tw\":\"\",\"en\":\"fixpercent\",\"de\":\"\",\"fr\":\"\"},\"havecase\":{\"zh-cn\":\"\\u662f\\u5426\\u6709\\u7528\\u4f8b\",\"zh-tw\":\"\",\"en\":\"havecase\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT ROUND(SUM(t3.havecasefixstory)/COUNT(t3.fixstory),4) AS fixpercent, \'havecase\' as havecase FROM (SELECT t2.storyid \'fixstory\', (CASE WHEN t2.cases=0 THEN 0 ELSE 1 END) havecasefixstory FROM (SELECT t1.storyid, SUM(t1.iscase) cases FROM (SELECT zt_story.id storyid, (CASE WHEN zt_case.id is null THEN 0 ELSE 1 END) iscase FROM zt_story LEFT JOIN zt_case ON zt_story.id=zt_case.story WHERE zt_story.deleted=\'0\' AND (zt_story.stage IN (\'developed\',\'testing\',\'verfied\',\'released\') OR (zt_story.status=\'closed\' AND zt_story.closedReason=\'done\'))) t1 GROUP BY t1.storyid ORDER BY cases DESC) t2) t3\nunion\nSELECT ROUND(1-SUM(t3.havecasefixstory)/COUNT(t3.fixstory),4) AS fixpercent, \'nocase\' as havecase FROM (SELECT t2.storyid \'fixstory\', (CASE WHEN t2.cases=0 THEN 0 ELSE 1 END) havecasefixstory FROM (SELECT t1.storyid, SUM(t1.iscase) cases FROM (SELECT zt_story.id storyid, (CASE WHEN zt_case.id is null THEN 0 ELSE 1 END) iscase FROM zt_story LEFT JOIN zt_case ON zt_story.id=zt_case.story WHERE zt_story.deleted=\'0\' AND (zt_story.stage IN (\'developed\',\'testing\',\'verfied\',\'released\') OR (zt_story.status=\'closed\' AND zt_story.closedReason=\'done\'))) t1 GROUP BY t1.storyid ORDER BY cases DESC) t2) t3', `stage` = 'published', `builtin` = 0 WHERE `id` = 10207;
+UPDATE `zt_chart` SET `type` = 'waterpolo', `settings` = '[{\"type\":\"waterpolo\",\"calc\":\"sum\",\"goal\":\"casedensity\",\"conditions\":[{\"field\":\"havecase\",\"condition\":\"eq\",\"value\":\"havecase\"}]}]', `fields` = '{\"casedensity\":{\"name\":\"casedensity\",\"object\":\"testcase\",\"field\":\"casedensity\",\"type\":\"number\"},\"havecase\":{\"name\":\"havecase\",\"object\":\"testcase\",\"field\":\"havecase\",\"type\":\"string\"}}', `filters` = '[]', `langs` = '{\"casedensity\":{\"zh-cn\":\"\\u7528\\u4f8b\\u5bc6\\u5ea6\",\"zh-tw\":\"\",\"en\":\"casedensity\",\"de\":\"\",\"fr\":\"\"},\"havecase\":{\"zh-cn\":\"\\u662f\\u5426\\u6709\\u7528\\u4f8b\",\"zh-tw\":\"\",\"en\":\"havecase\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT ROUND(SUM(t2.cases)/SUM(t2.estimate),4) AS casedensity, \'havecase\' as havecase FROM (SELECT t1.storyid, t1.estimate, SUM(t1.iscase) cases FROM (SELECT zt_story.id storyid, zt_story.estimate, (CASE WHEN zt_case.id is null THEN 0 ELSE 1 END) iscase FROM zt_story LEFT JOIN zt_case ON zt_story.id=zt_case.story WHERE zt_story.deleted=\'0\' AND (zt_story.stage IN (\'developed\',\'testing\',\'verfied\',\'released\') OR (zt_story.status=\'closed\' AND zt_story.closedReason=\'done\'))) t1 GROUP BY t1.storyid, t1.estimate ORDER BY cases DESC) t2\nunion\nSELECT ROUND(1-SUM(t2.cases)/SUM(t2.estimate),4) AS casedensity, \'nocase\' as havecase FROM (SELECT t1.storyid, t1.estimate, SUM(t1.iscase) cases FROM (SELECT zt_story.id storyid, zt_story.estimate, (CASE WHEN zt_case.id is null THEN 0 ELSE 1 END) iscase FROM zt_story LEFT JOIN zt_case ON zt_story.id=zt_case.story WHERE zt_story.deleted=\'0\' AND (zt_story.stage IN (\'developed\',\'testing\',\'verfied\',\'released\') OR (zt_story.status=\'closed\' AND zt_story.closedReason=\'done\'))) t1 GROUP BY t1.storyid, t1.estimate ORDER BY cases DESC) t2', `stage` = 'published', `builtin` = 0 WHERE `id` = 10208;
+UPDATE `zt_chart` SET `type` = 'waterpolo', `settings` = '[{\"type\":\"waterpolo\",\"calc\":\"sum\",\"goal\":\"bugdensity\",\"conditions\":[{\"field\":\"havebug\",\"condition\":\"eq\",\"value\":\"havebug\"}]}]', `fields` = '{\"bugdensity\":{\"name\":\"bugdensity\",\"object\":\"bug\",\"field\":\"bugdensity\",\"type\":\"number\"},\"havebug\":{\"name\":\"havebug\",\"object\":\"bug\",\"field\":\"havebug\",\"type\":\"string\"}}', `filters` = '[]', `langs` = '{\"bugdensity\":{\"zh-cn\":\"Bug\\u5bc6\\u5ea6\",\"zh-tw\":\"\",\"en\":\"bugdensity\",\"de\":\"\",\"fr\":\"\"},\"havebug\":{\"zh-cn\":\"\\u662f\\u5426\\u6709Bug\",\"zh-tw\":\"\",\"en\":\"havebug\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT ROUND(SUM(t3.bug)/SUM(t3.estimate), 4) AS bugdensity, \'havebug\' as havebug FROM (SELECT t1.product product, IFNULL(t1.estimate,0) estimate, IFNULL(t2.bug,0) bug FROM (SELECT product, ROUND(SUM(estimate),2) estimate FROM zt_story WHERE deleted=\'0\' AND (stage IN (\'developed\',\'testing\',\'verfied\',\'released\') OR (status=\'closed\' AND closedReason=\'done\')) GROUP BY product) t1 LEFT JOIN (SELECT product, COUNT(id) bug FROM zt_bug WHERE deleted=\'0\' GROUP BY product) t2 ON t1.product=t2.product) t3\nunion\nSELECT ROUND(1-SUM(t3.bug)/SUM(t3.estimate), 4) AS bugdensity, \'nobug\' as havebug FROM (SELECT t1.product product, IFNULL(t1.estimate,0) estimate, IFNULL(t2.bug,0) bug FROM (SELECT product, ROUND(SUM(estimate),2) estimate FROM zt_story WHERE deleted=\'0\' AND (stage IN (\'developed\',\'testing\',\'verfied\',\'released\') OR (status=\'closed\' AND closedReason=\'done\')) GROUP BY product) t1 LEFT JOIN (SELECT product, COUNT(id) bug FROM zt_bug WHERE deleted=\'0\' GROUP BY product) t2 ON t1.product=t2.product) t3', `stage` = 'published', `builtin` = 0 WHERE `id` = 10209;
+UPDATE `zt_chart` SET `type` = 'waterpolo', `settings` = '[{\"type\":\"waterpolo\",\"calc\":\"sum\",\"goal\":\"fixpercent\",\"conditions\":[{\"field\":\"havebug\",\"condition\":\"eq\",\"value\":\"havebug\"}]}]', `fields` = '{\"fixpercent\":{\"name\":\"fixpercent\",\"object\":\"bug\",\"field\":\"fixpercent\",\"type\":\"number\"},\"havebug\":{\"name\":\"havebug\",\"object\":\"bug\",\"field\":\"havebug\",\"type\":\"string\"}}', `filters` = '[]', `langs` = '{\"fixpercent\":{\"zh-cn\":\"Bug\\u4fee\\u590d\\u7387\",\"zh-tw\":\"\",\"en\":\"fixpercent\",\"de\":\"\",\"fr\":\"\"},\"havebug\":{\"zh-cn\":\"\\u662f\\u5426\\u6709Bug\",\"zh-tw\":\"\",\"en\":\"havebug\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT ROUND(SUM(CASE WHEN resolution=\'fixed\' THEN 1 ELSE 0 END)/COUNT(id),4) AS fixpercent, \'havebug\' as havebug FROM zt_bug WHERE deleted = \'0\' \nunion\nSELECT ROUND(1-SUM(CASE WHEN resolution=\'fixed\' THEN 1 ELSE 0 END)/COUNT(id),4) AS fixpercent, \'nobug\' as havebug FROM zt_bug WHERE deleted = \'0\'', `stage` = 'published', `builtin` = 0 WHERE `id` = 10210;
+
 CREATE TABLE `zt_queue` (
   `id` mediumint unsigned NOT NULL AUTO_INCREMENT,
   `cron` mediumint NOT NULL,