From 1d38c1d51dea4ecaa3c0061f23bc89539d925453 Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Fri, 18 Jul 2014 11:51:40 -0400 Subject: [PATCH 1/6] Se adiciona el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields --- .../ProcessMaker/BusinessModel/DynaForm.php | 69 +++++++++++++++++++ .../Services/Api/Project/DynaForm.php | 20 ++++++ 2 files changed, 89 insertions(+) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php index 83244e39d..1cca4c7ae 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php @@ -1001,5 +1001,74 @@ class DynaForm throw $e; } } + + /** + * Get data of a DynaForm + * + * @param string $projectUid Unique id of Project + * @param string $dynaFormUid Unique id of DynaForm + * + * return array Return an array with data of a DynaForm + */ + public function getDynaFormFields($projectUid, $dynaFormUid) + { + try { + + //Verify data + Validator::proUid($projectUid, '$prj_uid'); + $this->throwExceptionIfNotExistsDynaForm($dynaFormUid, "", $this->arrayFieldNameForException["dynaFormUid"]); + + //Get data + $criteria = new \Criteria("workflow"); + + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_UID); + $criteria->addSelectColumn(\ProcessVariablesPeer::PRJ_UID); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_NAME); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_FIELD_TYPE); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_FIELD_SIZE); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_LABEL); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_DBCONNECTION); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_SQL); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_NULL); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_DEFAULT); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_ACCEPTED_VALUES); + + $criteria->add(\ProcessVariablesPeer::PRJ_UID, $projectUid, \Criteria::EQUAL); + + $rsCriteria = \ProcessVariablesPeer::doSelectRS($criteria); + + $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); + + $rsCriteria->next(); + $arrayVariables = array(); + + while ($aRow = $rsCriteria->getRow()) { + if ($aRow['VAR_NULL'] == 1) { + $required = true; + } else { + $required = false; + } + $arrayVariables[] = array('var_uid' => $aRow['VAR_UID'], + 'name' => $aRow['VAR_NAME'], + 'valueType' => $aRow['VAR_FIELD_TYPE'], + 'maxLength' => (int)$aRow['VAR_FIELD_SIZE'], + 'label' => $aRow['VAR_LABEL'], + 'dbConnection' => $aRow['VAR_DBCONNECTION'], + 'sql' => $aRow['VAR_SQL'], + 'required' => $required, + 'default' => $aRow['VAR_DEFAULT'], + 'options' => $aRow['VAR_ACCEPTED_VALUES']); + $rsCriteria->next(); + } + //Return + return $arrayVariables; + + + + } catch (\Exception $e) { + throw $e; + } + } + } diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php index a8c78edd2..612a60a86 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php @@ -92,5 +92,25 @@ class DynaForm extends Api throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); } } + + /** + * @url GET /:prj_uid/dynaform/:dyn_uid/fields + * + * @param string $dyn_uid {@min 32}{@max 32} + * @param string $prj_uid {@min 32}{@max 32} + */ + public function doGetDynaFormFields($dyn_uid, $prj_uid) + { + try { + $dynaForm = new \ProcessMaker\BusinessModel\DynaForm(); + $dynaForm->setFormatFieldNameInUppercase(false); + + $response = $dynaForm->getDynaFormFields($prj_uid, $dyn_uid); + + return $response; + } catch (\Exception $e) { + throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); + } + } } From d0210e96b3ecbed6b8f61be3e792660f54dcee7b Mon Sep 17 00:00:00 2001 From: eriknyk Date: Fri, 18 Jul 2014 16:52:13 -0400 Subject: [PATCH 2/6] adding Bpmn Participant handling support --- .../engine/classes/model/BpmnParticipant.php | 159 +++++++++++++++++- .../Project/Adapter/BpmnWorkflow.php | 48 ++++++ .../engine/src/ProcessMaker/Project/Bpmn.php | 84 +++++++++ 3 files changed, 290 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/model/BpmnParticipant.php b/workflow/engine/classes/model/BpmnParticipant.php index 751baa018..b74b2245e 100644 --- a/workflow/engine/classes/model/BpmnParticipant.php +++ b/workflow/engine/classes/model/BpmnParticipant.php @@ -14,6 +14,163 @@ require_once 'classes/model/om/BaseBpmnParticipant.php'; * * @package classes.model */ -class BpmnParticipant extends BaseBpmnParticipant { +class BpmnParticipant extends BaseBpmnParticipant +{ + private $bound; + public function __construct($generateUid = true) + { + $this->bound = new BpmnBound(); + $this->setBoundDefaults(); + } + + public function getBound() + { + return $this->bound; + } + + private function setBoundDefaults() + { + $this->bound->setBouElementType(lcfirst(str_replace(__NAMESPACE__, '', __CLASS__))); + $this->bound->setBouElement('pm_canvas'); + $this->bound->setBouContainer('bpmnDiagram'); + + $this->bound->setPrjUid($this->getPrjUid()); + $this->bound->setElementUid($this->getParUid()); + + $process = BpmnProcessPeer::retrieveByPK($this->getProUid()); + + if (is_object($process)) { + $this->bound->setDiaUid($process->getDiaUid()); + } + } + + public static function findOneBy($field, $value) + { + $rows = self::findAllBy($field, $value); + + return empty($rows) ? null : $rows[0]; + } + + public static function findAllBy($field, $value) + { + $c = new Criteria('workflow'); + $c->add($field, $value, Criteria::EQUAL); + + return BpmnParticipantPeer::doSelect($c); + } + + public static function getAll($prjUid = null, $start = null, $limit = null, $filter = '', $changeCaseTo = CASE_UPPER) + { + $c = new Criteria('workflow'); + $c->addSelectColumn("BPMN_PARTICIPANT.*"); + $c->addSelectColumn("BPMN_BOUND.*"); + $c->addJoin(BpmnParticipantPeer::PAR_UID, BpmnBoundPeer::ELEMENT_UID, Criteria::LEFT_JOIN); + + if (! is_null($prjUid)) { + $c->add(BpmnParticipantPeer::PRJ_UID, $prjUid, Criteria::EQUAL); + } + + $rs = BpmnParticipantPeer::doSelectRS($c); + $rs->setFetchmode(\ResultSet::FETCHMODE_ASSOC); + + $participants = array(); + + while ($rs->next()) { + $participants[] = $changeCaseTo !== CASE_UPPER ? array_change_key_case($rs->getRow(), CASE_LOWER) : $rs->getRow(); + } + + return $participants; + } + + // OVERRIDES + + public function setParUid($actUid) + { + parent::setParUid($actUid); + $this->bound->setElementUid($this->getParUid()); + } + + public function setPrjUid($prjUid) + { + parent::setPrjUid($prjUid); + $this->bound->setPrjUid($this->getPrjUid()); + } + + public function setProUid($proUid) + { + parent::setProUid($proUid); + + $process = BpmnProcessPeer::retrieveByPK($this->getProUid()); + $this->bound->setDiaUid($process->getDiaUid()); + } + + public function save($con = null) + { + parent::save($con); + + $this->setBoundDefaults(); + + if ($this->bound->getBouUid() == "") { + $this->bound->setBouUid(\ProcessMaker\Util\Common::generateUID()); + } + + $this->bound->save($con); + } + + public function delete($con = null) + { + // first, delete the related bound object + if (! is_object($this->bound) || $this->bound->getBouUid() == "") { + $this->bound = BpmnBound::findByElement('Participant', $this->getParUid()); + } + + if (is_object($this->bound)) { + $this->bound->delete($con); + } + + parent::delete($con); + } + + public function fromArray($data, $type = BasePeer::TYPE_FIELDNAME) + { + parent::fromArray($data, $type); + + $bound = BpmnBound::findByElement('Participant', $this->getParUid()); + + if (is_object($bound)) { + $this->bound = $bound; + } else { + $this->bound = new BpmnBound(); + $this->bound->setBouUid(ProcessMaker\Util\Common::generateUID()); + } + + $this->bound->fromArray($data, BasePeer::TYPE_FIELDNAME); + } + + public function toArray($type = BasePeer::TYPE_FIELDNAME) + { + $data = parent::toArray($type); + $bouUid = $this->bound->getBouUid(); + + if (empty($bouUid)) { + $bound = BpmnBound::findByElement('Participant', $this->getParUid()); + + if (is_object($bound)) { + $this->bound = $bound; + } + } + + $data = array_merge($data, $this->bound->toArray($type)); + + return $data; + } + + public static function exists($actUid) + { + $c = new Criteria("workflow"); + $c->add(BpmnParticipantPeer::PAR_UID, $actUid); + + return BpmnParticipantPeer::doCount($c) > 0 ? true : false; + } } // BpmnParticipant diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php index 6dbdb462b..6aaa0ce29 100644 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php @@ -673,6 +673,7 @@ class BpmnWorkflow extends Project\Bpmn $diagram["laneset"] = $bwp->getLanesets($configList); $diagram["lanes"] = $bwp->getLanes($configList); $diagram["data"] = $bwp->getDataCollection($configList); + $diagram["participants"] = $bwp->getParticipants($configList); $project["diagrams"][] = $diagram; } @@ -962,6 +963,53 @@ class BpmnWorkflow extends Project\Bpmn } } + //// + /* + * Diagram's Participant Handling + */ + $whiteList = array(); + foreach ($diagram["participants"] as $i => $participantData) { + $participantData = array_change_key_case($participantData, CASE_UPPER); + unset($participantData["_EXTENDED"]); + + $dataObject = $bwp->getParticipant($participantData["PAR_UID"]); + + if ($forceInsert || is_null($dataObject)) { + if ($generateUid) { + //Event + unset($participantData["BOU_UID"]); + + $uidOld = $participantData["PAR_UID"]; + $participantData["PAR_UID"] = Util\Common::generateUID(); + + $result[] = array( + "object" => "participant", + "old_uid" => $uidOld, + "new_uid" => $participantData["PAR_UID"] + ); + } + + $bwp->addParticipant($participantData); + } elseif (! $bwp->isEquals($dataObject, $participantData)) { + $bwp->updateParticipant($participantData["PAR_UID"], $participantData); + } else { + Util\Logger::log("Update Participant ({$participantData["PAR_UID"]}) Skipped - No changes required"); + } + + $diagram["participant"][$i] = $participantData; + $whiteList[] = $participantData["PAR_UID"]; + } + + $dataCollection = $bwp->getParticipants(); + + // looking for removed elements + foreach ($dataCollection as $participantData) { + if (! in_array($participantData["PAR_UID"], $whiteList)) { + // If it is not in the white list, then remove them + $bwp->removeParticipant($participantData["PAR_UID"]); + } + } + /* * Diagram's Flows Handling diff --git a/workflow/engine/src/ProcessMaker/Project/Bpmn.php b/workflow/engine/src/ProcessMaker/Project/Bpmn.php index bd509d72e..394d50a7a 100644 --- a/workflow/engine/src/ProcessMaker/Project/Bpmn.php +++ b/workflow/engine/src/ProcessMaker/Project/Bpmn.php @@ -24,6 +24,8 @@ use \BpmnEventPeer as EventPeer; use \BpmnGatewayPeer as GatewayPeer; use \BpmnFlowPeer as FlowPeer; use \BpmnArtifactPeer as ArtifactPeer; +use \BpmnParticipant as Participant; +use \BpmnParticipantPeer as ParticipantPeer; use \BasePeer; @@ -73,6 +75,7 @@ class Bpmn extends Handler ), "flow" => array("PRJ_UID", "DIA_UID", "FLO_ELEMENT_DEST_PORT", "FLO_ELEMENT_ORIGIN_PORT"), "data" => array("PRJ_UID"), + "participant" => array("PRJ_UID"), ); @@ -872,6 +875,87 @@ class Bpmn extends Handler } //////2222 + public function addParticipant($data) + { + // setting defaults + $data['PAR_UID'] = array_key_exists('PAR_UID', $data) ? $data['PAR_UID'] : Common::generateUID(); + try { + self::log("Add Participant with data: ", $data); + $participant = new Participant(); + $participant->fromArray($data, BasePeer::TYPE_FIELDNAME); + $participant->setPrjUid($this->getUid()); + $participant->setProUid($this->getProcess("object")->getProUid()); + $participant->save(); + self::log("Add Participant Success!"); + } catch (\Exception $e) { + self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString()); + throw $e; + } + + return $participant->getParUid(); + } + + public function updateParticipant($parUid, $data) + { + try { + self::log("Update Participant: $parUid", "With data: ", $data); + + $participant = ParticipantPeer::retrieveByPk($parUid); + + $participant->fromArray($data); + $participant->save(); + + self::log("Update Participant Success!"); + } catch (\Exception $e) { + self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString()); + throw $e; + } + } + + public function getParticipant($parUid, $retType = 'array') + { + $participant = ParticipantPeer::retrieveByPK($parUid); + + if ($retType != "object" && ! empty($participant)) { + $participant = $participant->toArray(); + $participant = self::filterArrayKeys($participant, self::$excludeFields["participant"]); + } + + return $participant; + } + + public function getParticipants($start = null, $limit = null, $filter = '', $changeCaseTo = CASE_UPPER) + { + if (is_array($start)) { + extract($start); + } + + $filter = $changeCaseTo != CASE_UPPER ? array_map("strtolower", self::$excludeFields["participant"]) : self::$excludeFields["participant"]; + + return self::filterCollectionArrayKeys( + Participant::getAll($this->getUid(), $start, $limit, $filter, $changeCaseTo), + $filter + ); + } + + public function removeParticipant($parUid) + { + try { + self::log("Remove Participant: $parUid"); + + $participant = ParticipantPeer::retrieveByPK($parUid); + $participant->delete(); + + // remove related object (flows) + Flow::removeAllRelated($parUid); + + self::log("Remove Participant Success!"); + } catch (\Exception $e) { + self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString()); + throw $e; + } + } + public function addLane($data) { // TODO: Implement update() method. From f137ccb76605ac1efc7e7364acf5f1807d0643c8 Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Fri, 18 Jul 2014 16:58:27 -0400 Subject: [PATCH 3/6] Se adiciona el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields --- .../ProcessMaker/BusinessModel/DynaForm.php | 171 ++++++++++++++---- 1 file changed, 134 insertions(+), 37 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php index 1cca4c7ae..16caf4cc7 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php @@ -1013,58 +1013,155 @@ class DynaForm public function getDynaFormFields($projectUid, $dynaFormUid) { try { - + $arrayVariables = array(); //Verify data Validator::proUid($projectUid, '$prj_uid'); $this->throwExceptionIfNotExistsDynaForm($dynaFormUid, "", $this->arrayFieldNameForException["dynaFormUid"]); //Get data $criteria = new \Criteria("workflow"); - - $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_UID); - $criteria->addSelectColumn(\ProcessVariablesPeer::PRJ_UID); - $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_NAME); - $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_FIELD_TYPE); - $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_FIELD_SIZE); - $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_LABEL); - $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_DBCONNECTION); - $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_SQL); - $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_NULL); - $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_DEFAULT); - $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_ACCEPTED_VALUES); - - $criteria->add(\ProcessVariablesPeer::PRJ_UID, $projectUid, \Criteria::EQUAL); - - $rsCriteria = \ProcessVariablesPeer::doSelectRS($criteria); - + $criteria->addSelectColumn(\DynaformPeer::DYN_CONTENT); + $criteria->add(\DynaformPeer::DYN_UID, $dynaFormUid, \Criteria::EQUAL); + $rsCriteria = \DynaformPeer::doSelectRS($criteria); $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); - $rsCriteria->next(); - $arrayVariables = array(); while ($aRow = $rsCriteria->getRow()) { - if ($aRow['VAR_NULL'] == 1) { - $required = true; - } else { - $required = false; - } - $arrayVariables[] = array('var_uid' => $aRow['VAR_UID'], - 'name' => $aRow['VAR_NAME'], - 'valueType' => $aRow['VAR_FIELD_TYPE'], - 'maxLength' => (int)$aRow['VAR_FIELD_SIZE'], - 'label' => $aRow['VAR_LABEL'], - 'dbConnection' => $aRow['VAR_DBCONNECTION'], - 'sql' => $aRow['VAR_SQL'], - 'required' => $required, - 'default' => $aRow['VAR_DEFAULT'], - 'options' => $aRow['VAR_ACCEPTED_VALUES']); + $contentDecode = json_decode($aRow['DYN_CONTENT'],true); $rsCriteria->next(); } + $content = $contentDecode['items'][0]['items']; + + foreach ($content as $key => $value) { + + $valueType = (isset($value[0]["valueType"])) ? $value[0]["valueType"]:null; + $maxLength = (isset($value[0]["maxLength"])) ? $value[0]["maxLength"]:null; + $label = (isset($value[0]["label"])) ? $value[0]["label"]:null; + $defaultValue = (isset($value[0]["defaultValue"])) ? $value[0]["defaultValue"]:null; + $required = (isset($value[0]["required"])) ? $value[0]["required"]:null; + $dbConnection = (isset($value[0]["dbConnection"])) ? $value[0]["dbConnection"]:null; + $sql = (isset($value[0]["sql"])) ? $value[0]["sql"]:null; + $options = (isset($value[0]["options"])) ? $value[0]["options"]:null; + //fields properties + $type = (isset($value[0]["type"])) ? $value[0]["type"]:null; + $colSpan = (isset($value[0]["colSpan"])) ? $value[0]["colSpan"]:null; + $name = (isset($value[0]["name"])) ? $value[0]["name"]:null; + $readonly = (isset($value[0]["readonly"])) ? $value[0]["readonly"]:null; + $hint = (isset($value[0]["hint"])) ? $value[0]["hint"]:null; + $dependentsField = (isset($value[0]["dependentsField"])) ? $value[0]["dependentsField"]:null; + $placeHolder = (isset($value[0]["placeHolder"])) ? $value[0]["placeHolder"]:null; + $pickType = (isset($value[0]["pickType"])) ? $value[0]["pickType"]:null; + + if (isset($value[0]["variable"])) { + $variable = $value[0]["variable"]; + + $criteria = new \Criteria("workflow"); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_UID); + $criteria->addSelectColumn(\ProcessVariablesPeer::PRJ_UID); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_NAME); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_FIELD_TYPE); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_FIELD_SIZE); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_LABEL); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_DBCONNECTION); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_SQL); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_NULL); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_DEFAULT); + $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_ACCEPTED_VALUES); + $criteria->add(\ProcessVariablesPeer::PRJ_UID, $projectUid, \Criteria::EQUAL); + $criteria->add(\ProcessVariablesPeer::VAR_NAME, $variable, \Criteria::EQUAL); + $rsCriteria = \ProcessVariablesPeer::doSelectRS($criteria); + $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); + $rsCriteria->next(); + + while ($aRow = $rsCriteria->getRow()) { + + if ($valueType == null && $valueType == '') { + $valueTypeMerged = $aRow['VAR_FIELD_TYPE']; + } else { + $valueTypeMerged = $valueType; + } + if ($maxLength == null && $maxLength == '') { + $maxLengthMerged = (int)$aRow['VAR_FIELD_SIZE']; + } else { + $maxLengthMerged = $maxLength; + } + if ($label == null && $label == '') { + $labelMerged = $aRow['VAR_LABEL']; + } else { + $labelMerged = $label; + } + if ($defaultValue == null && $defaultValue == '') { + $defaultValueMerged = $aRow['VAR_DEFAULT']; + } else { + $defaultValueMerged = $defaultValue; + } + if ($required == null && $required == '') { + $requiredMerged = ($aRow['VAR_NULL']==1) ? true:false; + } else { + $requiredMerged = $required; + } + if ($dbConnection == null && $dbConnection == '') { + $dbConnectionMerged = $aRow['VAR_DBCONNECTION']; + } else { + $dbConnectionMerged = $dbConnection; + } + if ($sql == null && $sql == '') { + $sqlMerged = $aRow['VAR_SQL']; + } else { + $sqlMerged = $sql; + } + if ($options == null && $options == '') { + $optionsMerged = $aRow['VAR_ACCEPTED_VALUES']; + } else { + $optionsMerged = $options; + } + + + $arrayVariables[] = array( 'variable' => $aRow['VAR_NAME'], + 'valueType' => $valueTypeMerged, + 'maxLength' => $maxLengthMerged, + 'label' => $labelMerged, + 'defaultValue' => $defaultValueMerged, + 'required' => $requiredMerged, + 'dbConnection' => $dbConnectionMerged, + 'sql' => $sqlMerged, + 'options' => $optionsMerged, + //values from fields properties + 'type' => $type, + 'colSpan' => $colSpan, + 'name' => $name, + 'readonly' => $readonly, + 'hint' => $hint, + 'dependentsField' => $dependentsField, + 'placeHolder' => $placeHolder, + 'pickType' => $pickType); + $rsCriteria->next(); + } + + } else { + $arrayVariables[] = array( 'variable' => $aRow['VAR_NAME'], + 'valueType' => $valueTypeMerged, + 'maxLength' => $maxLengthMerged, + 'label' => $labelMerged, + 'defaultValue' => $defaultValueMerged, + 'required' => $requiredMerged, + 'dbConnection' => $dbConnectionMerged, + 'sql' => $sqlMerged, + 'options' => $optionsMerged, + //values from fields properties + 'type' => $type, + 'colSpan' => $colSpan, + 'name' => $name, + 'readonly' => $readonly, + 'hint' => $hint, + 'dependentsField' => $dependentsField, + 'placeHolder' => $placeHolder, + 'pickType' => $pickType); + } + } //Return return $arrayVariables; - - } catch (\Exception $e) { throw $e; } From fb9de306b293e7a8c229a98dc47771b39b41981d Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 18 Jul 2014 17:04:05 -0400 Subject: [PATCH 4/6] FormDesigner change --- .../cases/cases_Step_Pmdynaform.html | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/workflow/engine/templates/cases/cases_Step_Pmdynaform.html b/workflow/engine/templates/cases/cases_Step_Pmdynaform.html index bc19f08a7..4a7a6d18f 100644 --- a/workflow/engine/templates/cases/cases_Step_Pmdynaform.html +++ b/workflow/engine/templates/cases/cases_Step_Pmdynaform.html @@ -8,11 +8,10 @@ - + - - + @@ -321,27 +320,31 @@ - + - - -
{CASE} #: {APP_NUMBER}     {TITLE}: {APP_TITLE}
- Previous Step Next step - + From 1ca96d4ea9e37364bc9e905d71fbbc549c96b6c6 Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Fri, 18 Jul 2014 17:26:10 -0400 Subject: [PATCH 5/6] Se adiciona el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields --- .../ProcessMaker/BusinessModel/DynaForm.php | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php index 16caf4cc7..6243de63f 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php @@ -1026,10 +1026,9 @@ class DynaForm $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $rsCriteria->next(); - while ($aRow = $rsCriteria->getRow()) { - $contentDecode = json_decode($aRow['DYN_CONTENT'],true); - $rsCriteria->next(); - } + $aRow = $rsCriteria->getRow(); + $contentDecode = json_decode($aRow['DYN_CONTENT'],true); + $content = $contentDecode['items'][0]['items']; foreach ($content as $key => $value) { @@ -1116,8 +1115,7 @@ class DynaForm $optionsMerged = $options; } - - $arrayVariables[] = array( 'variable' => $aRow['VAR_NAME'], + $arrayVariables[] = array( 'variable' => $variable, 'valueType' => $valueTypeMerged, 'maxLength' => $maxLengthMerged, 'label' => $labelMerged, @@ -1136,19 +1134,18 @@ class DynaForm 'placeHolder' => $placeHolder, 'pickType' => $pickType); $rsCriteria->next(); + } } else { - $arrayVariables[] = array( 'variable' => $aRow['VAR_NAME'], - 'valueType' => $valueTypeMerged, - 'maxLength' => $maxLengthMerged, - 'label' => $labelMerged, - 'defaultValue' => $defaultValueMerged, - 'required' => $requiredMerged, - 'dbConnection' => $dbConnectionMerged, - 'sql' => $sqlMerged, - 'options' => $optionsMerged, - //values from fields properties + $arrayVariables[] = array( 'valueType' => $valueType, + 'maxLength' => $maxLength, + 'label' => $label, + 'defaultValue' => $defaultValue, + 'required' => $required, + 'dbConnection' => $dbConnection, + 'sql' => $sql, + 'options' => $options, 'type' => $type, 'colSpan' => $colSpan, 'name' => $name, From 34f10a5c56ea934d9a051e5bdb2c690bbd9e9e15 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Mon, 21 Jul 2014 15:37:35 -0400 Subject: [PATCH 6/6] FormDesigner implements view Desktop, Tablet, Smartphone. --- Rakefile | 32 ++ workflow/engine/methods/cases/cases_Step.php | 3 +- .../cases/cases_Step_Pmdynaform.html | 317 +----------------- .../cases/cases_Step_Pmdynaform_Preview.html | 25 ++ 4 files changed, 61 insertions(+), 316 deletions(-) create mode 100644 workflow/engine/templates/cases/cases_Step_Pmdynaform_Preview.html diff --git a/Rakefile b/Rakefile index 5a16724d1..18c9b6432 100644 --- a/Rakefile +++ b/Rakefile @@ -153,6 +153,38 @@ def buildPmdynaform(homeDir, targetDir, mode) system("rm #{pmdynaformDir}/build/appBuild.js") readyForm = "" system("echo '#{readyForm}' >> #{pmdynaformDir}/build/appBuild.js ") + system("cp #{Dir.pwd}/workflow/engine/templates/cases/cases_Step_Pmdynaform.html #{pmdynaformDir}/build/cases_Step_Pmdynaform.html") + system("cp #{Dir.pwd}/workflow/engine/templates/cases/cases_Step_Pmdynaform_Preview.html #{pmdynaformDir}/build/cases_Step_Pmdynaform_Preview.html") + + template = "" + config = File.read "#{homeDir}/config/templates.json" + json = JSON.parse config + json.each do |key| + s = "" + key["files"].each do |source| + s += File.read "#{homeDir}/#{source}" + s += "\n" + end + template += s + end + + target = "#{pmdynaformDir}/build/cases_Step_Pmdynaform.html" + html = File.read target + while html['###TEMPLATES##'] do + html['###TEMPLATES###'] = template + end + File.open(target, 'w+') do |file| + file.write html + end + + target = "#{pmdynaformDir}/build/cases_Step_Pmdynaform_Preview.html" + html = File.read target + while html['###TEMPLATES##'] do + html['###TEMPLATES###'] = template + end + File.open(target, 'w+') do |file| + file.write html + end puts "\nPmDynaform Build Finished!".magenta end diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php index 235dd589c..b490bae8e 100755 --- a/workflow/engine/methods/cases/cases_Step.php +++ b/workflow/engine/methods/cases/cases_Step.php @@ -270,7 +270,8 @@ try { $ds->next(); $row = $ds->getRow(); if (isset($row) && $row["DYN_VERSION"] == 2) { - $oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step_Pmdynaform.html'); + //$oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step_Pmdynaform.html'); + $oTemplatePower = new TemplatePower(PATH_HOME . 'public_html/lib/pmdynaform/build/cases_Step_Pmdynaform.html'); $oTemplatePower->prepare(); $oTemplatePower->assign("JSON_DATA", $row["DYN_CONTENT"]); $oTemplatePower->assign("CASE", $array["CASE"]); diff --git a/workflow/engine/templates/cases/cases_Step_Pmdynaform.html b/workflow/engine/templates/cases/cases_Step_Pmdynaform.html index 4a7a6d18f..010e8e66b 100644 --- a/workflow/engine/templates/cases/cases_Step_Pmdynaform.html +++ b/workflow/engine/templates/cases/cases_Step_Pmdynaform.html @@ -6,330 +6,18 @@ - - - - - - +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + ###TEMPLATES### + + + + + + +
+ ###TEMPLATES### + + Previous Step + Next step + +