[Vtigercrm-commits] [vtiger-commits] r10792 - in /vtigercrm/branches/5.0.3/modules: Dashboard/Entity_charts.php Dashboard/vertical_bargraph.php HelpDesk/ListView.php Potentials/Charts.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Thu Apr 26 08:38:49 2007
New Revision: 10792

Log:
fix for dashboard issue. Fixes #3414 #3662 --minnie

Modified:
    vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php
    vtigercrm/branches/5.0.3/modules/Dashboard/vertical_bargraph.php
    vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php
    vtigercrm/branches/5.0.3/modules/Potentials/Charts.php

Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php (original)
+++ vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php Thu Apr 26 08:38:49 2007
@@ -282,7 +282,7 @@
 
 					if($graph_for == "accountid") $graph_for = "account_id";
 					if($module == "Home")
-						$link_val="index.php?module=".$name."&action=ListView&from_homepagedb=true&search_field=assigned_user_id&searchtype=BasicSearch&query=true&type=entchar&search_text=".$current_user->user_name;
+						$link_val="index.php?module=".$name."&action=ListView&from_homepagedb=true&type=dbrd&query=true&owner=".$current_user->user_name;
 					else
 						$link_val="index.php?module=".$module."&action=index&from_dashboard=true&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true&type=entchar";
 

Modified: vtigercrm/branches/5.0.3/modules/Dashboard/vertical_bargraph.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Dashboard/vertical_bargraph.php (original)
+++ vtigercrm/branches/5.0.3/modules/Dashboard/vertical_bargraph.php Thu Apr 26 08:38:49 2007
@@ -44,7 +44,7 @@
 			$name=$datax[$i];
 		$pos = substr_count($name," ");
 		$alts[]=$name."=%d";
-//If the daatx value of a string is greater, adding '\n' to it so that it'll cme inh 2nd line
+//If the datax value of a string is greater, adding '\n' to it so that it'll cme inh 2nd line
 		 if(strlen($name)>=15)
                         $name=substr($name, 0, 15);
 		if($pos>=2)
@@ -154,7 +154,14 @@
 
 	// Add some grace to y-axis so the bars doesn't go
 	// all the way to the end of the plot area
-	$yaxis->forceMaximum(round(($max * 1.1) + 0.5));
+	if($max<=10)
+		$yaxis->forceMaximum(round(($max * 1.1) + 0.5));
+	elseif($max>10 && $max<=100)
+		$yaxis->forceMaximum(round(($max * 1.1) + 1.5));
+	elseif($max>100 && $max<=1000)
+		$yaxis->forceMaximum(round(($max * 1.1) + 10.5));
+	else
+		$yaxis->forceMaximum(round(($max * 1.1) + 100.5));	
 	$ticks = get_tickspacing($max);
 
 	// First make the labels look right

Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/ListView.php Thu Apr 26 08:38:49 2007
@@ -124,7 +124,7 @@
 if(isset($where) && $where != '')
 {
 	if(isset($_REQUEST['from_homepagedb']) && $_REQUEST['from_homepagedb'] == 'true')
-                $list_query .= ' and vtiger_troubletickets.status!="Closed" or vtiger_troubletickets.status is null and '.$where;
+                $list_query .= ' and (vtiger_troubletickets.status!="Closed" or vtiger_troubletickets.status is null) and '.$where;
 	$list_query .= ' and '.$where;
 }
 

Modified: vtigercrm/branches/5.0.3/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Potentials/Charts.php (original)
+++ vtigercrm/branches/5.0.3/modules/Potentials/Charts.php Thu Apr 26 08:38:49 2007
@@ -249,7 +249,7 @@
 			$gbplot->setBarWidth(50/count($months),"%");
 
 			// set margin
-			$plotarea->setPadding(array('top'=>0,'bottom'=>0,'left'=>10,'right'=>20));
+			$plotarea->setPadding(array('top'=>0,'bottom'=>0,'left'=>10,'right'=>30));
 
 			// Set white margin color
 			$graph->setBackgroundColor('#F5F5F5');