From d81b77f299add0b351dbeef931facb77b6500ede Mon Sep 17 00:00:00 2001 From: Rodrigo Quelca Date: Wed, 27 Feb 2019 15:22:43 -0400 Subject: [PATCH 1/3] PMC-529: Implement the asynchronous dependent fields in pmDynaform --- workflow/engine/templates/cases/pmdynaform.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workflow/engine/templates/cases/pmdynaform.html b/workflow/engine/templates/cases/pmdynaform.html index fd91d6578..94d048711 100644 --- a/workflow/engine/templates/cases/pmdynaform.html +++ b/workflow/engine/templates/cases/pmdynaform.html @@ -11,6 +11,7 @@ + @@ -21,6 +22,7 @@ + From c3145df6ff5218c554169da8350aebc3516aad5a Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Wed, 13 Mar 2019 09:09:42 -0400 Subject: [PATCH 2/3] PMC-551 --- workflow/engine/classes/PmDynaform.php | 99 ++++++++++++++++--- .../translations/english/processmaker.en.po | 6 ++ workflow/engine/data/mysql/insert.sql | 1 + .../ProcessMaker/BusinessModel/Variable.php | 7 ++ 4 files changed, 99 insertions(+), 14 deletions(-) diff --git a/workflow/engine/classes/PmDynaform.php b/workflow/engine/classes/PmDynaform.php index 4169c3a10..033dfc8ce 100644 --- a/workflow/engine/classes/PmDynaform.php +++ b/workflow/engine/classes/PmDynaform.php @@ -14,27 +14,65 @@ class PmDynaform { use SuggestTrait; - public static $instance = null; - public $fields = null; - public $record = null; - public $records = null; + private $cache = []; + private $context = []; + private $databaseProviders = null; + private $dataSources = null; + private $lastQueryError = null; + private $propertiesToExclude = []; + private $sysSys = null; public $credentials = null; + public $displayMode = null; + public $fields = null; + public $isRTL = false; public $lang = SYS_LANG; public $langs = null; - public $displayMode = null; public $onPropertyRead = "onPropertyReadFormInstance"; - public $isRTL = false; public $pathRTLCss = ''; + public $record = null; + public $records = null; public $serverConf = null; - private $cache = array(); - private $sysSys = null; - private $context = array(); - private $dataSources = null; - private $databaseProviders = null; - private $propertiesToExclude = array(); - public static $prefixs = array("@@", "@#", "@%", "@?", "@$", "@="); + public static $instance = null; + public static $prefixs = ["@@", "@#", "@%", "@?", "@$", "@="]; - public function __construct($fields = array()) + /** + * Constructor + * + * @param array $fields + * @see workflow/engine/classes/class.pmFunctions.php PMFDynaFormFields() + * @see workflow/engine/classes/class.pmFunctions.php PMFgetLabelOption() + * @see \ConsolidatedCases->processConsolidated() + * @see \WorkspaceTools->syncFormsWithInputDocumentInfo() + * @see workflow/engine/methods/cases/ajaxListener.php Ajax->dynaformViewFromHistory() + * @see workflow/engine/methods/cases/caseConsolidated.php + * @see workflow/engine/methods/cases/cases_SaveData.php + * @see workflow/engine/methods/cases/cases_Step.php + * @see workflow/engine/methods/cases/cases_StepToRevise.php + * @see workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php + * @see workflow/engine/methods/cases/pmDynaform.php + * @see workflow/engine/methods/cases/summary.php + * @see workflow/engine/methods/services/ActionsByEmailDataForm.php + * @see workflow/engine/plugins/EnterpriseSearch/display_dynaform.php + * @see workflow/engine/plugins/EnterpriseSearch/dynaform_view1.php + * @see \ProcessMaker\BusinessModel\ActionsByEmail->viewFormBpmn() + * @see \ProcessMaker\BusinessModel\Cases->getCaseVariables() + * @see \ProcessMaker\BusinessModel\Consolidated->getDataGenerate() + * @see \ProcessMaker\BusinessModel\InputDocument->update() + * @see \ProcessMaker\BusinessModel\Light\Tracker->showObjects() + * @see \ProcessMaker\BusinessModel\Variable->delete() + * @see \ProcessMaker\BusinessModel\Variable->executeSqlControl() + * @see \ProcessMaker\BusinessModel\Variable->update() + * @see \ProcessMaker\Core\System\ActionsByEmailCoreClass->sendActionsByEmail() + * @see \ProcessMaker\Services\Api\Light->doGetDynaForm() + * @see \ProcessMaker\Services\Api\Light->doGetDynaformProcessed() + * @see \ProcessMaker\Services\Api\Light->doGetDynaForms() + * @see \ProcessMaker\Services\Api\Light->doGetDynaFormsId() + * @see \ProcessMaker\Services\Api\Project\DynaForm->doDeleteDynaFormLanguage() + * @see \ProcessMaker\Services\Api\Project\DynaForm->doGetDynaFormLanguage() + * @see \ProcessMaker\Services\Api\Project\DynaForm->doGetListDynaFormLanguage() + * @see \ProcessMaker\Services\Api\Project\DynaForm->doPostDynaFormLanguage() + */ + public function __construct($fields = []) { $this->sysSys = (!empty(config("system.workspace"))) ? config("system.workspace") : "Undefined"; $this->context = \Bootstrap::getDefaultContextLog(); @@ -738,6 +776,17 @@ class PmDynaform return $data; } + /** + * Get data from cache query. + * + * @param string $connection + * @param string $sql + * @param string $type + * @param boolean $clearCache + * @return array + * @see \PmDynaform->jsonr() + * @see \PmDynaform->getValuesDependentFields() + */ private function getCacheQueryData($connection, $sql, $type = "", $clearCache = false) { $data = []; @@ -766,6 +815,7 @@ class PmDynaform } catch (Exception $e) { $this->context["action"] = "execute-sql" . $type; $this->context["exception"] = (array) $e; + $this->lastQueryError = $e; \Bootstrap::registerMonolog("sqlExecution", 400, "Sql Execution", @@ -2237,5 +2287,26 @@ class PmDynaform $googleMaps->signature = $config['google_map_signature']; $result = 'var googleMaps = ' . G::json_encode($googleMaps) . ';'; return $result; + } + + /** + * Get last query error. + * + * @return object + * @see ProcessMaker\BusinessModel\Variable->executeSqlControl() + */ + public function getLastQueryError() + { + return $this->lastQueryError; + } + + /** + * Clear last query error. + * + * @see ProcessMaker\BusinessModel\Variable->executeSqlControl() + */ + public function clearLastQueryError() + { + $this->lastQueryError = null; } } diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 8f6edb9b1..808692b8f 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -7469,6 +7469,12 @@ msgstr "There was a problem installing this add-on." msgid "Error in server" msgstr "Error in server" +# TRANSLATION +# LABEL/ID_ERROR_IN_THE_QUERY +#: LABEL/ID_ERROR_IN_THE_QUERY +msgid "Error in the query" +msgstr "Error in the query" + # TRANSLATION # LABEL/ID_ERROR_JS_NOT_AVAILABLE #: LABEL/ID_ERROR_JS_NOT_AVAILABLE diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 176ec2005..0e20f4b99 100644 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -58066,6 +58066,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_ERROR_INSERT_LINE','en','Error trying to insert the line','2014-01-15') , ( 'LABEL','ID_ERROR_INSTALLING_ADDON','en','There was a problem installing this add-on.','2014-10-21') , ( 'LABEL','ID_ERROR_IN_SERVER','en','Error in server','2015-09-15') , +( 'LABEL','ID_ERROR_IN_THE_QUERY','en','Error in the query','2019-03-12') , ( 'LABEL','ID_ERROR_JS_NOT_AVAILABLE','en','Your browser doesn''t support JavaScript or it may be disabled. Please use a different browser or enable JavaScript. Dynaforms won''t entirely work because JavaScript is required.','2014-10-21') , ( 'LABEL','ID_ERROR_MESSAGE','en','Error Message','2017-02-22') , ( 'LABEL','ID_ERROR_OBJECT_NOT_EXISTS','en','Error: Object does not exist.','2014-01-15') , diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php index 4ebb70939..ac7c5e18b 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php @@ -749,6 +749,8 @@ class Variable * * @return array * @throws Exception + * @see ProcessMaker\BusinessModel\Variable->executeSql() + * @see ProcessMaker\BusinessModel\Variable->executeSqlSuggest() */ public function executeSqlControl($proUid, array $params = []) { @@ -809,7 +811,12 @@ class Variable } //Populate control data + $pmDynaform->clearLastQueryError(); $pmDynaform->jsonr($field); + $error = $pmDynaform->getLastQueryError(); + if (!empty($error) && is_object($error)) { + throw new Exception(G::LoadTranslation("ID_ERROR_IN_THE_QUERY")); + } $result = []; if (isset($field->queryOutputData) && is_array($field->queryOutputData)) { foreach ($field->queryOutputData as $item) { From ad220584a0585263b101a54dda5142c39c27cdef Mon Sep 17 00:00:00 2001 From: Andrea Adamczyk Date: Thu, 16 May 2019 15:54:07 -0400 Subject: [PATCH 3/3] Fix conflicts in cherry pick --- workflow/engine/classes/PmDynaform.php | 30 ++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/workflow/engine/classes/PmDynaform.php b/workflow/engine/classes/PmDynaform.php index 033dfc8ce..ebd0ab8e3 100644 --- a/workflow/engine/classes/PmDynaform.php +++ b/workflow/engine/classes/PmDynaform.php @@ -682,6 +682,8 @@ class PmDynaform } $json->rows = count($rows); $json->data = $rows; + + $this->setDataSchema($json, $this->fields["APP_DATA"][$json->name]); } } //languages @@ -2309,4 +2311,32 @@ class PmDynaform { $this->lastQueryError = null; } + + /** + * This adds a new definition on the json dynaform + * @param json $json + * + * @link https://wiki.processmaker.com/3.0/Grid_Control + * @see workflow/engine/classes/PmDynaform->jsonr + */ + public function setDataSchema($json, $appDataVariables) + { + foreach ($json->data as $key => $value) { + $columnsData = []; + foreach ($json->columns as $keyData => $valueData) { + foreach ($appDataVariables as $keyAppData => $valueAppData) { + if (array_key_exists($valueData->id, $valueAppData) || array_key_exists($valueData->id . "_label", + $valueAppData) || array_key_exists($valueData->name, + $valueAppData) || array_key_exists($valueData->name . "_label", $valueAppData)) { + array_push($columnsData, ["defined" => true]); + break; + } else { + array_push($columnsData, ["defined" => false]); + break; + } + } + } + $json->dataSchema[$key] = $columnsData; + } + } }