diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php index 440d70375..f559b08ce 100755 --- a/workflow/engine/classes/class.applications.php +++ b/workflow/engine/classes/class.applications.php @@ -527,7 +527,7 @@ class Applications // replacing the status data with their respective translation 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 diff --git a/workflow/engine/src/BusinessModel/Cases.php b/workflow/engine/src/BusinessModel/Cases.php index b59b5199d..1de787824 100644 --- a/workflow/engine/src/BusinessModel/Cases.php +++ b/workflow/engine/src/BusinessModel/Cases.php @@ -91,7 +91,7 @@ class Cases Validator::catUid($category, '$cat_uid'); } $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))) { $status = ''; } @@ -136,7 +136,6 @@ class Cases } } - if ($solrEnabled) { $result = $ApplicationSolrIndex->getAppGridData( $userUid, @@ -184,25 +183,25 @@ class Cases } } if ($paged == false) { - $result = $result['data']; + $response = $result['data']; } else { - $result['total'] = $result['totalCount']; - unset($result['totalCount']); - $result['start'] = $start+1; - $result['limit'] = $limit; - $result['sort'] = G::toLower($sort); - $result['dir'] = G::toLower($dir); - $result['cat_uid'] = $category; - $result['pro_uid'] = $process; - $result['search'] = $search; + $response['total'] = $result['totalCount']; + $response['start'] = $start+1; + $response['limit'] = $limit; + $response['sort'] = G::toLower($sort); + $response['dir'] = G::toLower($dir); + $response['cat_uid'] = $category; + $response['pro_uid'] = $process; + $response['search'] = $search; if ($action == 'search') { - $result['app_status'] = G::toLower($status); - $result['usr_uid'] = $user; - $result['date_from'] = $dateFrom; - $result['date_to'] = $dateTo; + $response['app_status'] = G::toLower($status); + $response['usr_uid'] = $user; + $response['date_from'] = $dateFrom; + $response['date_to'] = $dateTo; } + $response['data'] = $result['data']; } - return $result; + return $response; } /** diff --git a/workflow/engine/src/BusinessModel/Subprocess.php b/workflow/engine/src/BusinessModel/Subprocess.php index 1f185ab71..f2f327c4a 100644 --- a/workflow/engine/src/BusinessModel/Subprocess.php +++ b/workflow/engine/src/BusinessModel/Subprocess.php @@ -44,7 +44,7 @@ class Subprocess $response['spr_name'] = $aRow['con_value']; $response['spr_synchronous'] = $aRow['sp_synchronous']; $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']); } return $response; @@ -91,7 +91,7 @@ class Subprocess 'PRO_PARENT' => $pro_uid, 'TAS_PARENT' => $tas_uid, 'SP_TYPE' => 'SIMPLE', - 'SP_SYNCHRONOUS' => $spr_data['spr_synchronous'], + 'SP_SYNCHRONOUS' => (int)$spr_data['spr_synchronous'], 'SP_SYNCHRONOUS_TYPE' => 'ALL', 'SP_SYNCHRONOUS_WAIT' => 0, 'SP_VARIABLES_OUT' => serialize( $spr_data['spr_variables_out'] ),