bacula-web: Improved Jobs page

[bacula/bacula] / gui / bacula-web / jobs.php

diff --git a/gui/bacula-web/jobs.php b/gui/bacula-web/jobs.php
index 2f28c20f208a66b4595d373c96796d3f4d0378eb..c140a6c0b5af139de9557ff058ae50a03a3e6e1d 100644 (file)
--- a/gui/bacula-web/jobs.php
+++ b/gui/bacula-web/jobs.php
@@ -19,33 +19,15 @@
   $smarty->compile_dir = "./templates_c";
   $smarty->config_dir     = "./configs";
   
-  // Get the last 10 failed jobs
-  $query          = "";
-  $failed_jobs = array();
+  // Running jobs
+  $running_jobs = array();
+  
+  $query  = "SELECT Job.JobId, Job.JobStatus, Status.JobStatusLong, Job.Name, Job.StartTime, Job.Level, Pool.Name AS Pool_name ";
+  $query .= "FROM Job ";
+  $query .= "JOIN Status ON Job.JobStatus = Status.JobStatus ";
+  $query .= "LEFT JOIN Pool ON Job.PoolId = Pool.PoolId ";
+  $query .= "WHERE Job.JobStatus IN ('F','S','M','m','s','j','c','d','t','C','R')";
   
-  switch( $dbSql->driver ) 
-  {
-       case 'mysql':
-               $query  = "SELECT SEC_TO_TIME( UNIX_TIMESTAMP(Job.EndTime)-UNIX_TIMESTAMP(Job.StartTime) ) AS elapsed, Job.JobId, Job.Name AS job_name, Job.StartTime, Job.EndTime, Job.Level, Pool.Name AS pool_name, Job.JobStatus ";
-               $query .= "FROM Job ";
-               $query .= "LEFT JOIN Pool ON Job.PoolId=Pool.PoolId ";
-               $query .= "WHERE Job.JobStatus = 'f' ";
-               //$query .= "WHERE Job.EndTime BETWEEN <= NOW() and UNIX_TIMESTAMP(EndTime) >UNIX_TIMESTAMP(NOW())-86400 ";
-               $query .= "ORDER BY Job.EndTime DESC ";  
-               $query .= "LIMIT 10";
- 
-       break;
-       
-       case 'pgsql':
-               $query  = "SELECT (Job.EndTime - Job.StartTime ) AS elapsed, Job.Name, Job.StartTime, Job.EndTime, Job.Level, Pool.Name, Job.JobStatus ";
-               $query .= "FROM Job ";
-               $query .= "LEFT JOIN Pool ON Job.PoolId=Pool.PoolId ";
-               $query .= "WHERE Job.JobStatus = 'f' ";
-               //$query .= "WHERE EndTime <= NOW() and EndTime > NOW() - 86400 * interval '1 second' AND ";
-               $query .= "ORDER BY Job.EndTime DESC";
-               $query .= "LIMIT 10";
-       break;
-  }
   $jobsresult = $dbSql->db_link->query( $query );
   
   if( PEAR::isError( $jobsresult ) ) {
@@ -53,42 +35,51 @@
          die("Unable to get last failed jobs from catalog" . $jobsresult->getMessage() );
   }else {
          while( $job = $jobsresult->fetchRow( DB_FETCHMODE_ASSOC ) ) {
-               array_push( $failed_jobs, $job);
+               $elapsed = 'N/A';
+               
+               if( $job['JobStatus'] == 'R') {
+                       $elapsed = mktime() - strtotime($job['StartTime']);
+                       if( $elapsed > 3600 )
+                               $elapsed = date( "H:i:s", $elapsed );
+                       elseif( $elapsed > 86400 )
+                               $elapsed = date( "d day(s) i:s", $elapsed );
+                       else
+                               $elapsed = date( "i:s", $elapsed );
+               }
+               $job['elapsed_time'] = $elapsed;
+               
+               array_push( $running_jobs, $job);
          }
   }
-  $smarty->assign( 'failed_jobs', $failed_jobs );
   
