- Added new constant OPT_MINUTES to FilterWidgetLib

- Now is it possible to use minutes and hours in the FilterWidget
- LogsViewer tool now displays milliseconds for execution time column
- Changed filters for LogsViewer tool

application/libraries/FilterWidgetLib.php

@@ -93,6 +93,7 @@ class FilterWidgetLib
 	const OP_NOT_SET = 'nset';
 
 	// Filter options values
+	const OPT_MINUTES = 'minutes';
 	const OPT_HOURS = 'hours';
 	const OPT_DAYS = 'days';
 	const OPT_MONTHS = 'months';
@@ -887,7 +888,8 @@ class FilterWidgetLib
 						&& isset($filterDefinition->option)
 						&& ($filterDefinition->option == self::OPT_HOURS
 						|| $filterDefinition->option == self::OPT_DAYS
-						|| $filterDefinition->option == self::OPT_MONTHS))
+						|| $filterDefinition->option == self::OPT_MONTHS
+						|| $filterDefinition->option == self::OPT_MINUTES))
 					{
 						$condition = '< (NOW() - \''.$filterDefinition->condition.' '.$filterDefinition->option.'\'::interval)';
 					}
@@ -903,7 +905,8 @@ class FilterWidgetLib
 						&& isset($filterDefinition->option)
 						&& ($filterDefinition->option == self::OPT_HOURS
 						|| $filterDefinition->option == self::OPT_DAYS
-						|| $filterDefinition->option == self::OPT_MONTHS))
+						|| $filterDefinition->option == self::OPT_MONTHS
+						|| $filterDefinition->option == self::OPT_MINUTES))
 					{
 						$condition = '> (NOW() - \''.$filterDefinition->condition.' '.$filterDefinition->option.'\'::interval)';
 					}

application/views/system/logs/logsViewerData.php

@@ -25,7 +25,7 @@
 		),
 		'formatRow' => function($datasetRaw) {
 
-			$datasetRaw->ExecutionTime = date_format(date_create($datasetRaw->ExecutionTime), 'd.m.Y H:i:s');
+			$datasetRaw->ExecutionTime = date_format(date_create($datasetRaw->ExecutionTime), 'd.m.Y H:i:s:u');
 
 			return $datasetRaw;
 		},
@@ -33,22 +33,22 @@
 
 			$mark = '';
 
-			if ($datasetRaw->RequestId == 'Cronjob error')
+			if (strpos($datasetRaw->RequestId, 'error') != false)
 			{
 				$mark = 'text-red';
 			}
 
-			if ($datasetRaw->RequestId == 'Cronjob info')
+			if (strpos($datasetRaw->RequestId, 'info') != false)
 			{
 				$mark = 'text-green';
 			}
 
-			if ($datasetRaw->RequestId == 'Cronjob warning')
+			if (strpos($datasetRaw->RequestId, 'warning') != false)
 			{
 				$mark = 'text-orange';
 			}
 
-			if ($datasetRaw->RequestId == 'Cronjob debug')
+			if (strpos($datasetRaw->RequestId, 'debug') != false)
 			{
 				$mark = 'text-info';
 			}
@@ -63,3 +63,4 @@
 
 	echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray);
 ?>
+

public/js/FilterWidget.js

