fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1809 from marcoAntonioNina/BUG-11886

Browse Source 
BUG-11886 When running a case scheduler event every 5 minutes... SOLVED
This commit is contained in:
julceslauhub
2013-06-13 11:46:42 -07:00
parent a23f55359d 7e20756f87
commit f803a7b367
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/model/CaseScheduler.php
View File

@@ -269,8 +269,10 @@ class CaseScheduler extends BaseCaseScheduler
$oCriteria = $this->getAllCriteria();
$oCriteria->addAnd( CaseSchedulerPeer::SCH_STATE, 'INACTIVE', Criteria::NOT_EQUAL );
$oCriteria->addAnd( CaseSchedulerPeer::SCH_STATE, 'PROCESSED', Criteria::NOT_EQUAL );
$oCriteria->add( CaseSchedulerPeer::SCH_TIME_NEXT_RUN, $dCurrentDate, Criteria::GREATER_EQUAL );
$oCriteria->addAnd( CaseSchedulerPeer::SCH_TIME_NEXT_RUN, $dNextDay, Criteria::LESS_EQUAL );
$oCriteria->add( $oCriteria->getNewCriterion(CaseSchedulerPeer::SCH_TIME_NEXT_RUN, $dCurrentDate, Criteria::GREATER_EQUAL )->
addAnd( $oCriteria->getNewCriterion( CaseSchedulerPeer::SCH_TIME_NEXT_RUN, $dNextDay, Criteria::LESS_EQUAL ) )->
addOr( $oCriteria->getNewCriterion( CaseSchedulerPeer::SCH_OPTION, '5', Criteria::GREATER_EQUAL ) )
);
$oCriteria->add( CaseSchedulerPeer::SCH_END_DATE, null, Criteria::EQUAL );
$oCriteria->addOr( CaseSchedulerPeer::SCH_END_DATE, $dCurrentDate, Criteria::GREATER_EQUAL );
$oDataset = CaseSchedulerPeer::doSelectRS( $oCriteria );
@@ -321,6 +323,7 @@ class CaseScheduler extends BaseCaseScheduler
$sActualDataHour = date( 'H', strtotime( $aRow['SCH_TIME_NEXT_RUN'] ) );
$sActualDataMinutes = date( 'i', strtotime( $aRow['SCH_TIME_NEXT_RUN'] ) );
$dActualSysHour = date( 'H', $nTime );
$dActualSysHour = ($dActualSysHour == '00') ? '24' : $dActualSysHour;
$dActualSysMinutes = date( 'i', $nTime );
$sActualDataTime = strtotime( $aRow['SCH_TIME_NEXT_RUN'] );
$sActualSysTime = strtotime( $nTime );

12
workflow/engine/xmlform/cases/cases_Scheduler_New.xml
View File

@@ -634,11 +634,13 @@ function validateSchedulerFields(oForm) {
var listNames = document.getElementById('form[SCH_LIST]').value;
listNames = listNames.split("^");
if (schedulerTitle.toLowerCase() == (listNames[i]).toLowerCase()) {
if (schedulerTitle == listNames[i]) {
document.getElementById('form[SCH_NAME]').focus();
msgBox("@G::LoadTranslation(ID_DUPLICATE_CASE_SCHEDULER_NAME)", 'alert');
return false;
for (var i= 1; i<listNames.length; i++) {
if (schedulerTitle.toLowerCase() == (listNames[i]).toLowerCase()) {
if (schedulerTitle == listNames[i]) {
document.getElementById('form[SCH_NAME]').focus();
msgBox("@G::LoadTranslation(ID_DUPLICATE_CASE_SCHEDULER_NAME)", 'alert');
return false;
}
}
}
getField("SCH_NAME").value = schedulerTitle;