[Merge] Merged with main branch.

bzr revid: noz@tinyerp.com-20110713093209-3f2njjjhp0cgd5rj

3 files changed, 226 insertions, 0 deletions

diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/01_dhtmlxgrid.html b/addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/01_dhtmlxgrid.html
new file mode 100644
index 00000000000..698da15d9fd
--- /dev/null
+++ b/addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/01_dhtmlxgrid.html
@@ -0,0 +1,70 @@
+<!--conf

+<sample>

+              <product version="2.6" edition="std"/>

+                     <modifications>

+                            <modified date="100609"/>

+                     </modifications>

+               </sample>

+ -->

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

+

+<html>

+<head>

+	<title>Integration with grid</title>

+	<link rel='STYLESHEET' type='text/css' href='../../../dhtmlxGrid/codebase/dhtmlxgrid.css'>

+	<link rel='STYLESHEET' type='text/css' href='../../../dhtmlxGrid/codebase/skins/dhtmlxgrid_dhx_skyblue.css'>

+	<script src='../../../dhtmlxGrid/codebase/dhtmlxcommon.js'></script>

+	<script src='../../../dhtmlxGrid/codebase/dhtmlxgrid.js'></script>

+	<script src='../../../dhtmlxGrid/codebase/dhtmlxgridcell.js'></script>	

+	

+	<script src="../../codebase/dhtmlxchart.js" type="text/javascript"></script>

+	<link rel="STYLESHEET" type="text/css" href="../../codebase/dhtmlxchart.css">

+	<script>

+	var barChart;

+	window.onload = function(){

+	barChart =  new dhtmlXChart({

+		view:"bar",

+		color:"#66ccff",

+		gradient:"3d",

+		container:"chart_container",

+	    value:"#data0#",

+		label:"#data0#",

+		radius:3,

+		tooltip:{

+			template:"#data0#"

+		},

+		width:30,

+		origin:0,

+		yAxis:{},

+		xAxis:{

+			template:function(){return ""}

+		},

+		border:false

+	});

+	

+	function refresh_chart(){

+		barChart.clearAll();

+		barChart.parse(mygrid,"dhtmlxgrid");

+	};

+	

+	mygrid = new dhtmlXGridObject('gridbox');

+	mygrid.setImagePath('../../../dhtmlxGrid/codebase/imgs/');

+	mygrid.setSkin("dhx_skyblue")

+	mygrid.loadXML("../../../dhtmlxGrid/samples/common/gridH.xml",refresh_chart);

+	mygrid.attachEvent("onEditCell",function(stage){

+		if (stage == 2)

+			refresh_chart();

+		return true;

+	});

+    }

+</script>

+</head>

+

+<body>

+	

+	<div id="gridbox" style="width:600px; height:270px; background-color:white;"></div>

+	<hr>

+	<div id="chart_container" style="width:500px;height:300px;"></div>

+	

+</body>

+</html>

diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/02_dhtmlxgrid_group.html b/addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/02_dhtmlxgrid_group.html
new file mode 100644
index 00000000000..d911e209922
--- /dev/null
+++ b/addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/02_dhtmlxgrid_group.html
@@ -0,0 +1,79 @@
+<!--conf

+<sample>

+              <product version="2.6" edition="std"/>

+                     <modifications>

+                            <modified date="100609"/>

+                     </modifications>

+               </sample>

+ -->

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

+

+<html>

+<head>

+	<title>Integration with Grid and Grouping</title>

+	<link rel='STYLESHEET' type='text/css' href='../../../dhtmlxGrid/codebase/dhtmlxgrid.css'>

+	<link rel='STYLESHEET' type='text/css' href='../../../dhtmlxGrid/codebase/skins/dhtmlxgrid_dhx_skyblue.css'>

+	<script src='../../../dhtmlxGrid/codebase/dhtmlxcommon.js'></script>

+	<script src='../../../dhtmlxGrid/codebase/dhtmlxgrid.js'></script>

+	<script src='../../../dhtmlxGrid/codebase/dhtmlxgridcell.js'></script>	

+	

+	<script src="../../codebase/dhtmlxchart.js" type="text/javascript"></script>

+	<link rel="STYLESHEET" type="text/css" href="../../codebase/dhtmlxchart.css">

+	<script>

+	var barChart;

