- Renamed controller system/JobsViewer.php to system/LogsViewer.php

- Renamed directory views/system/jobs to views/system/logs
- Changed FilterWidget query in view system/logs/logsViewerData.php to load all logs
- Added more filters in database to load different log types

application/controllers/system/LogsViewer.php

@@ -5,7 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * Overview on cronjob logs
  */
-class JobsViewer extends Auth_Controller
+class LogsViewer extends Auth_Controller
 {
 	/**
 	 * Constructor
@@ -39,6 +39,6 @@ class JobsViewer extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('system/jobs/jobsViewer.php');
+		$this->load->view('system/logs/logsViewer.php');
 	}
 }

application/views/system/logs/logsViewer.php

@@ -2,7 +2,7 @@
 	$this->load->view(
 		'templates/FHC-Header',
 		array(
-			'title' => 'JobsViewer',
+			'title' => 'Logs viewer',
 			'jquery' => true,
 			'jqueryui' => true,
 			'bootstrap' => true,
@@ -37,7 +37,7 @@
 					</div>
 				</div>
 				<div>
-					<?php $this->load->view('system/jobs/jobsViewerData.php'); ?>
+					<?php $this->load->view('system/logs/logsViewerData.php'); ?>
 				</div>
 			</div>
 		</div>

application/views/system/logs/logsViewerData.php

@@ -7,9 +7,9 @@
 					wsl.execute_time AS "ExecutionTime",
 					wsl.execute_user AS "ExecutedBy",
 					wsl.beschreibung AS "Description",
-					wsl.request_data AS "Data"
+					wsl.request_data AS "Data",
+					wsl.webservicetyp_kurzbz AS "WebserviceType"
 			 FROM system.tbl_webservicelog wsl
-			WHERE wsl.webservicetyp_kurzbz = \'job\'
 		 ORDER BY wsl.execute_time DESC
 		',
 		'requiredPermissions' => 'admin',
@@ -21,7 +21,8 @@
 			'Execution time',
 			'Executed by',
 			'Producer',
-			'Data'
+			'Data',
+			'Webservice type'
 		),
 		'formatRow' => function($datasetRaw) {
 
@@ -58,8 +59,7 @@
 	);
 
 	$filterWidgetArray['app'] = 'core';
-	$filterWidgetArray['datasetName'] = 'jobslogs';
-	$filterWidgetArray['filterKurzbz'] = 'all';
+	$filterWidgetArray['datasetName'] = 'logs';
 	$filterWidgetArray['filter_id'] = $this->input->get('filter_id');
 
 	echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray);

system/filtersupdate.php

@@ -463,14 +463,14 @@ $filters = array(
 	),
 	array(
 		'app' => 'core',
-		'dataset_name' => 'jobslogs',
-		'filter_kurzbz' => 'all',
-		'description' => '{All logs produced by jobs}',
+		'dataset_name' => 'logs',
+		'filter_kurzbz' => 'last7days',
+		'description' => '{Last 7 days logs}',
 		'sort' => 1,
 		'default_filter' => true,
 		'filter' => '
 			{
-				"name": "All jobs viewer",
+				"name": "All logs from the last 7 days",
 				"columns": [
 					{"name": "RequestId"},
 					{"name": "ExecutionTime"},
@@ -478,7 +478,150 @@ $filters = array(
 					{"name": "Description"},
 					{"name": "Data"}
 				],
-				"filters": []
+				"filters": [
+					{
+						"name": "ExecutionTime",
+						"operation": "lt",
+						"condition": "7",
+						"option": "days"
+					}
+				]
+			}
+		',
+		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'logs',
+		'filter_kurzbz' => 'jobs14days',
+		'description' => '{Last 14 days jobs logs}',
+		'sort' => 2,
+		'default_filter' => false,
+		'filter' => '
+			{
+				"name": "All jobs logs from the last 14 days",
+				"columns": [
+					{"name": "RequestId"},
+					{"name": "ExecutionTime"},
+					{"name": "ExecutedBy"},
+					{"name": "Description"},
+					{"name": "Data"}
+				],
+				"filters": [
+					{
+						"name": "WebserviceType",
+						"operation": "contains",
+						"condition": "job"
+					},
+					{
+						"name": "ExecutionTime",
+						"operation": "lt",
+						"condition": "14",
+						"option": "days"
+					}
+				]
+			}
+		',
+		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'logs',
+		'filter_kurzbz' => 'repots14days',
+		'description' => '{Last 14 days reports logs}',
+		'sort' => 3,
+		'default_filter' => false,
+		'filter' => '
+			{
+				"name": "All reports logs from the last 14 days",
+				"columns": [
+					{"name": "RequestId"},
+					{"name": "ExecutionTime"},
+					{"name": "ExecutedBy"},
+					{"name": "Description"},
+					{"name": "Data"}
+				],
+				"filters": [
+					{
+						"name": "WebserviceType",
+						"operation": "contains",
+						"condition": "reports"
+					},
+					{
+						"name": "ExecutionTime",
+						"operation": "lt",
+						"condition": "14",
+						"option": "days"
+					}
+				]
+			}
+		',
+		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'logs',
+		'filter_kurzbz' => 'content3days',
+		'description' => '{Last 3 days content logs}',
+		'sort' => 4,
+		'default_filter' => false,
+		'filter' => '
+			{
+				"name": "All content logs from the last 3 days",
+				"columns": [
+					{"name": "RequestId"},
+					{"name": "ExecutionTime"},
+					{"name": "ExecutedBy"},
+					{"name": "Description"},
+					{"name": "Data"}
+				],
+				"filters": [
+					{
+						"name": "WebserviceType",
+						"operation": "contains",
+						"condition": "content"
+					},
+					{
+						"name": "ExecutionTime",
+						"operation": "lt",
+						"condition": "3",
+						"option": "days"
+					}
+				]
+			}
+		',
+		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'logs',
+		'filter_kurzbz' => 'wienerlinien7days',
+		'description' => '{Last 7 days wiener linien logs}',
+		'sort' => 5,
+		'default_filter' => false,
+		'filter' => '
+			{
+				"name": "All wiener linien logs from the last 7 days",
+				"columns": [
+					{"name": "RequestId"},
+					{"name": "ExecutionTime"},
+					{"name": "ExecutedBy"},
+					{"name": "Description"},
+					{"name": "Data"}
+				],
+				"filters": [
+					{
+						"name": "WebserviceType",
+						"operation": "contains",
+						"condition": "wienerlinien"
+					},
+					{
+						"name": "ExecutionTime",
+						"operation": "lt",
+						"condition": "7",
+						"option": "days"
+					}
+				]
 			}
 		',
 		'oe_kurzbz' => null,