From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 30 Jan 2021 19:17:37 +0000 (+0100)
Subject: baculum: Add job status weather on job list page
X-Git-Tag: Release-11.3.2~265
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f39cf6911d27c4910a37bce71d8fb68005fa4cf2;p=thirdparty%2Fbacula.git

baculum: Add job status weather on job list page
---

diff --git a/gui/baculum/protected/Web/JavaScript/misc.js b/gui/baculum/protected/Web/JavaScript/misc.js
index 516105e28..ec5698e97 100644
--- a/gui/baculum/protected/Web/JavaScript/misc.js
+++ b/gui/baculum/protected/Web/JavaScript/misc.js
@@ -920,6 +920,20 @@ var MsgEnvelope = {
 	}
 };
 
+var Weather = {
+	icons: [
+		'weather_sunny.png',
+		'weather_sun_behind_small_cloud.png',
+		'weather_sun_behind_large_cloud.png',
+		'weather_sun_behind_rain_cloud.png',
+		'weather_cloud_with_rain.png',
+		'weather_cloud_with_lighting_and_rain.png'
+	],
+	get_weather_icon(idx) {
+		return this.icons[idx];
+	}
+};
+
 var W3SideBar = {
 	ids: {
 		sidebar: 'sidebar',
diff --git a/gui/baculum/protected/Web/Lang/en/messages.mo b/gui/baculum/protected/Web/Lang/en/messages.mo
index 8bcba4f1b..cd34cb87e 100644
Binary files a/gui/baculum/protected/Web/Lang/en/messages.mo and b/gui/baculum/protected/Web/Lang/en/messages.mo differ
diff --git a/gui/baculum/protected/Web/Lang/en/messages.po b/gui/baculum/protected/Web/Lang/en/messages.po
index e8a007494..ad856d8de 100644
--- a/gui/baculum/protected/Web/Lang/en/messages.po
+++ b/gui/baculum/protected/Web/Lang/en/messages.po
@@ -3202,3 +3202,9 @@ msgstr "Truncate log"
 
 msgid "Messages"
 msgstr "Messages"
+
+msgid "Last %errors/%count jobs finished with error."
+msgstr "Last %errors/%count jobs finished with error."
+
+msgid "All last %count jobs finished successfully."
+msgstr "All last %count jobs finished successfully."
diff --git a/gui/baculum/protected/Web/Lang/ja/messages.mo b/gui/baculum/protected/Web/Lang/ja/messages.mo
index 2f9f65b36..fa72c70d8 100644
Binary files a/gui/baculum/protected/Web/Lang/ja/messages.mo and b/gui/baculum/protected/Web/Lang/ja/messages.mo differ
diff --git a/gui/baculum/protected/Web/Lang/ja/messages.po b/gui/baculum/protected/Web/Lang/ja/messages.po
index 3f40e3251..f69f6561e 100644
--- a/gui/baculum/protected/Web/Lang/ja/messages.po
+++ b/gui/baculum/protected/Web/Lang/ja/messages.po
@@ -3288,3 +3288,9 @@ msgstr "Truncate log"
 
 msgid "Messages"
 msgstr "Messages"
+
+msgid "Last %errors/%count jobs finished with error."
+msgstr "Last %errors/%count jobs finished with error."
+
+msgid "All last %count jobs finished successfully."
+msgstr "All last %count jobs finished successfully."
diff --git a/gui/baculum/protected/Web/Lang/pl/messages.mo b/gui/baculum/protected/Web/Lang/pl/messages.mo
index 781cd396b..ea8e492e1 100644
Binary files a/gui/baculum/protected/Web/Lang/pl/messages.mo and b/gui/baculum/protected/Web/Lang/pl/messages.mo differ
diff --git a/gui/baculum/protected/Web/Lang/pl/messages.po b/gui/baculum/protected/Web/Lang/pl/messages.po
index 132a3c473..7d77e9985 100644
--- a/gui/baculum/protected/Web/Lang/pl/messages.po
+++ b/gui/baculum/protected/Web/Lang/pl/messages.po
@@ -3213,3 +3213,9 @@ msgstr "Przytnij dziennik"
 
 msgid "Messages"
 msgstr "Wiadomości"
+
+msgid "Last %errors/%count jobs finished with error."
+msgstr "Ostatnie %errors/%count zadań zakończyło się błędem."
+
+msgid "All last %count jobs finished successfully."
+msgstr "Wszystkie ostatnie %count zadań zakończyło się pomyślnie."
diff --git a/gui/baculum/protected/Web/Lang/pt/messages.mo b/gui/baculum/protected/Web/Lang/pt/messages.mo
index c06cc1ad9..02b84df54 100644
Binary files a/gui/baculum/protected/Web/Lang/pt/messages.mo and b/gui/baculum/protected/Web/Lang/pt/messages.mo differ
diff --git a/gui/baculum/protected/Web/Lang/pt/messages.po b/gui/baculum/protected/Web/Lang/pt/messages.po
index e5f77bb31..29e76371c 100644
--- a/gui/baculum/protected/Web/Lang/pt/messages.po
+++ b/gui/baculum/protected/Web/Lang/pt/messages.po
@@ -3212,3 +3212,9 @@ msgstr "Truncate log"
 
 msgid "Messages"
 msgstr "Messages"
+
+msgid "Last %errors/%count jobs finished with error."
+msgstr "Last %errors/%count jobs finished with error."
+
+msgid "All last %count jobs finished successfully."
+msgstr "All last %count jobs finished successfully."
diff --git a/gui/baculum/protected/Web/Lang/ru/messages.mo b/gui/baculum/protected/Web/Lang/ru/messages.mo
index 3fb88d8f1..128d8f257 100644
Binary files a/gui/baculum/protected/Web/Lang/ru/messages.mo and b/gui/baculum/protected/Web/Lang/ru/messages.mo differ
diff --git a/gui/baculum/protected/Web/Lang/ru/messages.po b/gui/baculum/protected/Web/Lang/ru/messages.po
index 3f0e32762..b47763d69 100644
--- a/gui/baculum/protected/Web/Lang/ru/messages.po
+++ b/gui/baculum/protected/Web/Lang/ru/messages.po
@@ -3212,3 +3212,9 @@ msgstr "Truncate log"
 
 msgid "Messages"
 msgstr "Messages"
+
+msgid "Last %errors/%count jobs finished with error."
+msgstr "Last %errors/%count jobs finished with error."
+
+msgid "All last %count jobs finished successfully."
+msgstr "All last %count jobs finished successfully."
diff --git a/gui/baculum/protected/Web/Pages/JobHistoryList.page b/gui/baculum/protected/Web/Pages/JobHistoryList.page
index e2f30d7c8..5e3d8cf3f 100644
--- a/gui/baculum/protected/Web/Pages/JobHistoryList.page
+++ b/gui/baculum/protected/Web/Pages/JobHistoryList.page
@@ -149,7 +149,7 @@ function hide_btn_loader(jobid) {
 	}
 }
 
-var oJobList = {
+var oJobHistoryList = {
 	table: null,
 	table_toolbar: null,
 	actions: [
@@ -469,7 +469,7 @@ var oJobList = {
 };
 MonitorParams = {jobs: null};
 $(function() {
-	MonitorCallsInterval.push(function() { oJobList.init(); });
+	MonitorCallsInterval.push(function() { oJobHistoryList.init(); });
 });
 
 /**
@@ -496,7 +496,7 @@ var bulk_actions_output_id = '<%=$this->SourceTemplateControl->BulkActions->Bulk
 	</prop:ClientSide.OnLoading>
 	<prop:ClientSide.OnComplete>
 		oBulkActionsModal.show_loader(false);
-		oJobList.table_toolbar.style.display = 'none';
+		oJobHistoryList.table_toolbar.style.display = 'none';
 		oMonitor();
 	</prop:ClientSide.OnComplete>
 </com:TCallback>
diff --git a/gui/baculum/protected/Web/Pages/JobList.page b/gui/baculum/protected/Web/Pages/JobList.page
index 180142230..9973ae4fa 100644
--- a/gui/baculum/protected/Web/Pages/JobList.page
+++ b/gui/baculum/protected/Web/Pages/JobList.page
@@ -22,6 +22,7 @@
 			<thead>
 				<tr>
 					<th></th>
+					<th><%[ Status ]%></th>
 					<th><%[ Name ]%></th>
 					<th><%[ Director ]%></th>
 					<th><%[ Actions ]%></th>
@@ -31,6 +32,7 @@
 			<tfoot>
 				<tr>
 					<th></th>
+					<th><%[ Status ]%></th>
 					<th><%[ Name ]%></th>
 					<th><%[ Director ]%></th>
 					<th><%[ Actions ]%></th>
@@ -40,16 +42,21 @@
 	</div>
 	<com:Application.Web.Portlets.RunJob ID="RunJobModal" />
 <script type="text/javascript">
-var oJobHistoryList = {
+var oJobList = {
 	ids: {
 		job_history_list: 'job_history_list',
 		job_history_list_body: 'job_history_list_body'
 	},
+	css: {
+		weather_icon: 'job_weather_icon'
+	},
+	table: null,
+	job_weather: {},
 	init: function() {
 		this.set_table();
 	},
 	set_table: function() {
-		var table = $('#' + this.ids.job_history_list).DataTable({
+		this.table = $('#' + this.ids.job_history_list).DataTable({
 			data: <%=json_encode($this->jobs)%>,
 			deferRender: true,
 			dom: 'lBfrtip',
@@ -64,11 +71,42 @@ var oJobHistoryList = {
 					data: null,
 					defaultContent: '<button type="button" class="w3-button w3-blue"><i class="fa fa-angle-down"></i></button>'
 				},
+				{
+					data: 'job',
+					render: function(data, type, row) {
+						var ret = '';
+						if (Object.keys(this.job_weather).length > 0) {
+							if (type == 'display' || type == 'filter') {
+								if (!this.job_weather.hasOwnProperty(data)) {
+									// for jobs that haven't been never running
+									this.job_weather[data] = {count: 0, error: 0};
+								}
+								var icon = Weather.get_weather_icon(this.job_weather[data].error);
+								var img = document.createElement('IMG');
+								img.src = '<%=$this->getPage()->getTheme()->getBaseUrl()%>/' + icon;
+								img.className = this.css.weather_icon;
+								var title;
+								if (this.job_weather[data].error > 0) {
+									title = '<%[ Last %errors/%count jobs finished with error. ]%>';
+								} else {
+									title = '<%[ All last %count jobs finished successfully. ]%>';
+								}
+								title = title.replace('%errors', this.job_weather[data].error);
+								title = title.replace('%count', this.job_weather[data].count);
+								img.title = title;
+								ret = img.outerHTML;
+							} else if (type == 'sort') {
+								ret = this.job_weather[data].error;
+							}
+						}
+						return ret;
+					}.bind(this)
+				},
 				{data: 'job'},
 				{data: 'director'},
 				{
 					data: 'job',
-					render: function (data, type, row) {
+					render: function(data, type, row) {
 						var btn = document.createElement('BUTTON');
 						btn.className = 'w3-button w3-green';
 						btn.type = 'button';
@@ -95,11 +133,11 @@ var oJobHistoryList = {
 			},
 			{
 				className: "dt-center",
-				targets: [ 3 ]
+				targets: [ 4 ]
 			}],
-			order: [1, 'asc'],
+			order: [2, 'asc'],
 			initComplete: function () {
-				this.api().columns([1, 2]).every(function () {
+				this.api().columns([2, 3]).every(function () {
 					var column = this;
 					var select = $('<select><option value=""></option></select>')
 					.appendTo($(column.footer()).empty())
@@ -121,8 +159,29 @@ var oJobHistoryList = {
 				});
 			}
 		});
+	},
+	set_weather: function() {
+		var jobs = oData.terminated_jobs;
+		var jobs_len = jobs.length;
+		for (var i = 0; i < jobs_len; i++) {
+			if (!this.job_weather.hasOwnProperty(jobs[i].name)) {
+				this.job_weather[jobs[i].name] = {count: 0, error: 0};
+			}
+			if (this.job_weather[jobs[i].name].count >= 5) {
+				continue;
+			}
+			this.job_weather[jobs[i].name].count++;
+			if (JobStatus.is_error(jobs[i].jobstatus)) {
+				this.job_weather[jobs[i].name].error++;
+			}
+		}
+		this.table.rows().invalidate('data').draw(false);
 	}
 };
-oJobHistoryList.init();
+oJobList.init();
+MonitorParams = {jobs: null};
+$(function() {
+	MonitorCalls.push(oJobList.set_weather.bind(oJobList));
+});
 </script>
 </com:TContent>
diff --git a/gui/baculum/themes/Baculum-v2/css/baculum.css b/gui/baculum/themes/Baculum-v2/css/baculum.css
index 38ad6a4dd..c9bf052dd 100644
--- a/gui/baculum/themes/Baculum-v2/css/baculum.css
+++ b/gui/baculum/themes/Baculum-v2/css/baculum.css
@@ -526,3 +526,11 @@ table.component td:nth-of-type(1) {
 .blink {
   animation: blinker 4s linear infinite;
 }
+
+img.job_weather_icon {
+	display: block;
+	margin: 0 auto;
+	height: 32px;
+	width: 32px;
+	cursor: help;
+}