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

- Added new constant BEGINNING_OF_TIME

Browse Source 
- Added new config entry job_type_permissions_white_list in jqm.php
- Added new navigation entry jobsqueueviewer
- Added new model application/models/system/JobsQueue_model.php
- Added new option in FilterWidget for hours comparison with dates
- Added new filter core-jq-lastHour to system/filtersupdate.php
- Added new statements to system/dbupdate_3.3.php to create tables system.tbl_jobstatuses, system.tbl_jobtypes and system.tbl_jobstatuses
- Added new views application/views/system/jq/jobsQueueViewer.php and application/views/system/jq/jobsQueueViewerData.php
This commit is contained in:
Paolo
2020-03-05 15:57:06 +01:00
parent 30c6f10d80
commit cd815acdbf
16 changed files with 462 additions and 88 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_HOURS = 'hours';
const OPT_DAYS = 'days';
const OPT_MONTHS = 'months';
@@ -884,7 +885,8 @@ class FilterWidgetLib
// It it's a date type
if (is_numeric($filterDefinition->condition)
&& isset($filterDefinition->option)
&& ($filterDefinition->option == self::OPT_DAYS
&& ($filterDefinition->option == self::OPT_HOURS
|| $filterDefinition->option == self::OPT_DAYS
|| $filterDefinition->option == self::OPT_MONTHS))
{
$condition = '< (NOW() - \''.$filterDefinition->condition.' '.$filterDefinition->option.'\'::interval)';
@@ -899,7 +901,8 @@ class FilterWidgetLib
// It it's a date type
if (is_numeric($filterDefinition->condition)
&& isset($filterDefinition->option)
&& ($filterDefinition->option == self::OPT_DAYS
&& ($filterDefinition->option == self::OPT_HOURS
|| $filterDefinition->option == self::OPT_DAYS
|| $filterDefinition->option == self::OPT_MONTHS))
{
$condition = '> (NOW() - \''.$filterDefinition->condition.' '.$filterDefinition->option.'\'::interval)';
application/libraries/JobsQueueLib.php
+18 -12
View File
@@ -2,27 +2,33 @@
if (!defined('BASEPATH')) exit('No direct script access allowed');
/**
* Library that contains all the needed functionalities to operate with the Jobs Queue System
*/
class JobsQueueLib
{
//
const STATUS_RUNNING = 'running';
const STATUS_NEW = 'new';
const STATUS_DONE = 'done';
//
const PARAM_JOB_TYPE = 'jobType';
const PARAM_JOB_STATUS = 'jobStatus';
const PARAM_JOB_CREATION_TIME = 'jobCreatinTime';
//
// Job types
// SAP
const JOB_TYPE_SAP_STAMMDATEN_UPDATE = 'SAPStammdatenUpdate';
const JOB_TYPE_SAP_PAYMENT = 'SAPPayment';
// DVUH
const JOB_TYPE_OEH_PAYMENT = 'OEHPayment';
// Job statuses
const STATUS_NEW = 'new';
const STATUS_RUNNING = 'running';
const STATUS_DONE = 'done';
const STATUS_FAILED = 'failed';
// Parameter names
const PARAM_JOB_TYPE = 'type';
const PARAM_JOB_STATUS = 'status';
const PARAM_JOBS = 'jobs';
private $_ci; // CI instance
/**
* Construct
* Constructor
*/
public function __construct($authenticate = true)
{