fernando/luos
1
0
Fork 0
Code Releases Activity

BUG-13396 Ordenamiento en MessageHistory

Browse Source 
Se agrego el odenamiento de todo el listado en MessageHistory y no solo porpagina como estaba funcionando.
This commit is contained in:
jennylee
2013-11-15 12:03:58 -04:00
parent 8a895b84f0
commit 604cf9310d
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,6 +71,8 @@ class Cases
{ {
private $appSolr = null; private $appSolr = null;
public $dir = 'ASC';
public $sort = 'APP_MSG_DATE';
public function __construct() public function __construct()
{ {
@@ -5942,8 +5944,7 @@ class Cases
$oCriteria = new Criteria('dbarray'); $oCriteria = new Criteria('dbarray');
$oCriteria->setDBArrayTable('messages'); $oCriteria->setDBArrayTable('messages');
usort( $aMessages, 'ordProcess' ); usort( $aMessages, array($this, "ordProcess") );
$aMessages = array_splice($aMessages, $start, $limit);
return $aMessages; return $aMessages;
} }
@@ -6757,27 +6758,28 @@ class Cases
} }
} }
} }
}
function ordProcess ($a, $b) public function ordProcess ($a, $b)
{ {
if (isset($_POST['sort'])) { if ($this->sort == '') {
if ($_POST['dir']=='ASC') { $this->sort = 'APP_MSG_DATE';
if ($a[$_POST['sort']] > $b[$_POST['sort']]) { }
if ($this->dir=='ASC') {
if ($a[$this->sort] > $b[$this->sort]) {
return 1; return 1;
} elseif ($a[$_POST['sort']] < $b[$_POST['sort']]) { } elseif ($a[$this->sort] < $b[$this->sort]) {
return - 1; return - 1;
} else { } else {
return 0; return 0;
} }
} else { } else {
if ($a[$_POST['sort']] > $b[$_POST['sort']]) { if ($a[$this->sort] > $b[$this->sort]) {
return - 1; return - 1;
} elseif ($a[$_POST['sort']] < $b[$_POST['sort']]) { } elseif ($a[$this->sort] < $b[$this->sort]) {
return 1; return 1;
} else { } else {
return 0; return 0;
} }
} }
} }
} }

7
workflow/engine/methods/cases/caseMessageHistory_Ajax.php
View File

@@ -37,8 +37,13 @@ if ($actionAjax == 'messageHistoryGridList_JXP') {
G::LoadClass( 'case' ); G::LoadClass( 'case' );
G::LoadClass( "BasePeer" ); G::LoadClass( "BasePeer" );
$dir = isset( $_POST['dir'] ) ? $_POST['dir'] : 'ASC';
$sort = isset( $_POST['sort'] ) ? $_POST['sort'] : '';
global $G_PUBLISH; global $G_PUBLISH;
$oCase = new Cases(); $oCase = new Cases();
$oCase->dir = $dir;
$oCase->sort = $sort;
$appMessageArray = $oCase->getHistoryMessagesTrackerExt( $_SESSION['APPLICATION'], true, $_REQUEST['start'], $_REQUEST['limit']); $appMessageArray = $oCase->getHistoryMessagesTrackerExt( $_SESSION['APPLICATION'], true, $_REQUEST['start'], $_REQUEST['limit']);
$appMessageCountArray = $oCase->getHistoryMessagesTrackerExt( $_SESSION['APPLICATION'], true); $appMessageCountArray = $oCase->getHistoryMessagesTrackerExt( $_SESSION['APPLICATION'], true);
@@ -98,6 +103,8 @@ if ($actionAjax == 'messageHistoryGridList_JXP') {
} }
} }
$aProcesses = array_splice($aProcesses, $_REQUEST['start'], $_REQUEST['limit']);
$newDir = '/tmp/test/directory'; $newDir = '/tmp/test/directory';
$r = G::verifyPath( $newDir ); $r = G::verifyPath( $newDir );
$r->data = $aProcesses; $r->data = $aProcesses;