X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=gui%2Fbacula-web%2Fjobs.php;h=5fb6fafbdbb79d44e282f18a7d3b17ee6699d5c9;hb=bed4d6c620101ad0893a1eb28bfdb7bcf7511b00;hp=a16564109046a87be93c54b755a4c00364584d44;hpb=17404b4fd253faabab7e06bbc25dada0d94edc59;p=bacula%2Fbacula
diff --git a/gui/bacula-web/jobs.php b/gui/bacula-web/jobs.php
index a165641090..5fb6fafbdb 100644
--- a/gui/bacula-web/jobs.php
+++ b/gui/bacula-web/jobs.php
@@ -2,14 +2,12 @@
session_start();
require_once ("paths.php");
require_once ($smarty_path."Smarty.class.php");
- require_once ("classes.inc.php");
+ require_once ("bweb.inc.php");
require_once ("config.inc.php");
$smarty = new Smarty();
$dbSql = new Bweb();
- require("lang.php");
-
// Smarty configuration
$smarty->compile_check = true;
$smarty->debugging = false;
@@ -19,76 +17,59 @@
$smarty->compile_dir = "./templates_c";
$smarty->config_dir = "./configs";
- // Get the last 10 failed jobs
+ // Jobs list
$query = "";
- $failed_jobs = array();
+ $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 = '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 );
+ // Job Status list
+ $job_status = array( 'Any', 'Waiting', 'Running', 'Completed', 'Failed', 'Canceled' );
+ $smarty->assign( 'job_status', $job_status );
- 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 ) ) {
- array_push( $failed_jobs, $job);
- }
+ // 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 .= "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 ";
+
+ // 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;
+ }
}
- $smarty->assign( 'failed_jobs', $failed_jobs );
- // Get the last completed jobs (last 24 hours)
- $query = "";
- $completed_jobs = array();
+ // order by
+ $query .= "ORDER BY Job.JobId DESC ";
- // 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 );
+ // Determine how many jobs to display
+ if( isset($_POST['jobs_per_page']) )
+ $query .= "LIMIT " . $_POST['jobs_per_page'];
+ else
+ $query .= "LIMIT 25 ";
+
+ //echo $query . '
';
- 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 ";
-
- 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";
- break;
- }
$jobsresult = $dbSql->db_link->query( $query );
if( PEAR::isError( $jobsresult ) ) {
@@ -96,10 +77,65 @@
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 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( 'completed_jobs', $completed_jobs );
+ $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');
?>