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

Correccion en CASES LIST y SUBPROCESS

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-03-27 12:17:06 -04:00
parent a9141f16e2
commit dbb54e5b0e
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -527,7 +527,7 @@ class Applications
// replacing the status data with their respective translation // replacing the status data with their respective translation
if (isset( $aRow['APP_STATUS'] )) { if (isset( $aRow['APP_STATUS'] )) {
$aRow['APP_STATUS'] = G::LoadTranslation( "ID_{$aRow['APP_STATUS']}" ); $aRow['APP_STATUS_LABEL'] = G::LoadTranslation( "ID_{$aRow['APP_STATUS']}" );
} }
// replacing the priority data with their respective translation // replacing the priority data with their respective translation

33
workflow/engine/src/BusinessModel/Cases.php
View File

@@ -91,7 +91,7 @@ class Cases
Validator::catUid($category, '$cat_uid'); Validator::catUid($category, '$cat_uid');
} }
$status = G::toUpper($status); $status = G::toUpper($status);
$listStatus = array('TODO', 'DRAFT', 'COMPLETED', 'CANCEL', 'OPEN', 'CLOSE'); $listStatus = array('TO_DO', 'DRAFT', 'COMPLETED', 'CANCEL', 'OPEN', 'CLOSE');
if (!(in_array($status, $listStatus))) { if (!(in_array($status, $listStatus))) {
$status = ''; $status = '';
} }
@@ -136,7 +136,6 @@ class Cases
} }
} }
if ($solrEnabled) { if ($solrEnabled) {
$result = $ApplicationSolrIndex->getAppGridData( $result = $ApplicationSolrIndex->getAppGridData(
$userUid, $userUid,
@@ -184,25 +183,25 @@ class Cases
} }
} }
if ($paged == false) { if ($paged == false) {
$result = $result['data']; $response = $result['data'];
} else { } else {
$result['total'] = $result['totalCount']; $response['total'] = $result['totalCount'];
unset($result['totalCount']); $response['start'] = $start+1;
$result['start'] = $start+1; $response['limit'] = $limit;
$result['limit'] = $limit; $response['sort'] = G::toLower($sort);
$result['sort'] = G::toLower($sort); $response['dir'] = G::toLower($dir);
$result['dir'] = G::toLower($dir); $response['cat_uid'] = $category;
$result['cat_uid'] = $category; $response['pro_uid'] = $process;
$result['pro_uid'] = $process; $response['search'] = $search;
$result['search'] = $search;
if ($action == 'search') { if ($action == 'search') {
$result['app_status'] = G::toLower($status); $response['app_status'] = G::toLower($status);
$result['usr_uid'] = $user; $response['usr_uid'] = $user;
$result['date_from'] = $dateFrom; $response['date_from'] = $dateFrom;
$result['date_to'] = $dateTo; $response['date_to'] = $dateTo;
} }
$response['data'] = $result['data'];
} }
return $result; return $response;
} }
/** /**

4
workflow/engine/src/BusinessModel/Subprocess.php
View File

@@ -44,7 +44,7 @@ class Subprocess
$response['spr_name'] = $aRow['con_value']; $response['spr_name'] = $aRow['con_value'];
$response['spr_synchronous'] = $aRow['sp_synchronous']; $response['spr_synchronous'] = $aRow['sp_synchronous'];
$response['spr_variables_out'] = unserialize($aRow['sp_variables_out']); $response['spr_variables_out'] = unserialize($aRow['sp_variables_out']);
if ($response['spr_synchronous'] === 1) { if ((int)$response['spr_synchronous'] === 1) {
$response['spr_variables_in'] = unserialize($aRow['sp_variables_in']); $response['spr_variables_in'] = unserialize($aRow['sp_variables_in']);
} }
return $response; return $response;
@@ -91,7 +91,7 @@ class Subprocess
'PRO_PARENT' => $pro_uid, 'PRO_PARENT' => $pro_uid,
'TAS_PARENT' => $tas_uid, 'TAS_PARENT' => $tas_uid,
'SP_TYPE' => 'SIMPLE', 'SP_TYPE' => 'SIMPLE',
'SP_SYNCHRONOUS' => $spr_data['spr_synchronous'], 'SP_SYNCHRONOUS' => (int)$spr_data['spr_synchronous'],
'SP_SYNCHRONOUS_TYPE' => 'ALL', 'SP_SYNCHRONOUS_TYPE' => 'ALL',
'SP_SYNCHRONOUS_WAIT' => 0, 'SP_SYNCHRONOUS_WAIT' => 0,
'SP_VARIABLES_OUT' => serialize( $spr_data['spr_variables_out'] ), 'SP_VARIABLES_OUT' => serialize( $spr_data['spr_variables_out'] ),