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

HOR-3521

Browse Source
This commit is contained in:
Paula Quispe
2017-10-23 14:23:31 -04:00
parent 9952cdb8ff
commit 81fc730cdb
4 changed files with 61 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/classes/model/ListInbox.php
View File

@@ -623,11 +623,21 @@ class ListInbox extends BaseListInbox
$limit = isset($filters['limit']) ? $filters['limit'] : "25"; $limit = isset($filters['limit']) ? $filters['limit'] : "25";
$paged = isset($filters['paged']) ? $filters['paged'] : 1; $paged = isset($filters['paged']) ? $filters['paged'] : 1;
if ($dir == "DESC") { if (is_array($sort) && count($sort) > 0) {
foreach ($sort as $key) {
if ($dir == 'DESC') {
$criteria->addDescendingOrderByColumn($key);
} else {
$criteria->addAscendingOrderByColumn($key);
}
}
} else {
if ($dir == 'DESC') {
$criteria->addDescendingOrderByColumn($sort); $criteria->addDescendingOrderByColumn($sort);
} else { } else {
$criteria->addAscendingOrderByColumn($sort); $criteria->addAscendingOrderByColumn($sort);
} }
}
if ($paged == 1) { if ($paged == 1) {
$criteria->setLimit($limit); $criteria->setLimit($limit);

10
workflow/engine/classes/model/ListParticipatedLast.php
View File

@@ -466,11 +466,21 @@ class ListParticipatedLast extends BaseListParticipatedLast
$limit = isset($filters['limit']) ? $filters['limit'] : '25'; $limit = isset($filters['limit']) ? $filters['limit'] : '25';
$paged = isset($filters['paged']) ? $filters['paged'] : 1; $paged = isset($filters['paged']) ? $filters['paged'] : 1;
if (is_array($sort) && count($sort) > 0) {
foreach ($sort as $key) {
if ($dir == 'DESC') {
$criteria->addDescendingOrderByColumn($key);
} else {
$criteria->addAscendingOrderByColumn($key);
}
}
} else {
if ($dir == 'DESC') { if ($dir == 'DESC') {
$criteria->addDescendingOrderByColumn($sort); $criteria->addDescendingOrderByColumn($sort);
} else { } else {
$criteria->addAscendingOrderByColumn($sort); $criteria->addAscendingOrderByColumn($sort);
} }
}
if ($paged == 1) { if ($paged == 1) {
$criteria->setLimit($limit); $criteria->setLimit($limit);

12
workflow/engine/classes/model/ListPaused.php
View File

@@ -376,11 +376,21 @@ class ListPaused extends BaseListPaused
$limit = isset($filters['limit']) ? $filters['limit'] : "25"; $limit = isset($filters['limit']) ? $filters['limit'] : "25";
$paged = isset($filters['paged']) ? $filters['paged'] : 1; $paged = isset($filters['paged']) ? $filters['paged'] : 1;
if ($dir == "DESC") { if (is_array($sort) && count($sort) > 0) {
foreach ($sort as $key) {
if ($dir == 'DESC') {
$criteria->addDescendingOrderByColumn($key);
} else {
$criteria->addAscendingOrderByColumn($key);
}
}
} else {
if ($dir == 'DESC') {
$criteria->addDescendingOrderByColumn($sort); $criteria->addDescendingOrderByColumn($sort);
} else { } else {
$criteria->addAscendingOrderByColumn($sort); $criteria->addAscendingOrderByColumn($sort);
} }
}
if ($paged == 1) { if ($paged == 1) {
$criteria->setLimit($limit); $criteria->setLimit($limit);

32
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -3547,7 +3547,7 @@ class Cases
* @param array $additionalColumns, columns related to the custom cases list with the format TABLE_NAME.COLUMN_NAME * @param array $additionalColumns, columns related to the custom cases list with the format TABLE_NAME.COLUMN_NAME
* @param string $userDisplayFormat, user information display format * @param string $userDisplayFormat, user information display format
* *
* @return string $tableName * @return string|array could be an string $tableName, could be an array $columnSort
*/ */
public function getSortColumn( public function getSortColumn(
$listPeer, $listPeer,
@@ -3598,11 +3598,11 @@ class Cases
* @param string $format, the user display format * @param string $format, the user display format
* @param string $prefix, the initial name of the columns related to the USR_FIRSTNAME USR_LASTNAME USR_USERNAME * @param string $prefix, the initial name of the columns related to the USR_FIRSTNAME USR_LASTNAME USR_USERNAME
* *
* @return string $columnSort, columns by apply the sql command ORDER BY * @return array $columnSort, columns by apply the sql command ORDER BY
*/ */
public function buildOrderFieldFormatted($columnsList, $format, $prefix = 'DEL_PREVIOUS_') public function buildOrderFieldFormatted($columnsList, $format, $prefix = 'DEL_PREVIOUS_')
{ {
$columnSort = ''; $columnSort = [];
if (in_array($prefix . 'USR_FIRSTNAME', $columnsList) && if (in_array($prefix . 'USR_FIRSTNAME', $columnsList) &&
in_array($prefix . 'USR_LASTNAME', $columnsList) && in_array($prefix . 'USR_LASTNAME', $columnsList) &&
@@ -3610,25 +3610,37 @@ class Cases
) { ) {
switch ($format) { switch ($format) {
case '@firstName @lastName': case '@firstName @lastName':
$columnSort = $prefix . 'USR_FIRSTNAME' . ',' . $prefix . 'USR_LASTNAME'; array_push($columnSort, $prefix . 'USR_FIRSTNAME');
array_push($columnSort, $prefix . 'USR_LASTNAME');
break; break;
case '@firstName @lastName (@userName)': case '@firstName @lastName (@userName)':
$columnSort = $prefix . 'USR_FIRSTNAME' . ',' . $prefix . 'USR_LASTNAME' . ',' . $prefix . 'USR_USERNAME'; array_push($columnSort, $prefix . 'USR_FIRSTNAME');
array_push($columnSort, $prefix . 'USR_LASTNAME');
array_push($columnSort, $prefix . 'USR_USERNAME');
break; break;
case '@userName': case '@userName':
$columnSort = $prefix . 'USR_USERNAME'; array_push($columnSort, $prefix . 'USR_USERNAME');
break; break;
case '@userName (@firstName @lastName)': case '@userName (@firstName @lastName)':
$columnSort = $prefix . 'USR_USERNAME' . ',' . $prefix . 'USR_FIRSTNAME' . ',' . $prefix . 'USR_LASTNAME'; array_push($columnSort, $prefix . 'USR_USERNAME');
array_push($columnSort, $prefix . 'USR_FIRSTNAME');
array_push($columnSort, $prefix . 'USR_LASTNAME');
break; break;
case '@lastName, @firstName': case '@lastName, @firstName':
$columnSort = $prefix . 'USR_LASTNAME' . ',' . $prefix . 'USR_FIRSTNAME'; array_push($columnSort, $prefix . 'USR_LASTNAME');
array_push($columnSort, $prefix . 'USR_FIRSTNAME');
break;
case '@lastName @firstName':
array_push($columnSort, $prefix . 'USR_LASTNAME');
array_push($columnSort, $prefix . 'USR_FIRSTNAME');
break; break;
case '@lastName, @firstName (@userName)': case '@lastName, @firstName (@userName)':
$columnSort = $prefix . 'USR_LASTNAME' . ',' . $prefix . 'USR_FIRSTNAME' . ',' . $prefix . 'USR_USERNAME'; array_push($columnSort, $prefix . 'USR_LASTNAME');
array_push($columnSort, $prefix . 'USR_FIRSTNAME');
array_push($columnSort, $prefix . 'USR_USERNAME');
break; break;
default: default:
$columnSort = $prefix . 'USR_USERNAME'; array_push($columnSort, $prefix . 'USR_USERNAME');
break; break;
} }
} }