From: Marcin Haba <marcin.haba@bacula.pl>
Date: Mon, 30 Mar 2015 00:33:39 +0000 (+0200)
Subject: baculum: Jobs working refresh in realtime and add new tray bar
X-Git-Tag: Release-7.2.0~54
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1ea4f6d275095efa556a3a5807e4ecf3b5911d64;p=bacula%2Fbacula

baculum: Jobs working refresh in realtime and add new tray bar
---

diff --git a/gui/baculum/protected/JavaScript/slide-window.js b/gui/baculum/protected/JavaScript/slide-window.js
index 9e3f499f87..44e1545828 100644
--- a/gui/baculum/protected/JavaScript/slide-window.js
+++ b/gui/baculum/protected/JavaScript/slide-window.js
@@ -138,6 +138,10 @@ var SlideWindowClass = Class.create({
 			}.bind(this)
 		});
 	},
+
+	isWindowOpen: function() {
+		return !(this.window.style.display === 'none');
+	},
 	
 	resetSize : function() {
 		if(this.isConfigurationOpen()) {
diff --git a/gui/baculum/protected/Lang/en/messages.mo b/gui/baculum/protected/Lang/en/messages.mo
index 5b75739980..6bf2bb9bfb 100644
Binary files a/gui/baculum/protected/Lang/en/messages.mo and b/gui/baculum/protected/Lang/en/messages.mo differ
diff --git a/gui/baculum/protected/Lang/en/messages.po b/gui/baculum/protected/Lang/en/messages.po
index a2457c4895..22242be45d 100644
--- a/gui/baculum/protected/Lang/en/messages.po
+++ b/gui/baculum/protected/Lang/en/messages.po
@@ -1003,3 +1003,10 @@ msgstr "Verify by JobId"
 
 msgid "Verify option:"
 msgstr "Verify option:"
+
+msgid "Running jobs:"
+msgstr "Running jobs:"
+
+msgid "Finished jobs:"
+msgstr "Finished jobs:"
+
diff --git a/gui/baculum/protected/Lang/pl/messages.mo b/gui/baculum/protected/Lang/pl/messages.mo
index f05d48bc1e..417ecba3fa 100644
Binary files a/gui/baculum/protected/Lang/pl/messages.mo and b/gui/baculum/protected/Lang/pl/messages.mo differ
diff --git a/gui/baculum/protected/Lang/pl/messages.po b/gui/baculum/protected/Lang/pl/messages.po
index b0d5575c49..9cccbab7d3 100644
--- a/gui/baculum/protected/Lang/pl/messages.po
+++ b/gui/baculum/protected/Lang/pl/messages.po
@@ -1005,3 +1005,9 @@ msgstr "Weryfikuj na podstawie JobId"
 msgid "Verify option:"
 msgstr "Opcja weryfikacji:"
 
+msgid "Running jobs:"
+msgstr "Uruchomione zadania:"
+
+msgid "Finished jobs:"
+msgstr "Zakończone zadania:"
+
diff --git a/gui/baculum/protected/Pages/Home.page b/gui/baculum/protected/Pages/Home.page
index 6660973a4f..75341c00e8 100644
--- a/gui/baculum/protected/Pages/Home.page
+++ b/gui/baculum/protected/Pages/Home.page
@@ -9,6 +9,7 @@
 			<com:TActiveLinkButton ID="Workspace" Text="<%[ Workspace ]%>" Attributes.onclick="PanelWindow.show('container');" />
 			<com:TActiveLinkButton ID="Graphs" Text="<%[ Graphs ]%>" Attributes.onclick="PanelWindow.show('graphs');" />
 		</div>
+		<com:Application.Portlets.TrayBar ID="TrayBar" />
 	</div>
 	<div id="container">
 		<div id="menu-left">
@@ -100,6 +101,7 @@
 	</div>
 	<div id="bottom"></div>
 	<script type="text/javascript">
+		var oMonitor;
 		document.observe("dom:loaded", function() {
 			<%=(!is_null($this->openWindow) ?
 				'$("' . $this->openWindow . '").click(); window.history.pushState("", "", "/");'
diff --git a/gui/baculum/protected/Pages/Monitor.php b/gui/baculum/protected/Pages/Monitor.php
new file mode 100644
index 0000000000..59b495db69
--- /dev/null
+++ b/gui/baculum/protected/Pages/Monitor.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Bacula® - The Network Backup Solution
+ * Baculum - Bacula web interface
+ *
+ * Copyright (C) 2013-2015 Marcin Haba
+ *
+ * The main author of Baculum is Marcin Haba.
+ * The main author of Bacula is Kern Sibbald, with contributions from many
+ * others, a complete list can be found in the file AUTHORS.
+ *
+ * You may use this file and others of this release according to the
+ * license defined in the LICENSE file, which includes the Affero General
+ * Public License, v3.0 ("AGPLv3") and some additional permissions and
+ * terms pursuant to its AGPLv3 Section 7.
+ *
+ * Bacula® is a registered trademark of Kern Sibbald.
+ */
+
+class Monitor extends BaculumPage {
+	public function onInit($param) {
+		parent::onInit($param);
+		$_SESSION['monitor_data'] = array('jobs' => array(), 'running_jobs' => array(), 'terminated_jobs' => array());
+		$_SESSION['monitor_data']['jobs'] = $this->Application->getModule('api')->get(array('jobs'))->output;
+
+		$runningJobStates = $this->Application->getModule('misc')->getRunningJobStates();
+
+		for ($i = 0; $i < count($_SESSION['monitor_data']['jobs']); $i++) {
+			if (in_array($_SESSION['monitor_data']['jobs'][$i]->jobstatus, $runningJobStates)) {
+				$_SESSION['monitor_data']['running_jobs'][] = $_SESSION['monitor_data']['jobs'][$i];
+			} else {
+				$_SESSION['monitor_data']['terminated_jobs'][] = $_SESSION['monitor_data']['jobs'][$i];
+			}
+		}
+		echo json_encode($_SESSION['monitor_data']);
+		exit();
+	}
+}
+
+?>
diff --git a/gui/baculum/protected/Pages/config.xml b/gui/baculum/protected/Pages/config.xml
index 18bd4b30ec..246b9b7ec2 100644
--- a/gui/baculum/protected/Pages/config.xml
+++ b/gui/baculum/protected/Pages/config.xml
@@ -2,7 +2,7 @@
 <configuration>
   <authorization>
     <allow pages="BaculumError,Requirements" users="*" />
-    <allow pages="Home,RestoreWizard,API.*" roles="admin,user" />
+    <allow pages="Home,RestoreWizard,API.*,Monitor" roles="admin,user" />
     <allow pages="ConfigurationWizard" roles="admin" />
     <deny users="*" />
   </authorization>
diff --git a/gui/baculum/protected/Portlets/JobConfiguration.php b/gui/baculum/protected/Portlets/JobConfiguration.php
index 81d3a3348d..8e92ce197f 100644
--- a/gui/baculum/protected/Portlets/JobConfiguration.php
+++ b/gui/baculum/protected/Portlets/JobConfiguration.php
@@ -17,6 +17,7 @@
  * Bacula® is a registered trademark of Kern Sibbald.
  */
 
+Prado::using('System.Web.UI.ActiveControls.TActiveHiddenField');
 Prado::using('System.Web.UI.ActiveControls.TActivePanel');
 Prado::using('Application.Portlets.Portlets');
 
@@ -108,10 +109,19 @@ class JobConfiguration extends Portlets {
 
 		$this->Priority->Text = ($jobdata->priorjobid == 0) ? self::DEFAULT_JOB_PRIORITY : $jobdata->priorjobid;
 		$this->DeleteButton->Visible = true;
-		$this->CancelButton->Visible = in_array($jobdata->jobstatus, $runningJobStates);
+		$this->CancelButton->Visible = $this->RefreshStart->Value = in_array($jobdata->jobstatus, $runningJobStates);
 	}
 
 	public function status($sender, $param) {
+		$refreshStart = false;
+		for ($i = 0; $i < count($_SESSION['monitor_data']['running_jobs']); $i++) {
+			if ($_SESSION['monitor_data']['running_jobs'][$i]->jobid == $this->JobID->Text) {
+				$refreshStart = true;
+				break;
+			}
+		}
+		$this->RefreshStart->Value = $refreshStart;
+
 		$joblog = $this->Application->getModule('api')->get(array('joblog', $this->JobID->Text))->output;
 		$this->Estimation->Text = is_array($joblog) ? implode(PHP_EOL, $joblog) : Prado::localize("Output for selected job is not available yet or you do not have enabled logging job logs to catalog database. For watching job log there is need to add to the job Messages resource next directive: console = all, !skipped, !saved");
 	}
diff --git a/gui/baculum/protected/Portlets/JobConfiguration.tpl b/gui/baculum/protected/Portlets/JobConfiguration.tpl
index 1052462f13..1f9141a3a0 100644
--- a/gui/baculum/protected/Portlets/JobConfiguration.tpl
+++ b/gui/baculum/protected/Portlets/JobConfiguration.tpl
@@ -114,11 +114,17 @@
 		<com:TCallback ID="ReloadJobs" OnCallback="Page.JobWindow.prepareData" ClientSide.OnComplete="SlideWindow.getObj('JobWindow').setLoadRequest();" />
 		<script type="text/javascript">
 			var job_callback_func = function() {
-				var mainForm = Prado.Validation.getForm();
-				var callback = <%=$this->ReloadJobs->ActiveControl->Javascript%>;
-				if (Prado.Validation.managers[mainForm].getValidatorsWithError('JobGroup').length == 0) {
-					SlideWindow.getObj('JobWindow').markAllChecked(false);
-					callback.dispatch();
+				/*
+				 * Check if Job list window is open and if any checkbox from actions is not checked.
+				 * If yes, then is possible to refresh Job list window.
+				 */
+				if(SlideWindow.getObj('JobWindow').isWindowOpen() === true && SlideWindow.getObj('JobWindow').areActionsOpen() === false) {
+					var mainForm = Prado.Validation.getForm();
+					var callback = <%=$this->ReloadJobs->ActiveControl->Javascript%>;
+					if (Prado.Validation.managers[mainForm].getValidatorsWithError('JobGroup').length == 0) {
+						SlideWindow.getObj('JobWindow').markAllChecked(false);
+						callback.dispatch();
+					}
 				}
 			}
 		</script>
@@ -126,8 +132,27 @@
 			<com:BActiveButton ID="Status" Text="<%[ Job status ]%>" CausesValidation="false" OnClick="status" ClientSide.OnSuccess="ConfigurationWindow.getObj('JobWindow').progress(false);job_callback_func();" CssClass="bbutton" />
 			<com:TActiveLabel ID="DeleteButton"><com:BActiveButton ID="Delete" Text="<%[ Delete job ]%>" CausesValidation="false" OnClick="delete" ClientSide.OnSuccess="ConfigurationWindow.getObj('JobWindow').progress(false);job_callback_func();" CssClass="bbutton" /> </com:TActiveLabel>
 			<com:TActiveLabel ID="CancelButton"><com:BActiveButton ID="Cancel" Text="<%[ Cancel job ]%>" CausesValidation="false" OnClick="cancel" ClientSide.OnSuccess="ConfigurationWindow.getObj('JobWindow').progress(false);job_callback_func();" CssClass="bbutton" /> </com:TActiveLabel>
-			<com:BActiveButton ID="Run" Text="<%[ Run job again ]%>" ValidationGroup="JobGroup" CausesValidation="true" OnClick="run_again" ClientSide.OnSuccess="ConfigurationWindow.getObj('JobWindow').progress(false);job_callback_func();"/>
+			<com:BActiveButton ID="Run" Text="<%[ Run job again ]%>" ValidationGroup="JobGroup" CausesValidation="true" OnClick="run_again" ClientSide.OnSuccess="ConfigurationWindow.getObj('JobWindow').progress(false);job_callback_func();oMonitor();"/>
 		</div>
+		<com:TCallback ID="RefreshStatus" OnCallback="status" ClientSide.OnComplete="status_callback_timeout = setTimeout('status_callback_func()', 10000);" />
+		<script type="text/javascript">
+			var status_callback_timeout;
+			var status_prev = false;
+			var status_callback_func = function() {
+				if(status_callback_timeout) {
+					clearTimeout(status_callback_timeout);
+				}
+				if($('<%=$this->getID()%>configuration').visible() && ($('<%=$this->RefreshStart->ClientID%>').value === 'true' || status_prev === true)) {
+					status_prev = ($('<%=$this->RefreshStart->ClientID%>').value === 'true');
+					var callback = <%=$this->RefreshStatus->ActiveControl->Javascript%>;
+					oMonitor();
+					callback.dispatch();
+				} else {
+					status_prev = false;
+				}
+			}
+		</script>
+		<com:TActiveHiddenField ID="RefreshStart" />
 		<div class="text small"><%[ Console status ]%></div>
 		<div class="field-full" style="min-height: 166px">
 			<com:TActiveTextBox ID="Estimation" TextMode="MultiLine" CssClass="textbox-auto" Style="height: 145px" ReadOnly="true" />
diff --git a/gui/baculum/protected/Portlets/JobList.tpl b/gui/baculum/protected/Portlets/JobList.tpl
index d7ccc5dd7d..7e20d226e9 100644
--- a/gui/baculum/protected/Portlets/JobList.tpl
+++ b/gui/baculum/protected/Portlets/JobList.tpl
@@ -65,6 +65,7 @@
 		<prop:ClientSide.OnComplete>
 			ConfigurationWindow.getObj('JobWindow').show();
 			ConfigurationWindow.getObj('JobWindow').progress(false);
+			status_callback_func();
 		</prop:ClientSide.OnComplete>
 	</com:TCallback>
 </com:TContent>
diff --git a/gui/baculum/protected/Portlets/JobRunConfiguration.tpl b/gui/baculum/protected/Portlets/JobRunConfiguration.tpl
index e0500c994d..44e948a155 100644
--- a/gui/baculum/protected/Portlets/JobRunConfiguration.tpl
+++ b/gui/baculum/protected/Portlets/JobRunConfiguration.tpl
@@ -133,7 +133,7 @@
 			<div class="field"><com:TActiveCheckBox ID="Accurate" AutoPostBack="false" /></div>
 		</com:TPanel>
 		<com:TPanel ID="EstimateLine" CssClass="button">
-			<com:Application.Portlets.BActiveButton ID="Estimate" Text="<%[ Estimate job ]%>" OnClick="estimate"  ClientSide.OnSuccess="ConfigurationWindow.getObj('JobRunWindow').progress(false);jobrun_callback_func();" />
+			<com:Application.Portlets.BActiveButton ID="Estimate" Text="<%[ Estimate job ]%>" OnClick="estimate"  ClientSide.OnSuccess="ConfigurationWindow.getObj('JobRunWindow').progress(false);jobrun_callback_func();oMonitor();" />
 		</com:TPanel>
 	</com:TActivePanel>
 </com:TContent>
diff --git a/gui/baculum/protected/Portlets/TrayBar.php b/gui/baculum/protected/Portlets/TrayBar.php
new file mode 100644
index 0000000000..8a19981c92
--- /dev/null
+++ b/gui/baculum/protected/Portlets/TrayBar.php
@@ -0,0 +1,25 @@
+
+<?php
+/**
+ * Bacula® - The Network Backup Solution
+ * Baculum - Bacula web interface
+ *
+ * Copyright (C) 2013-2015 Marcin Haba
+ *
+ * The main author of Baculum is Marcin Haba.
+ * The main author of Bacula is Kern Sibbald, with contributions from many
+ * others, a complete list can be found in the file AUTHORS.
+ *
+ * You may use this file and others of this release according to the
+ * license defined in the LICENSE file, which includes the Affero General
+ * Public License, v3.0 ("AGPLv3") and some additional permissions and
+ * terms pursuant to its AGPLv3 Section 7.
+ *
+ * Bacula® is a registered trademark of Kern Sibbald.
+ */
+
+Prado::using('Application.Portlets.Portlets');
+
+class TrayBar extends Portlets {
+
+}
diff --git a/gui/baculum/protected/Portlets/TrayBar.tpl b/gui/baculum/protected/Portlets/TrayBar.tpl
new file mode 100644
index 0000000000..7fedf0b50e
--- /dev/null
+++ b/gui/baculum/protected/Portlets/TrayBar.tpl
@@ -0,0 +1,32 @@
+<div id="tray_bar">
+	<img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/gearwheel-icon.png" alt="<%[ Running jobs: ]%>" /> <%[ Running jobs: ]%> <span class="bold" id="running_jobs"></span>
+	<img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/check-icon.png" alt="<%[ Finished jobs: ]%>" /> <%[ Finished jobs: ]%> <span class="bold" id="finished_jobs"></span>
+</div>
+<script type="text/javascript">
+	var oMonitor;
+	var default_refresh_interval = 60000;
+	var default_fast_refresh_interval = 10000;
+	var timeout_handler;
+	document.observe("dom:loaded", function() {
+		oMonitor = function() {
+			return new Ajax.Request('<%=$this->Service->constructUrl("Monitor")%>', {
+				onSuccess: function(response) {
+					if (timeout_handler) {
+						clearTimeout(timeout_handler);
+					}
+					var jobs = (response.responseText).evalJSON();
+					if (jobs.running_jobs.length > 0) {
+						refreshInterval = default_fast_refresh_interval;
+					} else {
+						refreshInterval = default_refresh_interval;
+					}
+					job_callback_func();
+					$('running_jobs').update(jobs.running_jobs.length);
+					$('finished_jobs').update(jobs.terminated_jobs.length);
+					timeout_handler = setTimeout("oMonitor()", refreshInterval);
+ 				}
+			});
+		};
+		oMonitor();
+	});
+	</script>
diff --git a/gui/baculum/protected/application.xml b/gui/baculum/protected/application.xml
index bf154c9bd4..d6438c8e46 100644
--- a/gui/baculum/protected/application.xml
+++ b/gui/baculum/protected/application.xml
@@ -14,6 +14,7 @@
 			<url ServiceParameter="ConfigurationWizard" pattern="wizard/" />
 			<url ServiceParameter="RestoreWizard" pattern="restore/" />
 			<url ServiceParameter="BaculumError" pattern="message/{error}/" parameters.error="\d+" />
+			<url ServiceParameter="Monitor" pattern="monitor/" />
 			<!-- START Directors -->
 			<url ServiceParameter="API.Directors" pattern="directors/" />
 			<!-- END Directors -->
diff --git a/gui/baculum/themes/Baculum-v1/check-icon.png b/gui/baculum/themes/Baculum-v1/check-icon.png
new file mode 100644
index 0000000000..004d3b5b1b
Binary files /dev/null and b/gui/baculum/themes/Baculum-v1/check-icon.png differ
diff --git a/gui/baculum/themes/Baculum-v1/gearwheel-icon.png b/gui/baculum/themes/Baculum-v1/gearwheel-icon.png
new file mode 100644
index 0000000000..f410812296
Binary files /dev/null and b/gui/baculum/themes/Baculum-v1/gearwheel-icon.png differ
diff --git a/gui/baculum/themes/Baculum-v1/style.css b/gui/baculum/themes/Baculum-v1/style.css
index 28867b6b11..09a41ac597 100644
--- a/gui/baculum/themes/Baculum-v1/style.css
+++ b/gui/baculum/themes/Baculum-v1/style.css
@@ -113,7 +113,7 @@ a:hover {
 	z-index: 100;
 }
 
-#directors, #panel_switcher {
+#directors, #panel_switcher, #tray_bar {
 	float: right;
 	font-size: 12px;
 }
@@ -129,6 +129,20 @@ a:hover {
 	font-weight: bold;
 }
 
+#tray_bar {
+	margin: 2px 30px 2px 0;
+}
+
+#tray_bar img {
+	float: none;
+	margin: 0;
+	padding: auto 12px;
+}
+
+#tray_bar span{
+	font-size: 14px;
+}
+
 div.configuration {
 	width: 45%;
 	height: 575px;