@@ -824,6 +824,8 @@ var FHC_FilterWidget = {
 			html += "</span>";
 			html += "<span>";
 			html += "	<select class='" + classOption + "' " + disabled + ">";
+			html += "		<option value='minutes' " + (appliedFilter.option == "minutes" ? "selected" : "") + ">Minutes</option>";
+			html += "		<option value='hours' " + (appliedFilter.option == "hours" ? "selected" : "") + ">Hours</option>";
 			html += "		<option value='days' " + (appliedFilter.option == "days" ? "selected" : "") + ">Days</option>";
 			html += "		<option value='months' " + (appliedFilter.option == "months" ? "selected" : "") + ">Months</option>";
 			html += "	</select>";

system/filtersupdate.php

@@ -438,13 +438,13 @@ $filters = array(
 	array(
 		'app' => 'core',
 		'dataset_name' => 'logs',
-		'filter_kurzbz' => 'last7days',
-		'description' => '{Last 7 days logs}',
+		'filter_kurzbz' => 'last1min',
+		'description' => '{Last minute logs}',
 		'sort' => 1,
 		'default_filter' => true,
 		'filter' => '
 			{
-				"name": "All logs from the last 7 days",
+				"name": "All logs from the last minute",
 				"columns": [
 					{"name": "RequestId"},
 					{"name": "ExecutionTime"},
@@ -456,8 +456,8 @@ $filters = array(
 					{
 						"name": "ExecutionTime",
 						"operation": "lt",
-						"condition": "7",
-						"option": "days"
+						"condition": "1",
+						"option": "minutes"
 					}
 				]
 			}
@@ -467,13 +467,13 @@ $filters = array(
 	array(
 		'app' => 'core',
 		'dataset_name' => 'logs',
-		'filter_kurzbz' => 'jobs14days',
-		'description' => '{Last 14 days jobs logs}',
+		'filter_kurzbz' => 'jobs24hours',
+		'description' => '{Last 24 hours jobs logs}',
 		'sort' => 2,
 		'default_filter' => false,
 		'filter' => '
 			{
-				"name": "All jobs logs from the last 14 days",
+				"name": "All jobs logs from the last 24 hours",
 				"columns": [
 					{"name": "RequestId"},
 					{"name": "ExecutionTime"},
@@ -487,11 +487,133 @@ $filters = array(
 						"operation": "contains",
 						"condition": "job"
 					},
+					{
+						"name": "RequestId",
+						"operation": "contains",
+						"condition": "JOB"
+					},
 					{
 						"name": "ExecutionTime",
 						"operation": "lt",
-						"condition": "14",
-						"option": "days"
+						"condition": "24",
+						"option": "hours"
+					}
+				]
+			}
+		',
+		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'logs',
+		'filter_kurzbz' => 'jobs48hours',
+		'description' => '{Last 48 hours jobs logs}',
+		'sort' => 2,
+		'default_filter' => false,
+		'filter' => '
+			{
+				"name": "All jobs logs from the last 48 hours",
+				"columns": [
+					{"name": "RequestId"},
+					{"name": "ExecutionTime"},
+					{"name": "ExecutedBy"},
+					{"name": "Description"},
+					{"name": "Data"}
+				],
+				"filters": [
+					{
+						"name": "WebserviceType",
+						"operation": "contains",
+						"condition": "job"
+					},
+					{
+						"name": "RequestId",
+						"operation": "contains",
+						"condition": "JOB"
+					},
+					{
+						"name": "ExecutionTime",
+						"operation": "lt",
+						"condition": "48",
+						"option": "hours"
+					}
+				]
+			}
+		',
+		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'logs',
+		'filter_kurzbz' => 'jqws24hours',
+		'description' => '{Last 24 hours job queue workers logs}',
+		'sort' => 2,
+		'default_filter' => false,
+		'filter' => '
+			{
+				"name": "All job queue workers logs from the last 24 hours",
+				"columns": [
+					{"name": "RequestId"},
+					{"name": "ExecutionTime"},
+					{"name": "ExecutedBy"},
+					{"name": "Description"},
+					{"name": "Data"}
+				],
+				"filters": [
+					{
+						"name": "WebserviceType",
+						"operation": "contains",
+						"condition": "job"
+					},
+					{
+						"name": "RequestId",
+						"operation": "contains",
+						"condition": "JQW"
+					},
+					{
+						"name": "ExecutionTime",
+						"operation": "lt",
+						"condition": "24",
+						"option": "hours"
+					}
+				]
+			}
+		',
+		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'logs',
+		'filter_kurzbz' => 'jqws48hours',
+		'description' => '{Last 48 hours job queue workers logs}',
+		'sort' => 2,
+		'default_filter' => false,
+		'filter' => '
+			{
+				"name": "All job queue workers logs from the last 48 hours",
+				"columns": [
+					{"name": "RequestId"},
+					{"name": "ExecutionTime"},
+					{"name": "ExecutedBy"},
+					{"name": "Description"},
+					{"name": "Data"}
+				],
+				"filters": [
+					{
+						"name": "WebserviceType",
+						"operation": "contains",
+						"condition": "job"
+					},
+					{
+						"name": "RequestId",
+						"operation": "contains",
+						"condition": "JQW"
+					},
+					{
+						"name": "ExecutionTime",
+						"operation": "lt",
+						"condition": "48",
+						"option": "hours"
 					}
 				]
 			}
@@ -535,13 +657,13 @@ $filters = array(
 	array(
 		'app' => 'core',
 		'dataset_name' => 'logs',
-		'filter_kurzbz' => 'content3days',
-		'description' => '{Last 3 days content logs}',
+		'filter_kurzbz' => 'content3minutes',
+		'description' => '{Last 3 minutes content logs}',
 		'sort' => 4,
 		'default_filter' => false,
 		'filter' => '
 			{
-				"name": "All content logs from the last 3 days",
+				"name": "All content logs from the last 3 minutes",
 				"columns": [
 					{"name": "RequestId"},
 					{"name": "ExecutionTime"},
@@ -559,7 +681,7 @@ $filters = array(
 						"name": "ExecutionTime",
 						"operation": "lt",
 						"condition": "3",
-						"option": "days"
+						"option": "minutes"
 					}
 				]
 			}
@@ -569,13 +691,13 @@ $filters = array(
 	array(
 		'app' => 'core',
 		'dataset_name' => 'logs',
-		'filter_kurzbz' => 'wienerlinien7days',
-		'description' => '{Last 7 days wiener linien logs}',
+		'filter_kurzbz' => 'wienerlinien24hours',
+		'description' => '{Last 24 hours Wiener Linien logs}',
 		'sort' => 5,
 		'default_filter' => false,
 		'filter' => '
 			{
-				"name": "All wiener linien logs from the last 7 days",
+				"name": "All Wiener Linien logs from the last 24 hours",
 				"columns": [
 					{"name": "RequestId"},
 					{"name": "ExecutionTime"},
@@ -592,8 +714,8 @@ $filters = array(
 					{
 						"name": "ExecutionTime",
 						"operation": "lt",
-						"condition": "7",
-						"option": "days"
+						"condition": "24",
+						"option": "hours"
 					}
 				]
 			}