Changeset 141 for trunk/web/addons/toga/search.php

Timestamp:

06/16/05 11:22:29 (18 years ago)

Author:

bastiaans

Message:

web/addons/toga/libtoga.php:

• Fixed couple of dbase selecting bugs

web/addons/toga/cal.gif:

• Image for date/time selector

web/addons/toga/templates/search.tpl:

• Removed bogus/wrong extra hidden fields messing up the search (leftover from overview template)

web/addons/toga/ts_picker.js:

• javascript for calendar date/time selector

web/addons/toga/libtoga.js:

• Our misc. javascript functions

web/addons/toga/bricks.jpg:

• Image for archive link

web/addons/toga/search.php:

• Now displays jobs of search in same manner as overview

web/addons/toga/ts_validatetime.js:

• javascript to validate time in calendar

File:

• trunk/web/addons/toga/search.php (modified) (2 diffs)

trunk/web/addons/toga/search.php

@@ -30 +30 @@
 }
 
+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 );
+}
+
+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 makeSearchPage() {
         global $clustername, $tpl, $id, $user, $name, $start_from_time, $start_to_time, $queue;
@@ -52 +154 @@
                 foreach( $search_ids as $foundid ) {
 
-                        printf("found job %s\n", $foundid );
+                        $job = $tdb->getJobArray( $foundid );
+                        $nodes = $tdb->getNodesForJob( $foundid );
+
+                        $tpl->newBlock( "node" );
+                        $tpl->assign( "id", $job[id] );
+                        $tpl->assign( "state", $job[status] );
+                        $tpl->assign( "user", $job[owner] );
+                        $tpl->assign( "queue", $job[queue] );
+                        $tpl->assign( "name", $job[name] );
+                        $tpl->assign( "req_cpu", makeTime( TimeToEpoch( $job[requested_time] ) ) );
+                        $tpl->assign( "req_memory", $job[requested_memory] );
+
+                        $nodes_nr = count( $nodes );
+                        $domain = $job[domain];
+                        $ppn = (int) $job[ppn] ? $job[ppn] : 1;
+                        $cpus = $nodes_nr * $ppn;
+
+                        $tpl->assign( "nodes", $nodes_nr );
+                        $tpl->assign( "cpus", $cpus );
+
+                        $runningtime = intval( $job[stop_timestamp] - $job[start_timestamp] );
+                        $tpl->assign( "started", makeDate( $job[start_timestamp] ) );
+                        $tpl->assign( "finished", makeDate( $job[stop_timestamp] ) );
+                        $tpl->assign( "runningtime", makeTime( $runningtime ) );
+                        
+                        print_r( $job );
+                        print_r( $nodes );
                         //output jobzooi