diff --git a/application/controllers/system/JobsViewer.php b/application/controllers/system/LogsViewer.php
similarity index 87%
rename from application/controllers/system/JobsViewer.php
rename to application/controllers/system/LogsViewer.php
index 2fdfa7181..55cf38d82 100644
--- a/application/controllers/system/JobsViewer.php
+++ b/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');
}
}
diff --git a/application/views/system/jobs/jobsViewer.php b/application/views/system/logs/logsViewer.php
similarity index 90%
rename from application/views/system/jobs/jobsViewer.php
rename to application/views/system/logs/logsViewer.php
index f7018a272..96790b479 100644
--- a/application/views/system/jobs/jobsViewer.php
+++ b/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 @@
- load->view('system/jobs/jobsViewerData.php'); ?>
+ load->view('system/logs/logsViewerData.php'); ?>
diff --git a/application/views/system/jobs/jobsViewerData.php b/application/views/system/logs/logsViewerData.php
similarity index 88%
rename from application/views/system/jobs/jobsViewerData.php
rename to application/views/system/logs/logsViewerData.php
index 07815c2f3..2dfcfc9d0 100644
--- a/application/views/system/jobs/jobsViewerData.php
+++ b/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);
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 2d1789774..415b8d442 100644
--- a/system/filtersupdate.php
+++ b/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,