fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-3807

Browse Source
This commit is contained in:
Paula Quispe
2017-08-29 16:09:57 -04:00
parent 076d90d08b
commit f5abae1d33
4 changed files with 105 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
workflow/engine/methods/cases/casesListExtJs.php
View File

@@ -136,30 +136,31 @@ if ($action == "todo" || $action == "draft" || $action == "sent" || $action == "
}
//get values for the comboBoxes
$processes[] = array ('',G::LoadTranslation( 'ID_ALL_PROCESS' ));
$status = getStatusArray( $action, $userUid );
$processes[] = array('', G::LoadTranslation('ID_ALL_PROCESS'));
$status = getStatusArray($action, $userUid);
$category = getCategoryArray();
$oHeadPublisher->assign( 'reassignReaderFields', $reassignReaderFields ); //sending the fields to get from proxy
$oHeadPublisher->addExtJsScript( 'cases/reassignList', false );
$columnToSearch = getColumnsSearchArray();
$oHeadPublisher->assign('reassignReaderFields', $reassignReaderFields); //sending the fields to get from proxy
$oHeadPublisher->addExtJsScript('cases/reassignList', false);
$enableEnterprise = false;
if (class_exists( 'enterprisePlugin' )) {
if (class_exists('enterprisePlugin')) {
$enableEnterprise = true;
$oHeadPublisher->addExtJsScript(PATH_PLUGINS . "enterprise" . PATH_SEP . "advancedTools" . PATH_SEP , false, true);
$oHeadPublisher->addExtJsScript(PATH_PLUGINS . "enterprise" . PATH_SEP . "advancedTools" . PATH_SEP, false, true);
}
$oHeadPublisher->assign( 'pageSize', $pageSize ); //sending the page size
$oHeadPublisher->assign( 'columns', $columns ); //sending the columns to display in grid
$oHeadPublisher->assign( 'readerFields', $readerFields ); //sending the fields to get from proxy
$oHeadPublisher->assign( 'reassignColumns', $reassignColumns ); //sending the columns to display in grid
$oHeadPublisher->assign( 'action', $action ); //sending the action to make
$oHeadPublisher->assign( 'urlProxy', $urlProxy ); //sending the urlProxy to make
$oHeadPublisher->assign( 'PMDateFormat', $dateFormat ); //sending the fields to get from proxy
$oHeadPublisher->assign( 'statusValues', $status ); //Sending the listing of status
$oHeadPublisher->assign( 'processValues', $processes ); //Sending the listing of processes
$oHeadPublisher->assign( 'categoryValues', $category ); //Sending the listing of categories
$oHeadPublisher->assign( 'solrEnabled', $solrEnabled ); //Sending the status of solar
$oHeadPublisher->assign( 'enableEnterprise', $enableEnterprise ); //sending the page size
$oHeadPublisher->assign('pageSize', $pageSize); //sending the page size
$oHeadPublisher->assign('columns', $columns); //sending the columns to display in grid
$oHeadPublisher->assign('readerFields', $readerFields); //sending the fields to get from proxy
$oHeadPublisher->assign('reassignColumns', $reassignColumns); //sending the columns to display in grid
$oHeadPublisher->assign('action', $action); //sending the action to make
$oHeadPublisher->assign('urlProxy', $urlProxy); //sending the urlProxy to make
$oHeadPublisher->assign('PMDateFormat', $dateFormat); //sending the fields to get from proxy
$oHeadPublisher->assign('statusValues', $status); //Sending the listing of status
$oHeadPublisher->assign('processValues', $processes); //Sending the listing of processes
$oHeadPublisher->assign('categoryValues', $category); //Sending the listing of categories
$oHeadPublisher->assign('solrEnabled', $solrEnabled); //Sending the status of solar
$oHeadPublisher->assign('enableEnterprise', $enableEnterprise); //sending the page size
$oHeadPublisher->assign('columnSearchValues', $columnToSearch); //Sending the list of column for search: caseTitle, caseNumber, tasTitle
/*----------------------------------********---------------------------------*/
@@ -214,7 +215,6 @@ if(sizeof($fromPlugin)) {
}
}
$oHeadPublisher->assign( 'openReassignCallback', $jsFunction );
G::RenderPage( 'publish', 'extJs' );
function getCategoryArray ()
@@ -255,8 +255,6 @@ function getStatusArray($action, $userUid)
return $status;
}
//these getXX function gets the default fields in casesListSetup
/**
* get the list configuration headers of the cases checked for reassign, for the
* reassign cases list.
@@ -388,6 +386,18 @@ function getAdditionalFields($action, $confCasesList = array())
return $arrayConfig;
}
/**
* This function define the possibles columns for apply the specific search
* @return array $filters values of the dropdown
*/
function getColumnsSearchArray ()
{
$filters = [];
$filters[] = ['APP_TITLE', G::LoadTranslation('ID_CASE_TITLE')];
$filters[] = ['APP_NUMBER', G::LoadTranslation('ID_CASE_NUMBER')];
$filters[] = ['TAS_TITLE', G::LoadTranslation('ID_TASK')];
return $filters;
}
/*----------------------------------********---------------------------------*/
function getClientCredentials($clientId)

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

@@ -36,8 +36,8 @@ $dateTo = isset($_REQUEST["dateTo"]) ? substr($_REQUEST["dateTo"], 0, 10) : "";
$first = isset($_REQUEST["first"]) ? true : false;
$openApplicationUid = (isset($_REQUEST['openApplicationUid']) && $_REQUEST['openApplicationUid'] != '') ?
$_REQUEST['openApplicationUid'] : null;
$search = (!is_null($openApplicationUid)) ? $openApplicationUid : $search;
$columnSearch = isset($_REQUEST["columnSearch"]) ? strtoupper($_REQUEST["columnSearch"]) : "";
if ($sort == 'CASE_SUMMARY' || $sort == 'CASE_NOTES_COUNT') {
$sort = 'APP_NUMBER';//DEFAULT VALUE
@@ -81,7 +81,8 @@ try {
$sort,
$category,
$dateFrom,
$dateTo
$dateTo,
$columnSearch
);
} else {
$data = $apps->getAll(