[Tutos-commits] CVS: tutos/php task.pinc,1.147,1.148

[Andreas M. <me...@us...>]

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16475/php

Modified Files:
	task.pinc 
Log Message:
Additional infos in gantt-graph (not completely finished...)

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- task.pinc	26 Apr 2004 13:36:43 -0000	1.147
+++ task.pinc	28 Apr 2004 07:36:31 -0000	1.148
@@ -37,10 +37,24 @@
   }
   $name .= "]";
   
+  #----workaround for presentation
+  #if ( $todo == -1 ) {
+  #  $todo = "100 %";
+  #} else {
+  #  $todo = hour_format($todo,2);
+  #}
+  #-------------------------------
+  
   if ($task->milestone == 1) {
-    $bar = new MileStone($n, $name, $end,sprintf("[%.0f %%]", $comp), 0.5);
+    #$bar = new MileStone($n, $name, $end,sprintf("[%.0f %%]", $comp), 0.5);
+    #$bar = new MileStone($n, array($name, hour_format($planned,2), $todo, $task->s_start->getDate(), $task->s_end->getDate()), 
+           #$end,sprintf("[%.0f %%]", $comp), 0.5);
+    $bar = new MileStone($n, array($name, hour_format($planned,2), $task->s_start->getDate(), $task->s_end->getDate()), 
+           $end,sprintf("[%.0f %%]", $comp), 0.5);
   } else {
-    $bar = new GanttBar($n, array($name, hour_format($planned,2), hour_format($todo,2), $task->s_start->getDate(), $task->s_end->getDate()), 
+    #$bar = new GanttBar($n, array($name, hour_format($planned,2), $todo, $task->s_start->getDate(), $task->s_end->getDate()), 
+           #$start, $end,sprintf("[%.0f %%]", $comp), 0.5);
+    $bar = new GanttBar($n, array($name, hour_format($planned,2), $task->s_start->getDate(), $task->s_end->getDate()), 
            $start, $end,sprintf("[%.0f %%]", $comp), 0.5);
     $bar->progress->Set($comp/100.0);
   }
@@ -108,7 +122,8 @@
   $graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
   $graph->scale->month->SetStyle(MONTHSTYLE_LONGNAMEYEAR4);
   $graph->scale->actinfo->SetColTitles(
-    array($lang['Task'] ." [". $lang['TaskWorker'] ."]",$lang['TaskVolumeFull'],$lang['TaskVolumeTodo'],$lang['TaskS_Start'],$lang['TaskS_End']));
+    #array($lang['Task'] ." [". $lang['TaskWorker'] ."]",$lang['TaskVolumeFull'],$lang['TaskVolumeTodo'],$lang['TaskS_Start'],$lang['TaskS_End']));
+    array($lang['Task'] ." [". $lang['TaskWorker'] ."]",$lang['TaskVolumeFull'],$lang['TaskS_Start'],$lang['TaskS_End']));
         
   /* TODO: we could use locale */
   // $graph->scale->SetDateLocale("fr_FR");
@@ -120,8 +135,7 @@
   $count = 0;
   
   $graph = gantt_addTasks($parent, $graph, $count, 0);
-  #$graph = gantt_addTasks($parent, $graph, $count, $depth);
-
+  
   // Add a vertical line for the current day
 #  $vline = new GanttVLine(strftime("%Y-%m-%d", time()));
 #  $vline->SetDayOffset(0.5);
@@ -932,8 +946,6 @@
 
      if( !isset($projects_tasks) ) $projects_tasks = array();
 
-     #echo $this->id." XXX  ".$parent->id." XXX ".$parent->getType()." <br />";
-
      // I sometimes get -1 as $this->id
      if( $this->id == -1 )
        return;