+	window.onload = function(){

+		barChart =  new dhtmlXChart({

+		view:"bar",

+		container:"chart_container",

+	    value:"#sales#",

+		label:"#sales#",

+		sort:{

+			by:"#sales#",

+			as:"int"

+		},

+		group:{

+			by:"#data2#",

+			map:{

+				author:["#data2#"],

+				sales:["#data0#","sum"]

+			}

+		},

+		xAxis:{

+			template:"#author#"

+		},

+		padding:{

+			left:0,

+			right:0

+		},

+		color:"#45abf5",

+		gradient:true,

+		width:50,

+		border:false

+	});

+	

+	function refresh_chart(){

+		barChart.clearAll();

+		barChart.parse(mygrid,"dhtmlxgrid");

+	};

+	

+	mygrid = new dhtmlXGridObject('gridbox');

+	mygrid.setImagePath('../../../dhtmlxGrid/codebase/imgs/');

+	mygrid.setSkin("dhx_skyblue")

+	mygrid.loadXML("../../../dhtmlxGrid/samples/common/gridH.xml",refresh_chart);

+	mygrid.attachEvent("onEditCell",function(stage){

+		if (stage == 2)

+			refresh_chart();

+		return true;

+	});

+    }

+</script>

+</head>

+

+<body>

+	

+	<div id="gridbox" style="width:600px; height:270px; background-color:white;"></div>

+	<hr>

+	<div id="chart_container" style="width:600px;height:300px;"></div>

+

+</body>

+</html>

diff --git a/addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/03_windows.html b/addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/03_windows.html
new file mode 100644
index 00000000000..822e621d9ca
--- /dev/null
+++ b/addons/base_graph/static/lib/dhtmlxGraph/samples/09_integration/03_windows.html
@@ -0,0 +1,77 @@
+<!--conf

+<sample>

+              <product version="2.6" edition="std"/>

+                     <modifications>

+                            <modified date="100609"/>

+                     </modifications>

+               </sample>

+ -->

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

+

+<html>

+<head>

+	<title>Integration with dhtmlxWindows</title>

+	

+	<link rel="stylesheet" type="text/css" href="../../../dhtmlxWindows/codebase/dhtmlxwindows.css">

+	<link rel="stylesheet" type="text/css" href="../../../dhtmlxWindows/codebase/skins/dhtmlxwindows_dhx_skyblue.css">

+	

+	<script src="../../../dhtmlxWindows/codebase/dhtmlxcommon.js"></script>

+	<script src="../../../dhtmlxWindows/codebase/dhtmlxwindows.js"></script>

+	<script src="../../../dhtmlxWindows/codebase/dhtmlxcontainer.js"></script>

+	

+	<script src="../../codebase/dhtmlxchart.js" type="text/javascript"></script>

+	<link rel="STYLESHEET" type="text/css" href="../../codebase/dhtmlxchart.css">

+	

+</head>

+<style type="text/css" media="screen">

+	html, body{

+		height:100%;

+		padding:0px;

+		margin:0px;

+	}

+</style>

+<body onload="doOnLoad();">

+

+<script>

+	var dhxWins

+	var data = [

+		{ sales:"3.0", year:"2000" },

+		{ sales:"3.8", year:"2001" },

+		{ sales:"3.4", year:"2002" },

+		{ sales:"4.1", year:"2003" },

+		{ sales:"4.3", year:"2004" },

+		{ sales:"9.9", year:"2005" },

+		{ sales:"7.4", year:"2006" },

+		{ sales:"9.0", year:"2007" },

+		{ sales:"7.3", year:"2008" },

+		{ sales:"4.8", year:"2009" }

+	];

+

+	

+	function doOnLoad() {

+		dhxWinsParams = {

+			image_path: "../../../dhtmlxWindows/codebase/imgs/",

+			wins: [ {id: "w1", left: 230, top: 230, width: 420, height: 340}]

+		};

+		dhxWins = new dhtmlXWindows(dhxWinsParams);

+		pieChart2 = dhxWins.window("w1").attachChart({

+			view:"pie",

+			value:"#sales#",

+			pieInnerText:"#sales#",

+			gradient:true,

+			details:{

+				width: 75,

+				align:"right",

+				valign:top,

+				marker:{

+					type:"round",

+					width:15

+				},

+				template:"#year#"

+			}

+		});

+		

+		pieChart2.parse(data,"json");

+	};

+</script>

+</body>
\ No newline at end of file