[Vtigercrm-commits] [vtiger-commits] r5602 - in /vtigercrm/trunk/modules/Reports: ReportRun.php SaveAndRun.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Sun Apr 30 04:10:12 2006
New Revision: 5602

Log:
Charts in Reports has been integrated

Modified:
    vtigercrm/trunk/modules/Reports/ReportRun.php
    vtigercrm/trunk/modules/Reports/SaveAndRun.php

Modified: vtigercrm/trunk/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ReportRun.php (original)
+++ vtigercrm/trunk/modules/Reports/ReportRun.php Sun Apr 30 04:10:12 2006
@@ -1292,6 +1292,7 @@
 				//<<<<<<<<construct HTML>>>>>>>>>>>>
 				$return_data[] = $sHTML;
 				$return_data[] = $noofrows;
+				$return_data[] = $sSQL;
 				return $return_data;
 			}
 		}elseif($outputformat == "PDF")

Modified: vtigercrm/trunk/modules/Reports/SaveAndRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/SaveAndRun.php (original)
+++ vtigercrm/trunk/modules/Reports/SaveAndRun.php Sun Apr 30 04:10:12 2006
@@ -48,6 +48,9 @@
 
 	$list_report_form = new vtigerCRM_Smarty;
 	$ogReport->getSelectedStandardCriteria($reportid);
+	require_once('modules/DashBoard/ReportsCharts.php');
+	$image = get_graph_by_type('Report','Report',$primarymodule,'',$sshtml[2]);
+	$list_report_form->assign("GRAPH", $image);
 
 	$BLOCK1 = getPrimaryStdFilterHTML($ogReport->primodule,$ogReport->stdselectedcolumn);
 	$BLOCK1 .= getSecondaryStdFilterHTML($ogReport->secmodule,$ogReport->stdselectedcolumn);