- 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 EndTime <= NOW() and EndTime > NOW() - 86400 * interval '1 second' ";
- $query .= "ORDER BY Job.EndTime DESC";
- $query .= "LIMIT 10";
- break;
+ $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;
+ }