Changeset 128 for trunk

Timestamp:

06/07/05 11:02:19 (18 years ago)

Author:

bastiaans

Message:

toga/overview.php:

• Changed time parsing a little
• Changed sorting method

File:

• trunk/web/addons/toga/overview.php (modified) (7 diffs)

trunk/web/addons/toga/overview.php

@@ -51 +51 @@
                 $seconds = $time_fields[2];
 
-                $myepoch = intval( $seconds + (intval( $minutes * 60 )) + (intval( $hours * 3600 )) );
-                return $myepoch;
-        }
+        } else if( count($time_fields) == 2 ) {
+
+                $hours = 0;
+                $minutes = $time_fields[0];
+                $seconds = $time_fields[1];
+
+        } else if( count($time_fields) == 1 ) {
+
+                $hours = 0;
+                $minutes = 0;
+                $seconds = $time_fields[0];
+        }
+
+        $myepoch = intval( $seconds + (intval( $minutes * 60 )) + (intval( $hours * 3600 )) );
+
+        return $myepoch;
 }
 
@@ -59 +72 @@
 
         $days = intval( $time / 86400 );
-        $time = $days ? $time % ($days * 86400) : $time;
+        $time = ($days>0) ? $time % ($days * 86400) : $time;
+
+        //printf( "time = %s, days = %s\n", $time, $days );
+
+        $date_str = '';
+        $day_str = '';
 
         if( $days > 0 ) {
                 if( $days > 1 )
-                        $date_str .= $days . ' days - ';
+                        $day_str .= $days . ' days';
                 else
-                        $date_str .= $days . ' day - ';
+                        $day_str .= $days . ' day';
         }
 
@@ -71 +89 @@
         $time = $hours ? $time % ($hours * 3600) : $time;
 
+        //printf( "time = %s, days = %s, hours = %s\n", $time, $days, $hours );
+
         if( $hours > 0 ) {
                 $date_str .= $hours . ':';
-                $date_unit = ' hours';
+                $date_unit = 'hours';
         }
                 
@@ -87 +107 @@
 
                 $date_unit = (!isset($date_unit)) ? 'minutes' : $date_unit;
-        } else if( $days > 0 or $hours > 0 ) {
-                $date_str .= '00:';
-                $date_unit = (!isset($date_unit)) ? 'minutes' : $date_unit;
-        }
+        } else {
+                if($hours > 0 ) {
+                        $date_str .= '00:';
+                        $date_unit = (!isset($date_unit)) ? 'minutes' : $date_unit;
+                }
+        }
+
 
         $date_unit = (!isset($date_unit)) ? 'seconds' : $date_unit;
@@ -101 +124 @@
                         $date_str .= '0' . $seconds . ' ' . $date_unit;
                         
-        } else if ( $days > 0 or $hours > 0 or $minutes > 0 )
+        } else if ( $hours > 0 or $minutes > 0 )
+
                 $date_str .= '00 ' . $date_unit;
+
+        if( $days > 0) {
+
+                if( $hours > 0 or $minutes > 0 or $seconds > 0 )
+                        $date_str = $day_str . ' - ' . $date_str;
+                else
+                        $date_str = $day_str;
+        }
 
         return $date_str;
@@ -351 +383 @@
 
                                 case "req_cpu":
-                                        $sorted[$jobid] = $req_cpu;
+                                        $sorted[$jobid] = timeToEpoch( $req_cpu );
                                         break;
 
@@ -380 +412 @@
         }
 
-        uasort( $sorted, $cmp );
+        //uasort( $sorted, $cmp );
+        if( $sortorder == "asc" )
+                arsort( $sorted );
+        else if( $sortorder == "desc" )
+                asort( $sorted );
 
         return $sorted;