From 87a6dcb526d144b09532644af091328e4a8033cb Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Wed, 22 Mar 2017 14:43:17 -0400 Subject: [PATCH 1/2] HOR-2761 --- workflow/engine/methods/cases/debug_vars.php | 95 ++++++++++++-------- 1 file changed, 56 insertions(+), 39 deletions(-) diff --git a/workflow/engine/methods/cases/debug_vars.php b/workflow/engine/methods/cases/debug_vars.php index 44a1d0d2e..4d3c2a70f 100644 --- a/workflow/engine/methods/cases/debug_vars.php +++ b/workflow/engine/methods/cases/debug_vars.php @@ -1,98 +1,115 @@ loadCase( $_SESSION['APPLICATION'] ); - $aVars = Array (); - for ($i = 0; $i < count( $_SESSION['TRIGGER_DEBUG']['DATA'] ); $i ++) { + $aFields = $oApp->loadCase($_SESSION['APPLICATION']); + $aVars = Array(); + $count = count($_SESSION['TRIGGER_DEBUG']['DATA']); + for ($i = 0; $i < $count; $i++) { $aVars[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value']; } - $aVars = array_merge( $aFields['APP_DATA'], $aVars ); + $aVars = array_merge($aFields['APP_DATA'], $aVars); $field = $aVars[$fieldname]; $response = new StdClass(); - $response->headers = Array (); - $response->columns = Array (); - $response->rows = Array (); + $response->headers = Array(); + $response->columns = Array(); + $response->rows = Array(); $sw = true; $j = 0; - if (is_array( $field )) { + if (is_array($field)) { foreach ($field as $row) { if ($sw) { foreach ($row as $key => $value) { - $response->headers[] = Array ('name' => $key); - $response->columns[] = Array ('header' => $key,'width' => 100,'dataIndex' => $key); + $response->headers[] = Array('name' => $key); + $response->columns[] = Array('header' => $key, 'width' => 100, 'dataIndex' => $key); } $sw = false; } - $tmp = Array (); + $tmp = Array(); foreach ($row as $key => $value) { $tmp[] = $value; } - $response->rows[$j ++] = $tmp; + $response->rows[$j++] = $tmp; } } else { - if (is_object( $field )) { - $response->headers = Array (Array ('name' => 'name' - ),Array ('name' => 'value' - ) + if (is_object($field)) { + $response->headers = Array( + Array('name' => 'name'), + Array('name' => 'value') ); - $response->columns = Array (Array ('header' => 'Property','width' => 100,'dataIndex' => 'name' - ),Array ('header' => 'Value','width' => 100,'dataIndex' => 'value' - ) + $response->columns = Array( + Array( + 'header' => 'Property', + 'width' => 100, + 'dataIndex' => 'name' + ), + Array( + 'header' => 'Value', + 'width' => 100, + 'dataIndex' => 'value' + ) ); foreach ($field as $key => $value) { - $response->rows[] = Array ($key,$value); + $response->rows[] = Array($key, $value); } } } - echo G::json_encode( $response ); + echo G::json_encode($response); break; default: - G::LoadClass( 'case' ); + G::LoadClass('case'); $oApp = new Cases(); - $aFields = $oApp->loadCase( $_SESSION['APPLICATION'] ); + $aFields = $oApp->loadCase($_SESSION['APPLICATION']); - $aVars = Array (); - for ($i = 0; $i < count( $_SESSION['TRIGGER_DEBUG']['DATA'] ); $i ++) { + $aVars = Array(); + $count = count($_SESSION['TRIGGER_DEBUG']['DATA']); + for ($i = 0; $i < $count; $i++) { $aVars[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value']; } - $aVars = array_merge( $aFields['APP_DATA'], $aVars ); + $aVars = array_merge($aFields['APP_DATA'], $aVars); - if (isset( $_POST['filter'] ) && $_POST['filter'] == 'dyn') { - $sysVars = array_keys( G::getSystemConstants() ); - $varNames = array_keys( $aVars ); + $systemConstants = G::getSystemConstants(); + //Add missing items + $systemConstants['PIN'] = $aVars['PIN']; + $systemConstants['APP_NUMBER'] = $aVars['APP_NUMBER']; + $systemConstants['__VAR_CHANGED__'] = $aVars['__VAR_CHANGED__']; + + if (isset($_POST['filter']) && $_POST['filter'] == 'dyn') { + $sysVars = array_keys($systemConstants); + $varNames = array_keys($aVars); foreach ($varNames as $var) { - if (in_array( $var, $sysVars )) { - unset( $aVars[$var] ); + if (in_array($var, $sysVars)) { + unset($aVars[$var]); } } } - if (isset( $_POST['filter'] ) && $_POST['filter'] == 'sys') { - $aVars = G::getSystemConstants(); + if (isset($_POST['filter']) && $_POST['filter'] == 'sys') { + $aVars = $systemConstants; } - ksort( $aVars ); + ksort($aVars); $return_object = new StdClass(); $return_object->totalCount = 1; foreach ($aVars as $i => $var) { - if (is_array( $var ) || is_object( $var )) { - $aVars[$i] = print_r( $var, true ); + if (is_array($var) || is_object($var)) { + $aVars[$i] = print_r($var, true); } } $return_object->data[0] = $aVars; - echo G::json_encode( $return_object ); + echo G::json_encode($return_object); break; } From 1b601c3dcad0775bf0462172510dbd4ae0d022d4 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 19 May 2017 09:44:46 -0400 Subject: [PATCH 2/2] HOR-2761 improvement --- workflow/engine/methods/cases/debug_vars.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workflow/engine/methods/cases/debug_vars.php b/workflow/engine/methods/cases/debug_vars.php index 4d3c2a70f..d1404f2d2 100644 --- a/workflow/engine/methods/cases/debug_vars.php +++ b/workflow/engine/methods/cases/debug_vars.php @@ -84,7 +84,10 @@ switch ($request) { //Add missing items $systemConstants['PIN'] = $aVars['PIN']; $systemConstants['APP_NUMBER'] = $aVars['APP_NUMBER']; - $systemConstants['__VAR_CHANGED__'] = $aVars['__VAR_CHANGED__']; + //when a case with dynaform is started there are no changed variables, this event is validated + if (isset($aVars['__VAR_CHANGED__'])) { + $systemConstants['__VAR_CHANGED__'] = $aVars['__VAR_CHANGED__']; + } if (isset($_POST['filter']) && $_POST['filter'] == 'dyn') { $sysVars = array_keys($systemConstants);