Changeset 534 for trunk/web2/addons/job_monarch/libtoga.php

Timestamp:

07/10/08 14:40:20 (16 years ago)

Author:

ramonb

Message:

job_monarch/jobstore.php:

• times and dates are now pretty and make sense

job_monarch/js/jobgrid.js:

• changed column size

job_monarch/js/mainscript.js:

• removed bogus example

job_monarch/overview.php,
job_monarch/libtoga.php:

• moved time function

File:

• trunk/web2/addons/job_monarch/libtoga.php (modified) (3 diffs)

trunk/web2/addons/job_monarch/libtoga.php

@@ -2388 +2388 @@
         if( $days > 0 )
         {
-                if( $days > 1 )
-                {
-                        $day_str .= $days . ' days';
-                }
-                else
-                {
-                        $day_str .= $days . ' day';
+                if( $days > 1 )
+                {
+                        $date_str .= $days . ' days';
+                }
+                else
+                {
+                        $date_str .= $days . ' day';
                 }
         }
@@ -2403 +2403 @@
         if( $hours > 0 )
         {
-                $date_str .= $hours . ':';
-                $date_unit = 'hours'; 
+                if( $hours > 1 )
+                {
+                        $date_unit      = 'hours';
+                }
+                else
+                {
+                        $date_unit      = 'hour';
+                }
+
+                if( $date_str != '' )
+                {
+                        $date_str .= ' ' . $hours . ' ' . $date_unit;
+                }
+                else
+                {
+                        $date_str .= $hours . ' ' . $date_unit;
+                }
         }
 
@@ -2412 +2427 @@
         if( $minutes > 0 )
         {
-                if( $minutes >= 10 )
-                {
-                        $date_str .= $minutes . ':';
-                }
-                else
-                {
-                        $date_str .= '0' . $minutes . ':';
-                }
-
-                $date_unit = (!isset($date_unit)) ? 'minutes' : $date_unit;
+                if( $minutes > 1 )
+                {
+                        $date_unit      = 'minutes';
+                }
+                else
+                {
+                        $date_unit      = 'minute';
+                }
+
+                if( $date_str != '' )
+                {
+                        $date_str .= ' ' . $minutes . ' ' . $date_unit;
+                }
+                else
+                {
+                        $date_str .= $minutes . ' ' . $date_unit;
+                }
         }
-        else
-        {
-                if($hours > 0 )
-                {
-                        $date_str .= '00:';
-                        $date_unit = (!isset($date_unit)) ? 'minutes' : $date_unit;
-                }
+
+        if( $seconds > 0 )
+        {
+                if( $seconds > 1 )
+                {
+                        $date_unit      = 'seconds';
+                }
+                else
+                {
+                        $date_unit      = 'second';
+                }
+
+                if( $date_str != '' )
+                {
+                        $date_str .= ' ' . $seconds . ' ' . $date_unit;
+                }
+                else
+                {
+                        $date_str .= $seconds . ' ' . $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;
 }