diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php index 3082afe5c..c4ffb7dfb 100644 --- a/workflow/engine/classes/class.pmFunctions.php +++ b/workflow/engine/classes/class.pmFunctions.php @@ -3144,7 +3144,7 @@ function PMFDynaFormFields($dynUid, $appUid = false, $delIndex = 0) } $data["CURRENT_DYNAFORM"] = $dynUid; - $dynaform = new pmDynaform($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; diff --git a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php index 58c78705f..ec430bae6 100644 --- a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php +++ b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php @@ -394,7 +394,7 @@ if ($actionAjax == 'dynaformChangeLogViewHistory') { $FieldsPmDynaform = $Fields; $FieldsPmDynaform["PRO_UID"] = $_SESSION['PROCESS']; $FieldsPmDynaform["CURRENT_DYNAFORM"] = $_GET['DYN_UID']; - $a = new pmDynaform($FieldsPmDynaform); + $a = new pmDynaform(\ProcessMaker\Util\DateTime::convertUtcToTimeZone($FieldsPmDynaform)); if ($a->isResponsive()) { $a->printView(); } else { @@ -485,7 +485,7 @@ if ($actionAjax == 'historyDynaformGridPreview') { G::LoadClass('pmDynaform'); $FieldsPmDynaform = $Fields; $FieldsPmDynaform["CURRENT_DYNAFORM"] = $_GET['DYN_UID']; - $a = new pmDynaform($FieldsPmDynaform); + $a = new pmDynaform(\ProcessMaker\Util\DateTime::convertUtcToTimeZone($FieldsPmDynaform)); if ($a->isResponsive()) { $a->printView(); } else { diff --git a/workflow/engine/methods/tracker/tracker_Show.php b/workflow/engine/methods/tracker/tracker_Show.php index cdebf568d..124cbce6c 100644 --- a/workflow/engine/methods/tracker/tracker_Show.php +++ b/workflow/engine/methods/tracker/tracker_Show.php @@ -22,11 +22,11 @@ * Coral Gables, FL, 33134, USA, or email info@colosa.com. */ -/* -* dynaforms & documents for Case Tracker -* -* @author Everth S. Berrios Morales -* +/* +* dynaforms & documents for Case Tracker +* +* @author Everth S. Berrios Morales +* */ if (! isset( $_SESSION['PROCESS'] )) { @@ -55,26 +55,26 @@ switch ($_GET['CTO_TYPE_OBJ']) { $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PRINT_PREVIEW_ACTION'] = 'tracker_PrintView?CTO_UID_OBJ=' . $_GET['CTO_UID_OBJ'] . '&CTO_TYPE_OBJ=PRINT_PREVIEW'; $_SESSION['CTO_UID_OBJ'] = $_GET['CTO_UID_OBJ']; - $dynaForm = new Dynaform(); - $arrayDynaFormData = $dynaForm->Load($_GET["CTO_UID_OBJ"]); - - if (isset($arrayDynaFormData["DYN_VERSION"]) && $arrayDynaFormData["DYN_VERSION"] == 2) { - G::LoadClass("pmDynaform"); - - $Fields["PRO_UID"] = $_SESSION["PROCESS"]; - $Fields["CURRENT_DYNAFORM"] = $_GET["CTO_UID_OBJ"]; - - $pmDynaForm = new pmDynaform($Fields); - - if ($pmDynaForm->isResponsive()) { - $pmDynaForm->printTracker(); - } - } else { - $G_PUBLISH = new Publisher(); - $G_PUBLISH->AddContent("dynaform", "xmlform", $_SESSION["PROCESS"] . "/" . $_GET["CTO_UID_OBJ"], "", $Fields["APP_DATA"], "", "", "view"); - G::RenderPage("publish"); - } - break; + $dynaForm = new Dynaform(); + $arrayDynaFormData = $dynaForm->Load($_GET["CTO_UID_OBJ"]); + + if (isset($arrayDynaFormData["DYN_VERSION"]) && $arrayDynaFormData["DYN_VERSION"] == 2) { + G::LoadClass("pmDynaform"); + + $Fields["PRO_UID"] = $_SESSION["PROCESS"]; + $Fields["CURRENT_DYNAFORM"] = $_GET["CTO_UID_OBJ"]; + + $pmDynaForm = new pmDynaform($Fields); + + if ($pmDynaForm->isResponsive()) { + $pmDynaForm->printTracker(); + } + } else { + $G_PUBLISH = new Publisher(); + $G_PUBLISH->AddContent("dynaform", "xmlform", $_SESSION["PROCESS"] . "/" . $_GET["CTO_UID_OBJ"], "", $Fields["APP_DATA"], "", "", "view"); + G::RenderPage("publish"); + } + break; case 'INPUT_DOCUMENT': G::LoadClass( 'case' ); $oCase = new Cases();