Changeset 243

Timestamp:

04/07/06 17:31:25 (18 years ago)

Author:

bastiaans

Message:

jobmond/jobmond.py:

• added queued_timestamp

web/addons/job_monarch/overview.php:

• fixed typo in queued since assignment

Location:

trunk

Files:

• jobmond/jobmond.py (modified) (3 diffs)
• web/addons/job_monarch/overview.php (modified) (1 diff)

trunk/jobmond/jobmond.py

@@ -287 +287 @@
                         status = self.getAttr( attrs, 'job_state' )
 
+                        queued_timestamp = self.getAttr( attrs, 'ctime' )
+                        print queued_timestamp
+
                         if status == 'R':
                                 start_timestamp = self.getAttr( attrs, 'mtime' )
@@ -355 +358 @@
                         myAttrs['status'] = status
                         myAttrs['start_timestamp'] = start_timestamp
+                        myAttrs['queued_timestamp'] = queued_timestamp
                         myAttrs['reported'] = str( int( int( self.cur_time ) + int( self.timeoffset ) ) )
                         myAttrs['nodes'] = nodeslist
@@ -421 +425 @@
                 if jobattrs['start_timestamp'] != '':
                         appendList.append( 'start_timestamp=' + jobattrs['start_timestamp'] )
+                        
+                if jobattrs['queued_timestamp'] != '':
+                        appendList.append( 'queued_timestamp=' + jobattrs['queued_timestamp'] )
 
                 appendList.append( 'reported=' + jobattrs['reported'] )

trunk/web/addons/job_monarch/overview.php

@@ -615 +615 @@
                                 if( $COLUMN_QUEUED ) {
                                         $tpl->newBlock( "column_queued" );
-                                        $tpl->assign( "queued", $jobs[$jobid][queued] );
+                                        $tpl->assign( "queued", makeDate( $jobs[$jobid][queued_timestamp] ) );
                                         $tpl->gotoBlock( "node" );
                                 }