-  // Get the last completed jobs (last 24 hours)
-  $query          = "";
-  $completed_jobs = array();
+  $smarty->assign( 'running_jobs', $running_jobs );
   
-  // Interval calculation
-  $end_date   = mktime();
-  $start_date = $end_date - LAST_DAY;
-                       
-  $start_date = date( "Y-m-d H:m:s", $start_date );
-  $end_date   = date( "Y-m-d H:m:s", $end_date );
+  // Get the last jobs list
+  $query          = "";
+  $last_jobs = array();
   
   switch( $dbSql->driver ) 
   {
        case 'mysql':
-               $query  = "SELECT SEC_TO_TIME( UNIX_TIMESTAMP(Job.EndTime)-UNIX_TIMESTAMP(Job.StartTime) ) AS elapsed, Job.JobId, Job.Name AS job_name, Job.StartTime, Job.EndTime, Job.Level, Pool.Name AS pool_name, Job.JobStatus ";
-               $query .= "FROM Job ";
-               $query .= "LEFT JOIN Pool ON Job.PoolId=Pool.PoolId ";
-               $query .= "WHERE Job.JobStatus = 'T' AND ";
-               $query .= "Job.EndTime BETWEEN '$start_date' AND '$end_date' ";
-               $query .= "ORDER BY Job.EndTime DESC ";  
-               
+               $query  = "SELECT SEC_TO_TIME( UNIX_TIMESTAMP(Job.EndTime)-UNIX_TIMESTAMP(Job.StartTime) ) AS elapsed, ";
        break;
-       
        case 'pgsql':
-               $query  = "SELECT (Job.EndTime - Job.StartTime ) AS elapsed, Job.Name, Job.StartTime, Job.EndTime, Job.Level, Pool.Name, Job.JobStatus ";
-               $query .= "FROM Job ";
-               $query .= "LEFT JOIN Pool ON Job.PoolId=Pool.PoolId ";
-               $query .= "WHERE EndTime BETWEEN '$start_date' and '$end_date' ";
-               $query .= "ORDER BY Job.EndTime DESC";
+               $query  = "SELECT (Job.EndTime - Job.StartTime ) AS elapsed, "; 
        break;
   }
+  
+  $query .= "Job.JobId, Job.Name AS Job_name, Job.StartTime, Job.EndTime, Job.Level, Pool.Name, Job.JobStatus, Pool.Name AS Pool_name, Status.JobStatusLong ";
+  $query .= "FROM Job ";
+  $query .= "LEFT JOIN Pool ON Job.PoolId=Pool.PoolId ";
+  $query .= "LEFT JOIN Status ON Job.JobStatus = Status.JobStatus ";
+  $query .= "ORDER BY Job.EndTime DESC ";
+  
+  // Determine how many jobs to display
+  if( isset($_POST['limit']) )
+       $query .= "LIMIT " . $_POST['limit'];
+  else
+       $query .= "LIMIT 20 ";
+  
   $jobsresult = $dbSql->db_link->query( $query );
   
   if( PEAR::isError( $jobsresult ) ) {
@@ -96,10 +87,21 @@
          die("Unable to get last failed jobs from catalog" . $jobsresult->getMessage() );
   }else {
          while( $job = $jobsresult->fetchRow( DB_FETCHMODE_ASSOC ) ) {
-               array_push( $completed_jobs, $job);
+               // Determine icon for job
+               if( $job['JobStatus'] == 'T' )
+                       $job['Job_icon'] = "s_ok.gif";
+               else
+                       $job['Job_icon'] = "s_error.gif";
+               
+               // Odd or even row
+               if( count($last_jobs) % 2)
+                       $job['Job_classe'] = 'odd';
+                       
+               array_push( $last_jobs, $job);
          }
   }
-  $smarty->assign( 'completed_jobs', $completed_jobs );
+  $smarty->assign( 'last_jobs', $last_jobs );
   
+  // Process and display the template 
   $smarty->display('jobs.tpl');
 ?>