[Tutos-commits] CVS: tutos/php task.pinc,1.160,1.161 user.pinc,1.141,1.142 app_select.php,1.19,1.20

[Gero K. <gok...@us...>]

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

Modified Files:
	task.pinc user.pinc app_select.php 
Log Message:
various fixes

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- task.pinc	26 Oct 2004 07:50:06 -0000	1.160
+++ task.pinc	11 Dec 2004 08:03:51 -0000	1.161
@@ -50,11 +50,21 @@
   } else {
     $xx = $name;
   }
+  if ( $comp > 100.0 ) {
+    $over = true;
+  }
   if ($task->milestone == 1) {
     $bar = new MileStone($n, $xx, $end,sprintf("[%.0f %%]", $comp), 0.5);
   } else {
     $bar = new GanttBar($n, $xx, $start, $end,sprintf("[%.0f %%]", $comp), 0.5);
-    $bar->progress->Set($comp/100.0);
+    if ( $over ) {
+      $bar->progress->Set(1);
+      $bar->SetColor("red");
+      $bar->SetPattern(BAND_RDIAG, "red");
+      $bar->progress->SetPattern(BAND_RDIAG, "red"); 
+    } else {
+      $bar->progress->Set($comp/100.0);
+	}
   }
   if ($tutos[jpgraph_old] == 0) {
     $bar->SetCSIMTarget(addSessionKey($task->getUrl()),myentities($task->getFullName()));
@@ -120,6 +130,7 @@
   $graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
   $graph->scale->month->SetStyle(MONTHSTYLE_LONGNAMEYEAR4);
   if (isset($graph->scale->actinfo)) {
+    $graph->scale->actinfo->SetFont($font, FS_NORMAL, 8);
     $graph->scale->actinfo->SetColTitles(array($lang['Task'] ." [". $lang['TaskWorker'] ."]",$lang['TaskVolumeFull'],$lang['TaskVolumeTodo'],$lang['TaskS_Start'],$lang['TaskS_End']));
   }
   /* TODO: we could use locale */
@@ -127,7 +138,7 @@
 
   // Change the scale font 
   $graph->scale->week->SetFont(FF_FONT0);
-  $graph->scale->year->SetFont(FF_ARIAL,FS_BOLD,12);
+  $graph->scale->year->SetFont($font,FS_BOLD,12);
 
   $count = 0;
   

Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- user.pinc	24 Nov 2004 18:17:54 -0000	1.141
+++ user.pinc	11 Dec 2004 08:03:52 -0000	1.142
@@ -177,7 +177,8 @@
     if ( strlen($rowiconsbefore) > 0 ) {
       $h = split(",",$rowiconsbefore);
       while( list ($i,$f) = @each ($h) ) {
-        $this->rowiconsbefore[strtolower($f)] = 1;
+        if ( $f != "" )
+          $this->rowiconsbefore[strtolower($f)] = 1;
       }
     }
     $rowiconsafter = StripSlashes($r->get($pos, "rowiconsafter"));
@@ -187,7 +188,8 @@
     if ( strlen($rowiconsafter) > 0 ) {
       $h = split(",",$rowiconsafter);
       while( list ($i,$f) = @each ($h) ) {
-        $this->rowiconsafter[strtolower($f)] = 1;
+        if ( $f != "" )
+          $this->rowiconsafter[strtolower($f)] = 1;
       }
     }
     $namedays = StripSlashes($r->get($pos, "namedays"));

Index: app_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_select.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- app_select.php	5 Feb 2004 17:07:11 -0000	1.19
+++ app_select.php	11 Dec 2004 08:03:52 -0000	1.20
@@ -25,7 +25,7 @@
    Function info() {
      global $lang,$tutos;
 
-     echo "<br><br><center>\n";
+     echo "<br /><br /><center>\n";
 
      echo "<form name=\"appsearch\" action=\"app_overview.php\" method=\"GET\">\n";
      DoubleTableStart();
@@ -68,7 +68,7 @@
        echo " <td colspan=\"2\">&nbsp;<select name=\"loc\">\n";
        echo " <option value=\"-1\">". $lang['all'] ."</option>\n";
        foreach ($lang['AppLoc'] as $i => $f ) {
-         echo "   <option VALUE=\"". $i ."\">". $lang['AppLoc'][$i] ."</option>\n";
+         echo "   <option value=\"". $i ."\">". $lang['AppLoc'][$i] ."</option>\n";
        }
        echo " </select></td>\n";
        echo "</tr><tr>\n";
@@ -78,7 +78,7 @@
 
      DoubleTableEnd();
      hiddenFormElements();
-	 echo $this->getHidden();
+     echo $this->getHidden();
      echo "</form>\n";
      echo "</center>\n";
      echo $this->setfocus("appsearch.name");