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

HOR-455

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2016-03-14 09:22:59 -04:00
parent eb614adb72
commit 3106877cfa
5 changed files with 130 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1437,70 +1437,43 @@ class pmDynaform
*/ */
public function validatePost($post = array()) public function validatePost($post = array())
{ {
$aux = $post; $result = array();
$json = G::json_decode($this->record["DYN_CONTENT"]); $previusFunction = $this->onPropertyRead;
$modeForm = $json->items[0]->mode; $this->onPropertyRead = function($json, $key, $value) use (&$post) {
foreach ($aux as $key => $value) { if ($key === "type" && isset($json->variable) && !empty($json->variable)) {
if (substr($key, -6, 6) === "_label") { if (isset($json->protectedValue) && $json->protectedValue === true) {
continue; if (isset($post[$json->variable])) {
} unset($post[$json->variable]);
$modeField = null; }
$protectedValue = null; if (isset($post[$json->variable . "_label"])) {
$field = $this->jsonsf($json, $key, "variable"); unset($post[$json->variable . "_label"]);
if ($field !== null) { }
if (isset($field->mode)) {
$modeField = $field->mode;
} }
if ($modeField === "parent") { if ($json->type === "grid" && is_array($json->columns)) {
$modeField = $modeForm; foreach ($json->columns as $column) {
} if (isset($column->protectedValue) && $column->protectedValue === true) {
if (isset($field->protectedValue)) { $dataGrid = is_array($post[$json->variable]) ? $post[$json->variable] : array();
$protectedValue = $field->protectedValue; foreach ($dataGrid as $keyRow => $row) {
} if (isset($post[$json->variable][$keyRow][$column->id])) {
} unset($post[$json->variable][$keyRow][$column->id]);
//insert for strict validation: || $modeField === "view" || $this->fields["STEP_MODE"] === "VIEW" }
if ($field === null || $protectedValue === true) { if (isset($post[$json->variable][$keyRow][$column->id . "_label"])) {
if (isset($post[$key])) { unset($post[$json->variable][$keyRow][$column->id . "_label"]);
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"]);
} }
} }
} }
} }
//validator data
$validatorClass = ProcessMaker\BusinessModel\DynaForm\ValidatorFactory::createValidatorClass($json->type, $json);
if ($validatorClass !== null) {
$validatorClass->validatePost($post);
}
} }
} };
$json = G::json_decode($this->record["DYN_CONTENT"]);
$this->jsonr($json);
$this->onPropertyRead = $previusFunction;
return $post; return $post;
} }

15
workflow/engine/src/ProcessMaker/BusinessModel/DynaForm/Validator.php Normal file
View File

@@ -0,0 +1,15 @@
<?php
namespace ProcessMaker\BusinessModel\DynaForm;
abstract class Validator implements ValidatorInterface
{
protected $json;
public function __construct($json)
{
$this->json = $json;
}
}

20
workflow/engine/src/ProcessMaker/BusinessModel/DynaForm/ValidatorCheckGroup.php Normal file
View File

@@ -0,0 +1,20 @@
<?php
namespace ProcessMaker\BusinessModel\DynaForm;
class ValidatorCheckGroup extends Validator
{
public function validatePost(&$post)
{
$json = $this->json;
if ($json === null) {
return;
}
if (!isset($post[$json->variable])) {
$post[$json->variable] = array();
$post[$json->variable . "_label"] = \G::json_encode(array());
}
}
}

55
workflow/engine/src/ProcessMaker/BusinessModel/DynaForm/ValidatorFactory.php Normal file
View File

@@ -0,0 +1,55 @@
<?php
namespace ProcessMaker\BusinessModel\DynaForm;
class ValidatorFactory
{
const TITLE = "title";
const SUBTITLE = "subtitle";
const LABEL = "label"; //deprecated
const LINK = "link";
const IMAGE = "image";
const FILE = "file";
const SUBMIT = "submit";
const BUTTON = "button";
const GRID = "grid";
const SUBFORM = "subform";
const TEXT = "text";
const TEXTAREA = "textarea";
const DROPDOWN = "dropdown";
const CHECKBOX = "checkbox";
const CHECKGROUP = "checkgroup";
const RADIO = "radio";
const DATETIME = "datetime";
const SUGGEST = "suggest";
const HIDDEN = "hidden";
const FORM = "form";
const CELL = "cell";
const ANNOTATION = "label"; //todo
const GEOMAP = "location";
const QRCODE = "scannerCode";
const SIGNATURE = "signature";
const IMAGEM = "imageMobile";
const AUDIOM = "audioMobile";
const VIDEOM = "videoMobile";
const PANEL = "panel";
const MSGPANEL = "msgPanel";
/**
*
* @param type $type
* @param type $json
* @return \ProcessMaker\BusinessModel\DynaForm\ValidatorInterface
*/
public static function createValidatorClass($type = '', $json = null)
{
switch ($type) {
case ValidatorFactory::CHECKGROUP:
return new ValidatorCheckGroup($json);
default :
return null;
}
}
}

9
workflow/engine/src/ProcessMaker/BusinessModel/DynaForm/ValidatorInterface.php Normal file
View File

@@ -0,0 +1,9 @@
<?php
namespace ProcessMaker\BusinessModel\DynaForm;
interface ValidatorInterface
{
public function validatePost(&$post);
}