Changeset 303 for trunk/web/addons/job_monarch/overview.php

Timestamp:

04/16/07 16:28:06 (16 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/image.php:

• enabled HostImage? for host template

web/addons/job_monarch/overview.php:

• removed function makeTime -> moved to libtoga.php

web/addons/job_monarch/libtoga.php:

• added HostImage? for host template
• added makeTime
• added getNode and getJob to DataGatherer?

File:

• trunk/web/addons/job_monarch/overview.php (modified) (1 diff)

trunk/web/addons/job_monarch/overview.php

@@ -94 +94 @@
 }
 
-function makeTime( $time ) {
-
-        $days = intval( $time / 86400 );
-        $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 )
-                        $day_str .= $days . ' days';
-                else
-                        $day_str .= $days . ' day';
-        }
-
-        $hours = intval( $time / 3600 );
-        $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';
-        }
-                
-        $minutes = intval( $time / 60 );
-        $seconds = $minutes ? $time % ($minutes * 60) : $time;
-
-        if( $minutes > 0 ) {
-
-                if( $minutes >= 10 )
-                        $date_str .= $minutes . ':';
-                else
-                        $date_str .= '0' . $minutes . ':';
-
-                $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;
-
-        if( $seconds > 0 ) {
-
-                if( $seconds >= 10 )
-                        $date_str .= $seconds . ' ' . $date_unit;
-                else
-                        $date_str .= '0' . $seconds . ' ' . $date_unit;
-                        
-        } 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;
-}
-
 //function makeDate( $time ) {
 //      return strftime( "%a %d %b %Y %H:%M:%S", $time );