bacula-web: Added last 24 hours waiting jobs in main dashboard

diff --git a/gui/bacula-web/bweb.inc.php b/gui/bacula-web/bweb.inc.php
index 51f46aed0f66e60344a47b80637634a48d46f4b3..c3ab7cc6af4072c3115d572255d95f49bd4eb5ac 100644 (file)
--- a/gui/bacula-web/bweb.inc.php
+++ b/gui/bacula-web/bweb.inc.php
@@ -371,6 +371,9 @@ class Bweb extends DB {
                                        case 'canceled':
                                                $where_status = "JobStatus = 'A' ";
                                        break;
+                                       case 'waiting':
+                                               $where_status = "JobStatus IN ('F','S','M','m','s','j','c','d','t') ";
+                                       break;
                                } // end switch
                        }
                        

diff --git a/gui/bacula-web/index.php b/gui/bacula-web/index.php
index a393723a0e97dc6ad83ee7fb5caa40730ae5301b..73c1b6abd25cbaaa6b2a087eb9fc00a199c0ff9c 100644 (file)
--- a/gui/bacula-web/index.php
+++ b/gui/bacula-web/index.php
@@ -95,12 +95,15 @@ $smarty->assign( 'total_name_jobs', $dbSql->Get_BackupJob_Names() );
 // Get volumes list (volumes.tpl)
 $smarty->assign('pools', $dbSql->GetVolumeList() );
 
-// Last 24 hours completed jobs number (last_run_report.tpl)
+// Last 24 hours completed jobs number
 $smarty->assign( 'completed_jobs', $dbSql->CountJobs( LAST_DAY, 'completed' ) );
 
-// Last 24 hours failed jobs number (last_run_report.tpl)
+// Last 24 hours failed jobs number
 $smarty->assign( 'failed_jobs', $dbSql->CountJobs( LAST_DAY, 'failed' ) );
 
+// Last 24 hours waiting jobs number
+$smarty->assign( 'waiting_jobs', $dbSql->CountJobs( LAST_DAY, 'waiting' ) );
+
 // Last 24 hours elapsed time (last_run_report.tpl)
 //$smarty->assign( 'elapsed_jobs', $dbSql->Get_ElapsedTime_Job() );
 

diff --git a/gui/bacula-web/templates/index.tpl b/gui/bacula-web/templates/index.tpl
index b7387c5d5e1cd403c7ba16a6961027ee79c748cf..eae6e4b4048879b642adacfb4394d3df1116f8cc 100644 (file)
--- a/gui/bacula-web/templates/index.tpl
+++ b/gui/bacula-web/templates/index.tpl
@@ -78,6 +78,11 @@
                                <td class="info">{$completed_jobs}</td>
                                <td class="info"> <a href="jobs.php" title="View last completed jobs">View</a> </td>
                        </tr> 
+                       <tr>
+                               <td class="label">Waiting jobs</td> 
+                               <td class="info">{$waiting_jobs}</td>
+                               <td class="info"> <a href="jobs.php" title="View last completed jobs">View</a> </td>
+                       </tr> 
                        <!--
                        <tr>
                                <td class="label">Elapsed time</td>