2,9d1
< $data0 = "";
< if (isset($_GET['data0'])) {
< $data0 = "&data0=" . $_GET['data0'];
< } else if (isset($_POST['data0'])) {
< $data0 = "&data0=" . $_POST['data0'];
< }
<
<
17c9
<
Bar Chart (Differences) - RJM Programming - http://www.rjmprogramming.com.au (Copyright © 2013 rjmprogramming.com.au all rights reserved.)
---
> Bar Chart - RJM Programming - http://www.rjmprogramming.com.au (Copyright © 2013 rjmprogramming.com.au all rights reserved.)
27a20
>
54,90d46
< if (isset($_GET['data0']) || isset($_POST['data0'])) {
< echo " google.load('visualization', '1.1', {packages:['corechart']}); " . "\n";
< echo ' google.setOnLoadCallback(drawChart); ' . "\n";
< echo ' function drawChart() { ' . "\n";
< echo ' var data = google.visualization.arrayToDataTable([ ' . "\n";
< echo " ['" . $GETlabel . "','" . str_replace(",", "','", str_replace("'", "", $GETvalue)) . "'] \n";
< echo str_replace("~,", "',", str_replace("[~", "['", str_replace(",]", ",0]", str_replace(",,", ",0,", str_replace(",]", ",0]", $GETdata)))));
< echo " ]);\n";
< echo ' var data0 = google.visualization.arrayToDataTable([ ' . "\n";
< echo " ['" . $GETlabel . "','" . str_replace(",", "','", str_replace("'", "", $GETvalue)) . "'] \n";
< if (isset($_GET['data0'])) echo str_replace("~,", "',", str_replace("[~", "['", str_replace(",]", ",0]", str_replace(",,", ",0,", str_replace(",]", ",0]", $_GET['data0'])))));
< if (isset($_POST['data0'])) echo str_replace("~,", "',", str_replace("[~", "['", str_replace(",]", ",0]", str_replace(",,", ",0,", str_replace(",]", ",0]", $_POST['data0'])))));
< echo " ]);\n";
<
<
< echo " var barChartBefore = new google.visualization.BarChart(document.getElementById('barchart_before')); \n";
< echo " var barChartAfter = new google.visualization.BarChart(document.getElementById('barchart_after')); \n";
< echo " var barChartDiff = new google.visualization.BarChart(document.getElementById('barchart_diff')); \n";
<
< echo " var options = { legend: { position: 'top' } }; \n";
<
< echo " barChartBefore.draw(data0, options); \n";
< echo " barChartAfter.draw(data, options); \n";
<
< echo " var diffData = barChartDiff.computeDiff(data0, data); \n";
< echo " barChartDiff.draw(diffData, options); \n } \n";
<
<
< echo " \n";
< echo " \n";
< echo " \n";
< echo " " . $GETtitle . " Bar Chart
\n";
<
< echo " \n";
< echo " \n";
< echo " \n";
< } else {
98c54
< echo ' var data0 = "";' . "\n";
---
>
102a59,60
>
>
104a63
>
111,117c70
< }
<
<
<
<
< echo 'Another bar chart to show differences for?' . " \n";
<
---
> echo 'Another bar chart?' . " \n";
119,124c72
<
<
< if ((!isset($_GET['value']) && !isset($_POST['value'])) || $data0 == "") {
< if (isset($_GET['data'])) $data0 = "&data0=" . $_GET['data'];
< if (isset($_POST['data'])) $data0 = "&data0=" . $_POST['data'];
<
---
> if (!isset($_GET['value']) && !isset($_POST['value'])) {
132,134d79
< if (isset($_GET['data']) || isset($_POST['data'])) {
< echo " var title = '" . $GETtitle . "'; " . "\n";
< } else {
136d80
< }
138,141d81
< if (isset($_GET['data']) || isset($_POST['data'])) {
< echo " var label = '" . $GETlabel . "'; " . "\n";
< echo " var value = '" . $GETvalue . "'; " . "\n";
< } else {
144d83
< }
179c118
< echo ' window.location = "./bar_chart_diff.php?title=" + title + "&label=" + label + "&value=" + value.replace(" ercent ", "") + "' . $data0 . '&data=" + datac; ' . "\n";
---
> echo ' window.location = "./bar_chart.php?title=" + title + "&label=" + label + "&value=" + value.replace(" ercent ", "") + "&data=" + datac; ' . "\n";
183c122
< }
---
> }