fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-03-20 09:07:58 -04:00
parent 4cb3cca5ae 2742702f88
commit 17621b15ea
23 changed files with 394 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
workflow/engine/src/BusinessModel/CaseTracker.php
View File

@@ -297,30 +297,11 @@ class CaseTracker
);
}
//Set data
\G::LoadClass("ArrayPeer");
global $_DBArray;
$_DBArray = (isset($_SESSION["_DBArray"]))? $_SESSION["_DBArray"] : "";
$_DBArray["CASE_TRACKER_OBJECT"] = $arrayCaseTrackerObject;
$_SESSION["_DBArray"] = $_DBArray;
$criteria = new \Criteria("dbarray");
$criteria->setDBArrayTable("CASE_TRACKER_OBJECT");
$criteria->addAscendingOrderByColumn("obj_type");
$criteria->addAscendingOrderByColumn("obj_title");
$rsCriteria = \ArrayBasePeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$arrayAvailableCaseTrackerObject[] = $row;
}
$arrayAvailableCaseTrackerObject = \ProcessMaker\Util\ArrayUtil::sort(
$arrayAvailableCaseTrackerObject,
array("obj_type", "obj_title"),
SORT_ASC
);
return $arrayAvailableCaseTrackerObject;
} catch (\Exception $e) {
@@ -411,27 +392,7 @@ class CaseTracker
//Set data
\G::LoadClass("ArrayPeer");
global $_DBArray;
$_DBArray = (isset($_SESSION["_DBArray"]))? $_SESSION["_DBArray"] : "";
$_DBArray["CASE_TRACKER_OBJECT"] = $arraydbCaseTrackerObject;
$_SESSION["_DBArray"] = $_DBArray;
$criteria = new \Criteria("dbarray");
$criteria->setDBArrayTable("CASE_TRACKER_OBJECT");
$criteria->addAscendingOrderByColumn("cto_position");
$rsCriteria = \ArrayBasePeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$arrayCaseTrackerObject[] = $row;
}
$arraydbCaseTrackerObject = \ProcessMaker\Util\ArrayUtil::sort($arraydbCaseTrackerObject, array("cto_position"), SORT_ASC);
return $arrayCaseTrackerObject;
} catch (\Exception $e) {

6
workflow/engine/src/ProcessMaker/Util/ArrayUtil.php
View File

@@ -69,6 +69,10 @@ class ArrayUtil
*/
public static function sort($data, $columns, $direction = SORT_ASC)
{
if (empty($data)) {
return $data;
}
$composedData = array();
if (is_array($direction)) {
@@ -92,7 +96,7 @@ class ArrayUtil
$composedData[] = & $data;
if (PHP_VERSION_ID < 54000) {
if (PHP_VERSION_ID < 50400) {
switch (count($columns)) {
case 1: array_multisort($composedData[0], $composedData[1], $composedData[2]); break;
case 2: array_multisort($composedData[0], $composedData[1], $composedData[2], $composedData[3], $composedData[4]); break;