[Phpgroupware-cvs] projects/inc/class.bostatistics.inc.php, 1.18

[nomail]

Update of /projects/inc
Modified Files:
        Branch: 
          class.bostatistics.inc.php

date: 2004/05/12 21:52:02;  author: ceb;  state: Exp;  lines: +19 -8

Log Message:
update
=====================================================================
Index: projects/inc/class.bostatistics.inc.php
diff -u projects/inc/class.bostatistics.inc.php:1.17 
projects/inc/class.bostatistics.inc.php:1.18
--- projects/inc/class.bostatistics.inc.php:1.17        Tue Mar 16 02:46:09 2004
+++ projects/inc/class.bostatistics.inc.php     Wed May 12 21:52:02 2004
@@ -112,8 +112,18 @@
                        $project_array  = $params['project_array'];
                        $sdate                  = $params['sdate'];
                        $edate                  = $params['edate'];
-
-                       $this->graph = 
CreateObject('phpgwapi.gdgraph',$this->debug);
+                       $width                  = $params['width'];
+                       $height                 = $params['height'];
+                       $gantt_popup    = $params['gantt_popup'];
+
+                       $this->graph                            = 
CreateObject('phpgwapi.gdgraph',$this->debug);
+
+                       $this->graph->graph_width       = $width?$width-50:800;
+                       $this->graph->graph_height      = 
$height?$height-100:400;
+
+                       $this->graph->title_font_size   = $gantt_popup?5:3;
+                       $this->graph->line_font_size    = $gantt_popup?4:2;
+                       $this->graph->x_font_size               = 
$gantt_popup?3:1;
 
                        //$this->boprojects->order = 'parent';
                        $this->boprojects->limit                = False;
@@ -152,7 +162,7 @@
                                {
                                        if(is_array($pro['mstones']))
                                        {
-                                               foreach($pro['mstones'] as $ms)
+                                               /*foreach($pro['mstones'] as 
$ms)
                                                {
                                                        $spro[] = array
                                                        (
@@ -162,9 +172,9 @@
                                                                'edate'         
        => $ms['edate'],
                                                                'pro_id'        
        => $pro['project_id']
                                                        );
-                                               }
+                                               }*/
 
-                                               $color_legend['milestone'] = 
array('title'      => '[MS]' . lang('milestone'),
+                                               $color_legend['milestone'] = 
array('title'      => lang('milestone'),
                                                                                
                        'extracolor'    => 'yellow');
                                        }
 
@@ -193,7 +203,8 @@
                                                'edate'         => 
$pro['edate']?$pro['edate']:mktime(0,0,0,date('m'),date('d'),date('Y')),
                                                'color'         => 
$pro['level'],
                                                'pro_id'        => 
$pro['project_id'],
-                                               'previous'      => 
$pro['previous']
+                                               'previous'      => 
$pro['previous'],
+                                               'mstones'       => 
$pro['mstones']
                                        );
                                        //set_y_text
                                        $this->graph->line_captions_y[$i] = 
$pro['title'];
@@ -243,7 +254,7 @@
                                }
 
                                $this->graph->num_lines_y = count($spro)+2;
-                               $this->graph->render();
+                               return $this->graph->render();
                        }
                }
        }