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

HOR-245

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2016-03-07 08:56:49 -04:00
parent f57c8fe7d5
commit 75b4fd8913
2 changed files with 97 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
workflow/engine/classes/class.pmDynaform.php
View File

@@ -177,19 +177,19 @@ class pmDynaform
$json->sql = ""; $json->sql = "";
$json->optionsSql = array(); $json->optionsSql = array();
switch ((isset($json->datasource))? $json->datasource : 'database') { switch ((isset($json->datasource)) ? $json->datasource : 'database') {
case 'dataVariable': case 'dataVariable':
$dataVariable = (preg_match('/^\s*@.(.+)\s*$/', $json->dataVariable, $arrayMatch))? $dataVariable = (preg_match('/^\s*@.(.+)\s*$/', $json->dataVariable, $arrayMatch)) ?
$arrayMatch[1] : $json->dataVariable; $arrayMatch[1] : $json->dataVariable;
if (isset($this->fields['APP_DATA'][$dataVariable]) && if (isset($this->fields['APP_DATA'][$dataVariable]) &&
is_array($this->fields['APP_DATA'][$dataVariable]) && is_array($this->fields['APP_DATA'][$dataVariable]) &&
!empty($this->fields['APP_DATA'][$dataVariable]) !empty($this->fields['APP_DATA'][$dataVariable])
) { ) {
foreach ($this->fields['APP_DATA'][$dataVariable] as $row) { foreach ($this->fields['APP_DATA'][$dataVariable] as $row) {
$option = new stdClass(); $option = new stdClass();
$option->value = $row[0]; $option->value = $row[0];
$option->label = (isset($row[1]))? $row[1] : $row[0]; $option->label = (isset($row[1])) ? $row[1] : $row[0];
$json->optionsSql[] = $option; $json->optionsSql[] = $option;
} }
@@ -202,18 +202,16 @@ class pmDynaform
$cnn = Propel::getConnection($json->dbConnection); $cnn = Propel::getConnection($json->dbConnection);
$stmt = $cnn->createStatement(); $stmt = $cnn->createStatement();
$sql = G::replaceDataField($json->sql, $this->getValuesDependentFields($json)); $sql = G::replaceDataField($json->sql, $this->getValuesDependentFields($json));
$rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_NUM); $rs = $stmt->executeQuery($sql, \ResultSet::FETCHMODE_NUM);
while ($rs->next()) { while ($rs->next()) {
$row = $rs->getRow(); $row = $rs->getRow();
$option = new stdClass(); $option = new stdClass();
$option->value = $row[0]; $option->value = $row[0];
$option->label = (isset($row[1]))? $row[1] : $row[0]; $option->label = isset($row[1]) ? $row[1] : $row[0];
$json->optionsSql[] = $option; $json->optionsSql[] = $option;
} }
} catch (Exception $e) { } catch (Exception $e) {
} }
} }
break; break;
@@ -590,7 +588,7 @@ class pmDynaform
$data[$json->variable === "" ? $json->id : $json->variable] = $row[0]; $data[$json->variable === "" ? $json->id : $json->variable] = $row[0];
} }
} catch (Exception $e) { } catch (Exception $e) {
} }
} }
} }
@@ -713,9 +711,9 @@ class pmDynaform
" token: credentials,\n" . " token: credentials,\n" .
" submitRest: false\n" . " submitRest: false\n" .
" });\n" . " });\n" .
" $(document).find('form').find('button').on('click', function (e) {\n". " $(document).find('form').find('button').on('click', function (e) {\n" .
" e.preventDefault();\n" . " e.preventDefault();\n" .
" return false;\n". " return false;\n" .
" });\n" . " });\n" .
" $(document).find('form').submit(function (e) {\n" . " $(document).find('form').submit(function (e) {\n" .
" e.preventDefault();\n" . " e.preventDefault();\n" .
@@ -1389,6 +1387,80 @@ class pmDynaform
$con->commit(); $con->commit();
} }
/**
* Remove the posted values that are not in the definition of Dynaform.
* @param array $post
* @return array
*/
public function validatePost($post = array())
{
$aux = $post;
$json = G::json_decode($this->record["DYN_CONTENT"]);
$modeForm = $json->items[0]->mode;
foreach ($aux as $key => $value) {
if (substr($key, -6, 6) === "_label") {
continue;
}
$modeField = null;
$protectedValue = null;
$field = $this->jsonsf($json, $key, "variable");
if ($field !== null) {
if (isset($field->mode)) {
$modeField = $field->mode;
}
if ($modeField === "parent") {
$modeField = $modeForm;
}
if (isset($field->protectedValue)) {
$protectedValue = $field->protectedValue;
}
}
//insert for strict validation: || $modeField === "view" || $this->fields["STEP_MODE"] === "VIEW"
if ($field === null || $protectedValue === true) {
if (isset($post[$key])) {
unset($post[$key]);
}
if (isset($post[$key . "_label"])) {
unset($post[$key . "_label"]);
}
}
//columns
if (is_array($value)) {
foreach ($value as $keyRow => $valueRow) {
foreach ($valueRow as $keyCell => $valueCell) {
if (substr($keyCell, -6, 6) === "_label") {
continue;
}
$modeField = null;
$protectedValue = null;
$field = $this->jsonsf($json, $keyCell, "id");
if ($field !== null) {
if (isset($field->mode)) {
$modeField = $field->mode;
}
if ($modeField === "parent") {
$modeField = $modeForm;
}
if (isset($field->protectedValue)) {
$protectedValue = $field->protectedValue;
}
}
//insert for strict validation: || $modeField === "view" || $this->fields["STEP_MODE"] === "VIEW"
if ($field === null || $protectedValue === true) {
if (isset($post[$key][$keyRow][$keyCell])) {
unset($post[$key][$keyRow][$keyCell]);
}
if (isset($post[$key][$keyRow][$keyCell . "_label"])) {
unset($post[$key][$keyRow][$keyCell . "_label"]);
}
}
}
}
}
}
return $post;
}
private function clientToken() private function clientToken()
{ {
$client = $this->getClientCredentials(); $client = $this->getClientCredentials();

11
workflow/engine/methods/cases/cases_SaveData.php
View File

@@ -90,6 +90,17 @@ try {
$Fields = $oCase->loadCase( $_SESSION["APPLICATION"] ); $Fields = $oCase->loadCase( $_SESSION["APPLICATION"] );
if ($swpmdynaform) { if ($swpmdynaform) {
$oStep = new Step();
$oStep = $oStep->loadByProcessTaskPosition($_SESSION['PROCESS'], $_SESSION['TASK'], $_SESSION['STEP_POSITION']);
$dataFields = $Fields["APP_DATA"];
$dataFields["CURRENT_DYNAFORM"] = $_GET['UID'];
$dataFields["STEP_MODE"] = $oStep->getStepMode();
G::LoadClass('pmDynaform');
$oPmDynaform = new pmDynaform($dataFields);
$pmdynaform = $oPmDynaform->validatePost($pmdynaform);
$Fields["APP_DATA"] = array_merge( $Fields["APP_DATA"], $pmdynaform ); $Fields["APP_DATA"] = array_merge( $Fields["APP_DATA"], $pmdynaform );
} }