blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 09:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Added new constant OPT_MINUTES to FilterWidgetLib

Browse Source 
- 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
This commit is contained in:
Paolo
2020-09-14 15:01:33 +02:00
parent fbd4ded720
commit 65ee03f6ae
4 changed files with 154 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/FilterWidgetLib.php
+5 -2
View File
@@ -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
+6 -5
View File
@@ -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);
?>