diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php index f3cfb01a4..c608d430b 100644 --- a/workflow/engine/classes/class.pmFunctions.php +++ b/workflow/engine/classes/class.pmFunctions.php @@ -30,8 +30,12 @@ //////////////////////////////////////////////////// use ProcessMaker\Util\ElementTranslation; -if (! class_exists( 'PMScript' )) { - G::LoadClass( 'pmScript' ); +if (!class_exists('Monolog\Logger')) { + Bootstrap::initVendors(); +} + +if (!class_exists('PMScript')) { + G::LoadClass('pmScript'); } /** diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php index 63dc369b2..6407718c5 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -297,6 +297,15 @@ class ListParticipatedLast extends BaseListParticipatedLast $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'".$category."'"); $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN); } + + //Those filters: $newestthan, $oldestthan is used from mobile GET /light/participated + if ($newestthan != '') { + $criteria->add( $criteria->getNewCriterion( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $newestthan, Criteria::GREATER_THAN )); + } + + if ($oldestthan != '') { + $criteria->add( $criteria->getNewCriterion( ListParticipatedLastPeer::DEL_DELEGATE_DATE, $oldestthan, Criteria::LESS_THAN )); + } } public function loadList($usr_uid, $filters = array(), $callbackRecord = null, $appUid = '')