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

HOR-3670

Browse Source 
Fix class name PmDynaform
This commit is contained in:
David Callizaya
2017-08-11 15:49:39 -04:00
parent 2ae426e3db
commit 03090f445f
25 changed files with 63 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/src/Maveriks/WebApplication.php
View File

@@ -7,6 +7,7 @@ use ProcessMaker\Services;
use ProcessMaker\Services\Api;
use Luracast\Restler\RestException;
use Illuminate\Foundation\Http\Kernel;
use G;
/**
* Web application bootstrap

3
gulliver/system/class.g.php
View File

@@ -5833,9 +5833,8 @@ class G
//Moved from Enterprise class.
if (file_exists(PATH_METHODS . "login/version-pmos.php")) {
include (PATH_METHODS . "login/version-pmos.php");
} else {
define("PM_VERSION", "2.0.0");
}
//Removed default version from code.
}
}

4
workflow/engine/classes/ActionsByEmailCoreClass.php
View File

@@ -171,7 +171,7 @@ class ActionsByEmailCoreClass extends PMPlugin
$field->label = '';
$actionField = str_replace(array('@@', '@#', '@=', '@%', '@?', '@$'), '', $configuration['ABE_ACTION_FIELD']);
$obj = new pmDynaform($configuration['DYN_UID']);
$obj = new PmDynaform($configuration['DYN_UID']);
$configuration['CURRENT_DYNAFORM'] = $configuration['DYN_UID'];
$file = $obj->printPmDynaformAbe($configuration);
$__ABE__ .= $file;
@@ -222,7 +222,7 @@ class ActionsByEmailCoreClass extends PMPlugin
}
}
$obj = new pmDynaform($configuration['DYN_UID']);
$obj = new PmDynaform($configuration['DYN_UID']);
$configuration['CURRENT_DYNAFORM'] = $configuration['DYN_UID'];
$file = $obj->printPmDynaformAbe($configuration);
$__ABE__ .= $file;

2
workflow/engine/classes/ConsolidatedCases.php
View File

@@ -52,7 +52,7 @@ class ConsolidatedCases
$oReportTables = new ReportTables();
$oReportTables->deleteAllReportVars($_POST['form']['REP_TAB_UID']);
$pmDyna = new pmDynaform(array());
$pmDyna = new PmDynaform(array());
$pmDyna->fields["CURRENT_DYNAFORM"] = $DynUid;
$dataDyna = $pmDyna->getDynaform();
$json = G::json_decode($dataDyna["DYN_CONTENT"]);

12
workflow/engine/classes/PmDynaform.php
View File

@@ -1,20 +1,10 @@
<?php
/**
* class.pmDynaform.php
* Implementing pmDynaform library in the running case.
*
* @author Roly Rudy Gutierrez Pinto
* @package engine.classes
*/
/**
* class.pmDynaform.php
* Implementing pmDynaform library in the running case.
*
* @author Roly Rudy Gutierrez Pinto
* @package engine.classes
*/class pmDynaform
*/class PmDynaform
{
public static $instance = null;

4
workflow/engine/classes/class.pmFunctions.php
View File

@@ -2387,7 +2387,7 @@ function PMFgetLabelOption ($PROCESS, $DYNAFORM_UID, $FIELD_NAME, $FIELD_SELECTE
{
$data = array();
$data["CURRENT_DYNAFORM"] = $DYNAFORM_UID;
$dynaform = new pmDynaform($data);
$dynaform = new PmDynaform($data);
if ($dynaform->isResponsive()) {
$json = $dynaform->searchFieldByName($DYNAFORM_UID, $FIELD_NAME);
$options = $json->options + $json->optionsSql;
@@ -3127,7 +3127,7 @@ function PMFDynaFormFields($dynUid, $appUid = false, $delIndex = 0)
}
$data["CURRENT_DYNAFORM"] = $dynUid;
$dynaform = new pmDynaform(\ProcessMaker\Util\DateTime::convertUtcToTimeZone($data));
$dynaform = new PmDynaform(\ProcessMaker\Util\DateTime::convertUtcToTimeZone($data));
$dynaform->onPropertyRead = function(&$json, $key, $value) {
if (isset($json->data) && !isset($json->value)) {
$json->value = $json->data->value;

4
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -1365,7 +1365,7 @@ class pmTablesProxy extends HttpProxyController
$arrayDynaFormData = $dynaForm->getDynaFormRecordByPk($dynaFormUid, [], false);
if ($arrayDynaFormData !== false) {
$arrayGrid = pmDynaform::getGridsAndFields($arrayDynaFormData['DYN_CONTENT']);
$arrayGrid = PmDynaform::getGridsAndFields($arrayDynaFormData['DYN_CONTENT']);
if ($arrayGrid !== false && isset($arrayGrid[$gridId])) {
$grid = $arrayGrid[$gridId];
@@ -1545,7 +1545,7 @@ class pmTablesProxy extends HttpProxyController
$record = $rsCriteria->getRow();
if ($flagIsBpmn) {
$arrayGrid = pmDynaform::getGridsAndFields($record['DYN_CONTENT']);
$arrayGrid = PmDynaform::getGridsAndFields($record['DYN_CONTENT']);
if ($arrayGrid !== false) {
foreach ($arrayGrid as $value) {

2
workflow/engine/methods/cases/ajaxListener.php
View File

@@ -978,7 +978,7 @@ class Ajax
$FieldsPmDynaform = $Fields;
$FieldsPmDynaform["PRO_UID"] = $_SESSION['PROCESS'];
$FieldsPmDynaform["CURRENT_DYNAFORM"] = $_REQUEST['DYN_UID'];
$a = new pmDynaform($FieldsPmDynaform);
$a = new PmDynaform($FieldsPmDynaform);
if ($a->isResponsive()) {
$a->printView();
} else {

2
workflow/engine/methods/cases/caseConsolidated.php
View File

@@ -127,7 +127,7 @@ if ($sStatus == "1" && $sDynUid != "") {
if ($isBPMN) {
$pmDyna = new pmDynaform(array());
$pmDyna = new PmDynaform(array());
$pmDyna->fields["CURRENT_DYNAFORM"] = $sDynUid;
$dataDyna = $pmDyna->getDynaform();
$json = G::json_decode($dataDyna["DYN_CONTENT"]);

4
workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
View File

@@ -390,7 +390,7 @@ if ($actionAjax == 'dynaformChangeLogViewHistory') {
$FieldsPmDynaform = $Fields;
$FieldsPmDynaform["PRO_UID"] = $_SESSION['PROCESS'];
$FieldsPmDynaform["CURRENT_DYNAFORM"] = $_GET['DYN_UID'];
$a = new pmDynaform(\ProcessMaker\Util\DateTime::convertUtcToTimeZone($FieldsPmDynaform));
$a = new PmDynaform(\ProcessMaker\Util\DateTime::convertUtcToTimeZone($FieldsPmDynaform));
if ($a->isResponsive()) {
$a->printView();
} else {
@@ -479,7 +479,7 @@ if ($actionAjax == 'historyDynaformGridPreview') {
$FieldsPmDynaform = $Fields;
$FieldsPmDynaform["CURRENT_DYNAFORM"] = $_GET['DYN_UID'];
$a = new pmDynaform(\ProcessMaker\Util\DateTime::convertUtcToTimeZone($FieldsPmDynaform));
$a = new PmDynaform(\ProcessMaker\Util\DateTime::convertUtcToTimeZone($FieldsPmDynaform));
if ($a->isResponsive()) {
$a->printView();
} else {

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

@@ -141,7 +141,7 @@ try {
$dataFields = $Fields["APP_DATA"];
$dataFields["CURRENT_DYNAFORM"] = $_GET['UID'];
$oPmDynaform = new pmDynaform($dataFields);
$oPmDynaform = new PmDynaform($dataFields);
$pmdynaform = $oPmDynaform->validatePost($pmdynaform);
$Fields["APP_DATA"] = array_merge( $Fields["APP_DATA"], $pmdynaform );

2
workflow/engine/methods/cases/cases_Step.php
View File

@@ -341,7 +341,7 @@ try {
$FieldsPmDynaform["STEP_MODE"] = $oStep->getStepMode();
$FieldsPmDynaform["PRO_SHOW_MESSAGE"] = $noShowTitle;
$FieldsPmDynaform["TRIGGER_DEBUG"] = $_SESSION['TRIGGER_DEBUG']['ISSET'];
$a = new pmDynaform(\ProcessMaker\Util\DateTime::convertUtcToTimeZone($FieldsPmDynaform));
$a = new PmDynaform(\ProcessMaker\Util\DateTime::convertUtcToTimeZone($FieldsPmDynaform));
if ($a->isResponsive()) {
$a->printEdit();
} else {

2
workflow/engine/methods/cases/cases_StepToRevise.php
View File

@@ -149,7 +149,7 @@ if ($_GET['DYN_UID'] != '') {
$FieldsPmDynaform = $Fields;
$FieldsPmDynaform["PRO_UID"] = $_SESSION['PROCESS'];
$FieldsPmDynaform["CURRENT_DYNAFORM"] = $_GET['DYN_UID'];
$a = new pmDynaform($FieldsPmDynaform);
$a = new PmDynaform($FieldsPmDynaform);
if ($a->isResponsive()) {
$a->printEditSupervisor();
}else{

2
workflow/engine/methods/cases/pmDynaform.php
View File

@@ -2,6 +2,6 @@
$DYN_UID = $_GET["dyn_uid"];
$_SESSION['PROCESS'] = $_GET["prj_uid"];
$a = new pmDynaform(array("CURRENT_DYNAFORM" => $DYN_UID));
$a = new PmDynaform(array("CURRENT_DYNAFORM" => $DYN_UID));
$a->lang = null;
$a->printPmDynaform();

2
workflow/engine/methods/cases/summary.php
View File

@@ -70,7 +70,7 @@ try {
if ($result->next()) {
$FieldsPmDynaform = $applicationFields;
$FieldsPmDynaform["CURRENT_DYNAFORM"] = $_REQUEST['DYN_UID'];
$a = new pmDynaform(\ProcessMaker\Util\DateTime::convertUtcToTimeZone($FieldsPmDynaform));
$a = new PmDynaform(\ProcessMaker\Util\DateTime::convertUtcToTimeZone($FieldsPmDynaform));
$a->printView();
}
if (file_exists( PATH_DYNAFORM . $applicationFields['PRO_UID'] . PATH_SEP . $_REQUEST['DYN_UID'] . '.xml' )) {

2
workflow/engine/methods/services/ActionsByEmailDataForm.php
View File

@@ -56,7 +56,7 @@ if (isset($_GET['BROWSER_TIME_ZONE_OFFSET'])) {
$record['APP_DATA'] = $caseFields['APP_DATA'];
if (is_null($caseFields['DEL_FINISH_DATE'])) {
$a = new pmDynaform($record);
$a = new PmDynaform($record);
$a->printABE($action,$record);
} else {

2
workflow/engine/methods/tracker/tracker_Show.php
View File

@@ -63,7 +63,7 @@ switch ($_GET['CTO_TYPE_OBJ']) {
$Fields["PRO_UID"] = $_SESSION["PROCESS"];
$Fields["CURRENT_DYNAFORM"] = $_GET["CTO_UID_OBJ"];
$pmDynaForm = new pmDynaform($Fields);
$pmDynaForm = new PmDynaform($Fields);
if ($pmDynaForm->isResponsive()) {
$pmDynaForm->printTracker();

3
workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
View File

@@ -3,6 +3,7 @@
namespace ProcessMaker\BusinessModel;
use ProcessMaker\Plugins\PluginRegistry;
use PmDynaform;
/**
* Description of ActionsByEmailService
@@ -579,7 +580,7 @@ class ActionsByEmail
$configuration = $resultD->getRow();
$field = new \stdClass();
$obj = new \pmDynaform($configuration);
$obj = new PmDynaform($configuration);
if ($dataRes['ABE_RES_DATA'] !== '') {
$value = unserialize($dataRes['ABE_RES_DATA']);

5
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -10,6 +10,7 @@ use Exception;
use WsBase;
use RBAC;
use Applications;
use PmDynaform;
class Cases
{
@@ -1632,7 +1633,7 @@ class Cases
if (isset($field['type'])) {
if ($field['type'] != 'form') {
foreach ($field as &$val) {
if (is_string($val) && in_array(substr($val, 0, 2), \pmDynaform::$prefixs)) {
if (is_string($val) && in_array(substr($val, 0, 2), PmDynaform::$prefixs)) {
$val = substr($val, 2);
}
}
@@ -1695,7 +1696,7 @@ class Cases
if (!is_null($dynaFormUid)) {
$data["CURRENT_DYNAFORM"] = $dynaFormUid;
$pmDynaForm = new \pmDynaform($data);
$pmDynaForm = new PmDynaform($data);
$arrayDynaFormData = $pmDynaForm->getDynaform();
$arrayDynContent = \G::json_decode($arrayDynaFormData['DYN_CONTENT']);
$pmDynaForm->jsonr($arrayDynContent);

17
workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
View File

@@ -1,13 +1,14 @@
<?php
namespace ProcessMaker\BusinessModel;
use \G;
use \Smarty;
use \Criteria;
use \ReportTablePeer;
use \ResultSet;
use \CaseConsolidatedCorePeer;
use \ContentPeer;
use G;
use Smarty;
use Criteria;
use ReportTablePeer;
use ResultSet;
use CaseConsolidatedCorePeer;
use ContentPeer;
use PmDynaform;
/**
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
@@ -468,7 +469,7 @@ class Consolidated
$dataTask = $oDyna->load($dyn_uid);
if ($dataTask['DYN_VERSION'] > 0) {
$_SESSION['PROCESS'] = $pro_uid;
$pmDyna = new \pmDynaform(array('APP_DATA' => array(), "CURRENT_DYNAFORM" => $dyn_uid));
$pmDyna = new PmDynaform(array('APP_DATA' => array(), "CURRENT_DYNAFORM" => $dyn_uid));
$json = G::json_decode($dataTask["DYN_CONTENT"]);
$pmDyna->jsonr($json);
$fieldsDyna = $json->items[0]->items;

4
workflow/engine/src/ProcessMaker/BusinessModel/InputDocument.php
View File

@@ -1,6 +1,8 @@
<?php
namespace ProcessMaker\BusinessModel;
use PmDynaform;
class InputDocument
{
private $arrayFieldDefinition = array(
@@ -378,7 +380,7 @@ class InputDocument
$result = $inputDocument->update($arrayData);
$pmDynaform = new \pmDynaform();
$pmDynaform = new PmDynaform();
$pmDynaform->synchronizeInputDocument($processUid, $arrayData);
//Return

3
workflow/engine/src/ProcessMaker/BusinessModel/Light/Tracker.php
View File

@@ -2,6 +2,7 @@
namespace ProcessMaker\BusinessModel\Light;
use PmDynaform;
class Tracker
{
@@ -266,7 +267,7 @@ class Tracker
$Fields["PRO_UID"] = $pro_uid;
$Fields["CURRENT_DYNAFORM"] = $obj_uid;
$pmDynaForm = new \pmDynaform($Fields);
$pmDynaForm = new PmDynaform($Fields);
// if ($pmDynaForm->isResponsive()) {
// $pmDynaForm->printTracker();

7
workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
View File

@@ -4,6 +4,7 @@ namespace ProcessMaker\BusinessModel;
use G;
use Exception;
use AdditionalTables;
use PmDynaform;
class Variable
{
@@ -194,7 +195,7 @@ class Variable
"VAR_ACCEPTED_VALUES" => $variable->getVarAcceptedValues()
);
$pmDynaform = new \pmDynaform();
$pmDynaform = new PmDynaform();
$pmDynaform->synchronizeVariable($processUid, $newVariable, $oldVariable);
} else {
@@ -236,7 +237,7 @@ class Variable
$this->throwExceptionIfVariableIsAssociatedAditionalTable($variableUid);
$variable = $this->getVariable($processUid, $variableUid);
$pmDynaform = new \pmDynaform();
$pmDynaform = new PmDynaform();
$isUsed = $pmDynaform->isUsed($processUid, $variable);
if ($isUsed !== false) {
$titleDynaform=$pmDynaform->getDynaformTitle($isUsed);
@@ -783,7 +784,7 @@ class Variable
//This value is required to be able to query the database.
$_SESSION["PROCESS"] = $proUid;
//The pmdynaform class is instantiated
$pmDynaform = new \pmDynaform(array("APP_DATA" => $params));
$pmDynaform = new PmDynaform(array("APP_DATA" => $params));
//Get control from dynaform.
//The parameters: queryFilter, queryStart, queryLimit, are only necessary

21
workflow/engine/src/ProcessMaker/Services/Api/Light.php
View File

@@ -2,12 +2,13 @@
namespace ProcessMaker\Services\Api;
use \G;
use \ProcessMaker\Project\Adapter;
use \ProcessMaker\Services\Api;
use \Luracast\Restler\RestException;
use \ProcessMaker\BusinessModel\Validator;
use \ProcessMaker\Util\DateTime;
use G;
use ProcessMaker\Project\Adapter;
use ProcessMaker\Services\Api;
use Luracast\Restler\RestException;
use ProcessMaker\BusinessModel\Validator;
use ProcessMaker\Util\DateTime;
use PmDynaform;
/**
*
@@ -867,7 +868,7 @@ class Light extends Api
$response = $process->getDynaForms($prj_uid);
$result = $this->parserDataDynaForm($response);
$pmDynaForm = new \pmDynaform();
$pmDynaForm = new PmDynaform();
foreach ($result as $k => $form) {
$result[$k]['formContent'] = (isset($form['formContent']) && $form['formContent'] != null)?json_decode($form['formContent']):"";
$pmDynaForm->jsonr($result[$k]['formContent']);
@@ -1009,7 +1010,7 @@ class Light extends Api
$caseVariables = DateTime::convertUtcToTimeZone($caseVariables);
}
$pmDynaform = new \pmDynaform(array("APP_DATA" => $caseVariables, "CURRENT_DYNAFORM" => $dyn_uid));
$pmDynaform = new PmDynaform(array("APP_DATA" => $caseVariables, "CURRENT_DYNAFORM" => $dyn_uid));
$pmDynaform->jsonr($result['formContent']);
return $result;
} catch (\Exception $e) {
@@ -1033,7 +1034,7 @@ class Light extends Api
$result = $this->parserDataDynaForm($response);
$result['formContent'] = (isset($result['formContent']) && $result['formContent'] != null) ? \G::json_decode($result['formContent']) : "";
$pmDynaForm = new \pmDynaform(["CURRENT_DYNAFORM" => $dyn_uid]);
$pmDynaForm = new PmDynaform(["CURRENT_DYNAFORM" => $dyn_uid]);
$pmDynaForm->jsonr($result['formContent']);
return $result;
} catch (\Exception $e) {
@@ -1057,7 +1058,7 @@ class Light extends Api
$return = array();
foreach ($request_data['formId'] as $dyn_uid) {
$response = $dynaForm->getDynaForm($dyn_uid);
$pmDynaForm = new \pmDynaform(array("CURRENT_DYNAFORM" => $dyn_uid));
$pmDynaForm = new PmDynaform(array("CURRENT_DYNAFORM" => $dyn_uid));
$result = $this->parserDataDynaForm($response);
$result['formContent'] = (isset($result['formContent']) && $result['formContent'] != null)?json_decode($result['formContent']):"";
$pmDynaForm->jsonr($result['formContent']);

15
workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php
View File

@@ -1,9 +1,10 @@
<?php
namespace ProcessMaker\Services\Api\Project;
use \ProcessMaker\Services\Api;
use \Luracast\Restler\RestException;
use \ProcessMaker\Util\DateTime;
use ProcessMaker\Services\Api;
use Luracast\Restler\RestException;
use ProcessMaker\Util\DateTime;
use PmDynaform;
/**
* Project\DynaForm Api Controller
@@ -128,7 +129,7 @@ class DynaForm extends Api
{
try {
$pmDynaform = new \pmDynaform();
$pmDynaform = new PmDynaform();
return $pmDynaform->downloadLanguage($dyn_uid, $lang);
} catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
@@ -145,7 +146,7 @@ class DynaForm extends Api
{
try {
$pmDynaform = new \pmDynaform();
$pmDynaform = new PmDynaform();
$pmDynaform->uploadLanguage($dyn_uid);
} catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
@@ -162,7 +163,7 @@ class DynaForm extends Api
{
try {
$pmDynaform = new \pmDynaform();
$pmDynaform = new PmDynaform();
$pmDynaform->deleteLanguage($dyn_uid, $lang);
} catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
@@ -179,7 +180,7 @@ class DynaForm extends Api
{
try {
$pmDynaform = new \pmDynaform();
$pmDynaform = new PmDynaform();
return $pmDynaform->listLanguage($dyn_uid);
} catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));