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

bugfixes

Browse Source
This commit is contained in:
Paula Quispe
2017-01-13 19:11:14 -04:00
parent 5bf63d9051
commit 06f549299e
6 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/classes/class.applications.php
View File

@@ -10,7 +10,9 @@ class Applications
$status = null,
$dir = null,
$sort = null,
$category = null
$category = null,
$dateFrom = null,
$dateTo =null
) {
//Task Dummies
$arrayTaskTypeToExclude = array("WEBENTRYEVENT", "END-MESSAGE-EVENT", "START-MESSAGE-EVENT", "INTERMEDIATE-THROW-MESSAGE-EVENT", "INTERMEDIATE-CATCH-MESSAGE-EVENT");
@@ -73,7 +75,9 @@ class Applications
case "PAUSED": //This status is not considered in the search, maybe we can add in the new versions
$newCriteria->add(ApplicationPeer::APP_STATUS, 'TO_DO');
break;
default:
default: //All status
$newCriteria->addOr(AppDelegationPeer::DEL_THREAD_STATUS, 'CLOSED');
$newCriteria->add(AppDelegationPeer::DEL_LAST_INDEX, '1');
break;
}
if (!empty($userUid)) {
@@ -91,6 +95,13 @@ class Applications
->addOr( $newCriteria->getNewCriterion( TaskPeer::TAS_TITLE, '%' . $search . '%', Criteria::LIKE )
->addOr( $newCriteria->getNewCriterion( ApplicationPeer::APP_NUMBER, '%' . $search . '%', Criteria::LIKE ) ) ) );
}
if (!empty($dateFrom)){
$newCriteria->add(AppDelegationPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL) ;
}
if (!empty($dateTo)){
$dateTo = $dateTo . " 23:59:59";
$newCriteria->addAnd(AppDelegationPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL) ;
}
$newCriteria->add(TaskPeer::TAS_TYPE, $arrayTaskTypeToExclude, Criteria::NOT_IN);
$totalCount = ApplicationPeer::doCount($newCriteria, false);

2
workflow/engine/classes/class.case.php
View File

@@ -1685,7 +1685,7 @@ class Cases
$delPrevious,
$appNumber,
$tasId,
$user->getUsrId(),
(empty($user)) ? 0 : $user->getUsrId(),
$proId
);
//update searchindex

4
workflow/engine/classes/class.processes.php
View File

@@ -1160,7 +1160,9 @@ class Processes
public function getProcessRow($sProUid, $getAllLang = false)
{
$oProcess = new Process();
return $oProcess->Load($sProUid, $getAllLang);
$pProcess = $oProcess->Load( $sProUid, $getAllLang );
unset($pProcess['PRO_ID']);
return $pProcess;
}
/**

4
workflow/engine/classes/class.tasks.php
View File

@@ -96,7 +96,9 @@ class Tasks
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$oTask = new Task();
$aTasks[] = $oTask->load($aRow['TAS_UID']);
$pTask = $oTask->load($aRow['TAS_UID']);
unset($pTask['TAS_ID']);
$aTasks[] = $pTask;
$oDataset->next();
}
return $aTasks;

10
workflow/engine/methods/cases/casesList_Ajax.php
View File

@@ -114,7 +114,12 @@ if ($actionAjax == "processListExtJs") {
$cProcess = new Criteria('workflow');
//get the processes for this user in this action
$cProcess->clearSelectColumns();
$cProcess->addSelectColumn(ProcessPeer::PRO_ID);
if($action == 'search'){
$cProcess->addSelectColumn(ProcessPeer::PRO_ID);
} else {
$cProcess->addSelectColumn(ProcessPeer::PRO_UID);
}
$cProcess->addSelectColumn(ProcessPeer::PRO_TITLE);
if ($categoryUid) {
$cProcess->add(ProcessPeer::PRO_CATEGORY, $categoryUid);
@@ -150,6 +155,9 @@ if ($actionAjax == "processListExtJs") {
while ($oDataset->next()) {
$aRow = $oDataset->getRow();
if(!isset($aRow['PRO_UID'])){
$aRow['PRO_UID'] = $aRow['PRO_ID'];
}
$processes[] = $aRow;
}
return print G::json_encode($processes);

4
workflow/engine/methods/cases/proxyCasesList.php
View File

@@ -124,7 +124,9 @@ try {
$filterStatus,
$dir,
(strpos($sort, ".") !== false)? $sort : "APPLICATION." . $sort,
$category
$category,
$dateFrom,
$dateTo
);
$data['data'] = \ProcessMaker\Util\DateTime::convertUtcToTimeZone($data['data']);