X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=gui%2Fbacula-web%2Fjobs.php;h=5fb6fafbdbb79d44e282f18a7d3b17ee6699d5c9;hb=bed4d6c620101ad0893a1eb28bfdb7bcf7511b00;hp=c140a6c0b5af139de9557ff058ae50a03a3e6e1d;hpb=f6cdfe77e9ecf7ca0399911af2a73be42c129f32;p=bacula%2Fbacula
diff --git a/gui/bacula-web/jobs.php b/gui/bacula-web/jobs.php
index c140a6c0b5..5fb6fafbdb 100644
--- a/gui/bacula-web/jobs.php
+++ b/gui/bacula-web/jobs.php
@@ -8,8 +8,6 @@
$smarty = new Smarty();
$dbSql = new Bweb();
- require("lang.php");
-
// Smarty configuration
$smarty->compile_check = true;
$smarty->debugging = false;
@@ -19,66 +17,58 @@
$smarty->compile_dir = "./templates_c";
$smarty->config_dir = "./configs";
- // 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')";
-
- $jobsresult = $dbSql->db_link->query( $query );
-
- if( PEAR::isError( $jobsresult ) ) {
- echo "SQL query = $query
";
- die("Unable to get last failed jobs from catalog" . $jobsresult->getMessage() );
- }else {
- while( $job = $jobsresult->fetchRow( DB_FETCHMODE_ASSOC ) ) {
- $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( 'running_jobs', $running_jobs );
-
- // Get the last jobs list
+ // 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, ";
- break;
- case 'pgsql':
- $query = "SELECT (Job.EndTime - Job.StartTime ) AS elapsed, ";
- break;
- }
+ // Job Status list
+ $job_status = array( 'Any', 'Waiting', 'Running', 'Completed', 'Failed', 'Canceled' );
+ $smarty->assign( 'job_status', $job_status );
+
+ // Jobs per page
+ $jobs_per_page = array( 25,50,75,100,150 );
+ $smarty->assign( 'jobs_per_page', $jobs_per_page );
+
+ // Global variables
+ $job_level = array( 'D' => 'Diff', 'I' => 'Incr', 'F' => 'Full' );
- $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 .= "SELECT Job.JobId, Job.Name AS Job_name, Job.StartTime, Job.EndTime, Job.Level, Job.JobBytes, Job.JobFiles, 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 ";
+
+ // Filter by status
+ if( isset( $_POST['status'] ) ) {
+ switch( strtolower( $_POST['status'] ) )
+ {
+ case 'running':
+ $query .= "WHERE Job.JobStatus = 'R' ";
+ break;
+ case 'waiting':
+ $query .= "WHERE Job.JobStatus IN ('F','S','M','m','s','j','c','d','t','C') ";
+ break;
+ case 'completed':
+ $query .= "WHERE Job.JobStatus = 'T' ";
+ break;
+ case 'failed':
+ $query .= "WHERE Job.JobStatus IN ('f','E') ";
+ break;
+ case 'canceled':
+ $query .= "WHERE Job.JobStatus = 'A' ";
+ break;
+ }
+ }
+
+ // order by
+ $query .= "ORDER BY Job.JobId DESC ";
// Determine how many jobs to display
- if( isset($_POST['limit']) )
- $query .= "LIMIT " . $_POST['limit'];
+ if( isset($_POST['jobs_per_page']) )
+ $query .= "LIMIT " . $_POST['jobs_per_page'];
else
- $query .= "LIMIT 20 ";
+ $query .= "LIMIT 25 ";
+
+ //echo $query . '
';
$jobsresult = $dbSql->db_link->query( $query );
@@ -87,21 +77,65 @@
die("Unable to get last failed jobs from catalog" . $jobsresult->getMessage() );
}else {
while( $job = $jobsresult->fetchRow( DB_FETCHMODE_ASSOC ) ) {
- // Determine icon for job
- if( $job['JobStatus'] == 'T' )
- $job['Job_icon'] = "s_ok.gif";
- else
- $job['Job_icon'] = "s_error.gif";
+
+ // Determine icon for job status
+ switch( $job['JobStatus'] ) {
+ case 'R':
+ $job['Job_icon'] = "running.png";
+ break;
+ case 'T':
+ $job['Job_icon'] = "s_ok.png";
+ break;
+ case 'A':
+ case 'f':
+ case 'E':
+ $job['Job_icon'] = "s_error.gif";
+ break;
+ case 'F':
+ case 'S':
+ case 'M':
+ case 'm':
+ case 's':
+ case 'j':
+ case 'c':
+ case 'd':
+ case 't':
+ case 'C':
+ $job['Job_icon'] = "waiting.png";
+ break;
+ } // end switch
// Odd or even row
if( count($last_jobs) % 2)
$job['Job_classe'] = 'odd';
-
+
+ // Elapsed time for the job
+ if( $job['StartTime'] == '0000-00-00 00:00:00' )
+ $job['elapsed_time'] = 'N/A';
+ elseif( $job['EndTime'] == '0000-00-00 00:00:00' )
+ $job['elapsed_time'] = $dbSql->Get_ElapsedTime( strtotime($job['StartTime']), mktime() );
+ else
+ $job['elapsed_time'] = $dbSql->Get_ElapsedTime( strtotime($job['StartTime']), strtotime($job['EndTime']) );
+
+ // Job Level
+ $job['Level'] = $job_level[ $job['Level'] ];
+
+ // Job Size
+ $job['JobBytes'] = $dbSql->human_file_size( $job['JobBytes'] );
+
array_push( $last_jobs, $job);
}
}
$smarty->assign( 'last_jobs', $last_jobs );
+ // Count jobs
+ if( isset( $_POST['status'] ) )
+ $total_jobs = $dbSql->CountJobs( ALL, $_POST['status'] );
+ else
+ $total_jobs = $dbSql->CountJobs( ALL );
+
+ $smarty->assign( 'total_jobs', $total_jobs );
+
// Process and display the template
$smarty->display('jobs.tpl');
?>