Changeset 534 for trunk

Timestamp:

07/10/08 14:40:20 (15 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

Location:

trunk/web2/addons/job_monarch

Files:

• jobstore.php (modified) (3 diffs)
• js/jobgrid.js (modified) (4 diffs)
• js/mainscript.js (deleted)
• libtoga.php (modified) (3 diffs)
• overview.php (modified) (1 diff)

trunk/web2/addons/job_monarch/jobstore.php

@@ -67 +67 @@
         foreach( $jobs as $jobid => $jobattrs )
         {
-                //$jr           = $jobattrs;
-                $jr['jid']      = strval( $jobid );
-                $jr['status']   = $jobattrs['status'];
-                $jr['owner']    = $jobattrs['owner'];
-                $jr['queue']    = $jobattrs['queue'];
-                $jr['name']     = $jobattrs['name'];
-                $jr['requested_time']   = $jobattrs['requested_time'];
+                if( $reported != $heartbeat )
+                { // Old job: skip
+                        continue;
+                }
+
+                $jr['jid']              = strval( $jobid );
+                $jr['status']           = $jobattrs['status'];
+                $jr['owner']            = $jobattrs['owner'];
+                $jr['queue']            = $jobattrs['queue'];
+                $jr['name']             = $jobattrs['name'];
+                $jr['requested_time']   = makeTime( timeToEpoch( $jobattrs['requested_time'] ) );
 
                 if( $jobattrs[status] == 'R' )
@@ -84 +88 @@
                 }
 
-                unset( $jr['nodes'] );
-                unset( $jr['poll_interval'] );
-                unset( $jr['reported'] );
+                //unset( $jr['nodes'] );
+                //unset( $jr['poll_interval'] );
+                //unset( $jr['reported'] );
 
-                $jr['ppn']      = strval( $jobattrs[ppn] ? $jobattrs[ppn] : 1 );
-                $jr['cpu']      = strval( $nodes * (int) $ppn );
+                $jr['ppn']              = strval( $jobattrs[ppn] ? $jobattrs[ppn] : 1 );
+                $jr['cpu']              = strval( $nodes * (int) $ppn );
 
 
@@ -96 +100 @@
                         $jr['nodes']    = implode( ",", $jobattrs['nodes'] );
                 }
-                $jr['queued_timestamp'] = $jobattrs['queued_timestamp'];
-                $jr['start_timestamp']  = ($jobattrs['start_timestamp'] ? $jobattrs['start_timestamp'] : "");
 
-                $jobresults[]   = $jr;
+                $jr['queued_timestamp'] = makeDate( $jobattrs['queued_timestamp'] );
+                $jr['start_timestamp']  = ($jobattrs['start_timestamp'] ? makeDate( $jobattrs['start_timestamp'] ) : "");
+
+                $jobresults[]           = $jr;
         }
 

trunk/web2/addons/job_monarch/js/jobgrid.js

@@ -70 +70 @@
         hidden: false
       },{
-        header: 'Requested CPU time',
+        header: 'Requested Time',
         readOnly: true,
         dataIndex: 'requested_time',
@@ -103 +103 @@
         readOnly: true,
         dataIndex: 'queued_timestamp',
-        width: 100,
+        width: 140,
         hidden: false
       },{
@@ -109 +109 @@
         readOnly: true,
         dataIndex: 'start_timestamp',
-        width: 100,
+        width: 140,
         hidden: false
       }]
@@ -1179 +1179 @@
       items: JobListingEditorGrid
     });
-  
+
+  //debug();  
   JobsDataStore.load();
   //JobListingEditorGrid.render();

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;
 }

trunk/web2/addons/job_monarch/overview.php

@@ -105 +105 @@
 }
 
-function timeToEpoch( $time ) 
-{
-        $time_fields    = explode( ':', $time );
-
-        if( count( $time_fields ) == 3 ) 
-        {
-                $hours          = $time_fields[0];
-                $minutes        = $time_fields[1];
-                $seconds        = $time_fields[2];
-
-        } 
-        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;
-}
-
 function colorRed( $color ) 
 {